ErnadoO / mod-phpbb-directory

root/includes/acp/acp_directory.php

Doc Comments +10 added lines

@@ -1521,6 +1521,9 @@ 
 		adm_page_footer();
 	}
 
+	/**
+	 * @return string
+	 */
 	function move_cat_by($dir_cat_row, $action = 'move_up', $steps = 1)
 	{
 		global $db;
@@ -1790,6 +1793,9 @@ 
 		return $errors;
 	}
 
+	/**
+	 * @param integer $to_id
+	 */
 	function move_cat_content($from_id, $to_id)
 	{
 		global $db;
@@ -1972,6 +1978,10 @@ 
 	return;
 }
 
+/**
+ * @param integer $start
+ * @param integer $stop
+ */
 function sync_dir_links($start, $stop)
 {
 	global $db;

Indentation +11 added lines, -11 removed lines

@@ -1526,11 +1526,11 @@ 
 		global $db;
 
 		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
+		 * Fetch all the siblings between the module's current spot
+		 * and where we want to move it to. If there are less than $steps
+		 * siblings between the current spot and the target then the
+		 * module will move as far as possible
+		 */
 		$sql = 'SELECT cat_id, cat_name, left_id, right_id
 			FROM ' . DIR_CAT_TABLE . '
 			WHERE parent_id = ' . (int)$dir_cat_row['parent_id'] . '
@@ -1551,12 +1551,12 @@ 
 		}
 
 		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
+		 * $left_id and $right_id define the scope of the nodes that are affected by the move.
+		 * $diff_up and $diff_down are the values to substract or add to each node's left_id
+		 * and right_id in order to move them up or down.
+		 * $move_up_left and $move_up_right define the scope of the nodes that are moving
+		 * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
+		 */
 		if ($action == 'move_up')
 		{
 			$left_id = $target['left_id'];

Spacing +239 added lines, -239 removed lines

@@ -32,7 +32,7 @@ 
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		$action		= request_var('action', '');
-		$start		= request_var('start', 0);
+		$start = request_var('start', 0);
 		$submit		= (isset($_POST['submit'])) ? true : false;
 		$update		= (isset($_POST['update'])) ? true : false;
 		$cat_id		= request_var('c', 0);
@@ -41,7 +41,7 @@ 
 		$form_key = 'acp_dir_cat';
 		add_form_key($form_key);
 
-		$this->parent_id	= request_var('parent_id', 0);
+		$this->parent_id = request_var('parent_id', 0);
 		$cat_data = $errors = array();
 		if ($update && !check_form_key($form_key))
 		{
@@ -49,7 +49,7 @@ 
 			$errors[] = $user->lang['FORM_INVALID'];
 		}
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'main':
 				$this->page_title = 'ACP_DIRECTORY';
@@ -105,15 +105,15 @@ 
 								{
 									case 'sqlite':
 									case 'firebird':
-										$db->sql_query('DELETE FROM ' . DIR_VOTE_TABLE);
+										$db->sql_query('DELETE FROM '.DIR_VOTE_TABLE);
 									break;
 
 									default:
-										$db->sql_query('TRUNCATE TABLE ' . DIR_VOTE_TABLE);
+										$db->sql_query('TRUNCATE TABLE '.DIR_VOTE_TABLE);
 									break;
 								}
 
-								$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET
+								$sql = 'UPDATE '.DIR_LINK_TABLE.' SET
 									link_vote = 0,
 									link_note = 0';
 								$db->sql_query($sql);
@@ -124,21 +124,21 @@ 
 								{
 									case 'sqlite':
 									case 'firebird':
-										$db->sql_query('DELETE FROM ' . DIR_COMMENT_TABLE);
+										$db->sql_query('DELETE FROM '.DIR_COMMENT_TABLE);
 									break;
 
 									default:
-										$db->sql_query('TRUNCATE TABLE ' . DIR_COMMENT_TABLE);
+										$db->sql_query('TRUNCATE TABLE '.DIR_COMMENT_TABLE);
 									break;
 								}
 
-								$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET
+								$sql = 'UPDATE '.DIR_LINK_TABLE.' SET
 									link_comment = 0';
 								$db->sql_query($sql);
 							break;
 
 							case 'clicks':
-								$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET
+								$sql = 'UPDATE '.DIR_LINK_TABLE.' SET
 									link_view = 0';
 								$db->sql_query($sql);
 							break;
@@ -182,7 +182,7 @@ 
 					FROM ' . DIR_LINK_TABLE;
 				$result = $db->sql_query($sql);
 				$total_links = $waiting_links = 0;
-				while($row = $db->sql_fetchrow($result))
+				while ($row = $db->sql_fetchrow($result))
 				{
 					$total_links++;
 					if (!$row['link_active'])
@@ -215,13 +215,13 @@ 
 
 				$banners_dir_size = 0;
 
-				if ($banners_dir = @opendir($phpbb_root_path . 'images/directory/banners/'))
+				if ($banners_dir = @opendir($phpbb_root_path.'images/directory/banners/'))
 				{
 					while (($file = readdir($banners_dir)) !== false)
 					{
 						if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false)
 						{
-							$banners_dir_size += filesize($phpbb_root_path . 'images/directory/banners/' . $file);
+							$banners_dir_size += filesize($phpbb_root_path.'images/directory/banners/'.$file);
 						}
 					}
 					closedir($banners_dir);
@@ -247,7 +247,7 @@ 
 					'U_DOWNLOAD'		=> $download_link,
 
 					'TOTAL_CATS'		=> $total_cats,
-					'TOTAL_LINKS'		=> $total_links-$waiting_links,
+					'TOTAL_LINKS'		=> $total_links - $waiting_links,
 					'WAITING_LINKS'		=> $waiting_links,
 					'TOTAL_COMMENTS'	=> $total_comments,
 					'TOTAL_VOTES'		=> $total_votes,
@@ -266,44 +266,44 @@ 
 						'dir_banner_width'					=> '',
 						'dir_banner_height'					=> '',
 
-						'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-						'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-						'dir_activ_pagerank'				=> array('lang' => 'DIR_ACTIV_PAGERANK',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-						'dir_show'							=> array('lang' => 'DIR_SHOW',				'validate' => 'int:1', 	'type' => 'text:3:3',		'explain' => false),
-						'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC',			'validate' => 'int:1', 	'type' => 'text:3:3',		'explain' => false),
-						'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME',			'validate' => 'int', 	'type' => 'text:3:3',		'explain' => true),
-						'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER',		'validate' => 'string', 'type' => 'select',			'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
+						'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_activ_pagerank'				=> array('lang' => 'DIR_ACTIV_PAGERANK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_show'							=> array('lang' => 'DIR_SHOW', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
+						'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
+						'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true),
+						'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
 
 						'legend2'							=> 'DIR_RECENT_GUEST',
-						'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-						'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS',		'validate' => 'int:1',		'type' => 'text:3:3',		'explain' => false),
-						'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS',	'validate' => 'int:1',		'type' => 'text:3:3',		'explain' => false),
-						'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE',	'validate' => 'string',		'type' => 'text:6:99',			'explain' => true),
+						'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
+						'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
+						'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true),
 
 						'legend3'							=> 'DIR_ADD_GUEST',
-						'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-						'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS',	'validate' => 'int:1:10',	'type' => 'text:3:3',		'explain' => true),
+						'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:1:10', 'type' => 'text:3:3', 'explain' => true),
 
 						'legend4'							=> 'DIR_THUMB_PARAM',
-						'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-						'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE',			'validate' => 'string', 'type' => 'select',			'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
-						'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+						'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+						'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
+						'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend5'							=> 'DIR_COMM_PARAM',
-						'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS',	'validate' => 'int:2',	'type' => 'text:3:3',		'explain' => true),
-						'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE',		'validate' => 'int:1',	'type' => 'text:3:3',		'explain' => false),
+						'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:2', 'type' => 'text:3:3', 'explain' => true),
+						'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
 
 						'legend6'							=> 'DIR_BANN_PARAM',
-						'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'dir_banner'						=> array('lang' => 'DIR_MAX_BANN',			'validate' => 'int',	'type' => 'dimension:3:4',	'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE',			'validate' => 'int:0',	'type' => 'text:5:10',		'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
-						'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+						'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+						'dir_banner'						=> array('lang' => 'DIR_MAX_BANN', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' '.$user->lang['PIXEL']),
+						'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE', 'validate' => 'int:0', 'type' => 'text:5:10', 'explain' => true, 'append' => ' '.$user->lang['BYTES']),
+						'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 					)
 				);
 
@@ -311,11 +311,11 @@ 
 				if (!empty($phpbb_seo))
 				{
 					// Rewrite enable, and patch installed
-					if($phpbb_seo->cache_config['settings']['url_rewrite'] && method_exists($phpbb_seo,'directory'))
+					if ($phpbb_seo->cache_config['settings']['url_rewrite'] && method_exists($phpbb_seo, 'directory'))
 					{
 						$display_vars['vars'] += array(
 							'legend7'					=> 'DIR_REWRITE_PARAM',
-							'dir_activ_rewrite'			=> array('lang' => 'DIR_ACTIV_REWRITE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+							'dir_activ_rewrite'			=> array('lang' => 'DIR_ACTIV_REWRITE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 							//'dir_urlR'						=> array('lang' => 'DIR_RELATIVE_PATH',	'validate' => 'string',	'type' => 'text:10:99',		'explain' => true, 'append' => '/'),
 						);
 					}
@@ -362,9 +362,9 @@ 
 
 				if ($submit)
 				{
-					add_log('admin', 'DIR_CONFIG_' . strtoupper($mode));
+					add_log('admin', 'DIR_CONFIG_'.strtoupper($mode));
 
-					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
+					trigger_error($user->lang['CONFIG_UPDATED'].adm_back_link($this->u_action));
 				}
 
 				$this->tpl_name = 'acp_board';
@@ -372,7 +372,7 @@ 
 
 				$template->assign_vars(array(
 					'L_TITLE'			=> $user->lang[$display_vars['title']],
-					'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
+					'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'].'_EXPLAIN'],
 
 					'S_ERROR'			=> (sizeof($error)) ? true : false,
 					'ERROR_MSG'			=> implode('<br />', $error),
@@ -407,7 +407,7 @@ 
 					}
 					else if ($vars['explain'])
 					{
-						$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
+						$l_explain = (isset($user->lang[$vars['lang'].'_EXPLAIN'])) ? $user->lang[$vars['lang'].'_EXPLAIN'] : '';
 					}
 
 					$template->assign_block_vars('options', array(
@@ -431,10 +431,10 @@ 
 					switch ($action)
 					{
 						case 'delete':
-							$action_subcats		= request_var('action_subcats', '');
-							$subcats_to_id		= request_var('subcats_to_id', 0);
-							$action_links		= request_var('action_links', '');
-							$links_to_id		= request_var('links_to_id', 0);
+							$action_subcats = request_var('action_subcats', '');
+							$subcats_to_id = request_var('subcats_to_id', 0);
+							$action_links = request_var('action_links', '');
+							$links_to_id = request_var('links_to_id', 0);
 
 							$errors = $this->delete_cat($cat_id, $action_links, $action_subcats, $links_to_id, $subcats_to_id);
 
@@ -445,7 +445,7 @@ 
 
 							$cache->destroy('sql', DIR_CAT_TABLE);
 
-							trigger_error($user->lang['DIR_CAT_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+							trigger_error($user->lang['DIR_CAT_DELETED'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
 
 						break;
 
@@ -457,7 +457,7 @@ 
 						case 'add':
 
 							$cat_data += array(
-								'parent_id'				=> request_var('cat_parent_id', (int)$this->parent_id),
+								'parent_id'				=> request_var('cat_parent_id', (int) $this->parent_id),
 								'cat_parents'			=> '',
 								'cat_name'				=> utf8_normalize_nfc(request_var('cat_name', '', true)),
 								'cat_desc'				=> utf8_normalize_nfc(request_var('cat_desc', '', true)),
@@ -492,7 +492,7 @@ 
 
 								$message = ($action == 'add') ? $user->lang['DIR_CAT_CREATED'] : $user->lang['DIR_CAT_UPDATED'];
 
-								trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+								trigger_error($message.adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
 							}
 						break;
 					}
@@ -513,28 +513,28 @@ 
 
 						if (!$cat_id)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						@set_time_limit(0);
 
 						$sql = 'SELECT cat_name, cat_links
-							FROM ' . DIR_CAT_TABLE . '
-							WHERE cat_id = ' . (int)$cat_id;
+							FROM ' . DIR_CAT_TABLE.'
+							WHERE cat_id = ' . (int) $cat_id;
 						$result = $db->sql_query($sql);
 						$row = $db->sql_fetchrow($result);
 						$db->sql_freeresult($result);
 
 						if (!$row)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						if ($row['cat_links'])
 						{
 							$sql = 'SELECT MIN(link_id) as min_link_id, MAX(link_id) as max_link_id
-								FROM ' . DIR_LINK_TABLE . '
-								WHERE link_cat = ' . (int)$cat_id . '
+								FROM ' . DIR_LINK_TABLE.'
+								WHERE link_cat = ' . (int) $cat_id.'
 									AND link_active = 1';
 							$result = $db->sql_query($sql);
 							$row2 = $db->sql_fetchrow($result);
@@ -556,23 +556,23 @@ 
 							{
 								// We really need to find a way of showing statistics... no progress here
 								$sql = 'SELECT COUNT(link_id) as num_links
-									FROM ' . DIR_LINK_TABLE . '
-									WHERE link_cat = ' . (int)$cat_id . '
+									FROM ' . DIR_LINK_TABLE.'
+									WHERE link_cat = ' . (int) $cat_id.'
 										AND link_active = 1
-										AND link_id BETWEEN ' . $start . ' AND ' . $end;
+										AND link_id BETWEEN ' . $start.' AND '.$end;
 								$result = $db->sql_query($sql);
 								$links_done = request_var('links_done', 0) + (int) $db->sql_fetchfield('num_links');
 								$db->sql_freeresult($result);
 
 								$start += $batch_size;
 
-								$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
+								$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
 
 								meta_refresh(0, $url);
 
 								$template->assign_vars(array(
-									'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
-									'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
+									'U_PROGRESS_BAR'		=> $this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
+									'UA_PROGRESS_BAR'		=> addslashes($this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
 									'S_CONTINUE_SYNC'		=> true,
 									'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $links_done, $row['cat_links']))
 								);
@@ -581,12 +581,12 @@ 
 							}
 						}
 
-						$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$cat_id&amp;action=sync_cat";
+						$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$cat_id&amp;action=sync_cat";
 						meta_refresh(0, $url);
 
 						$template->assign_vars(array(
-							'U_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
-							'UA_PROGRESS_BAR'		=> addslashes($this->u_action . '&amp;action=progress_bar'),
+							'U_PROGRESS_BAR'		=> $this->u_action.'&amp;action=progress_bar',
+							'UA_PROGRESS_BAR'		=> addslashes($this->u_action.'&amp;action=progress_bar'),
 							'S_CONTINUE_SYNC'		=> true,
 							'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['cat_links']))
 						);
@@ -597,15 +597,15 @@ 
 					case 'sync_cat':
 
 						$sql = 'SELECT cat_name
-							FROM ' . DIR_CAT_TABLE . '
-							WHERE cat_id = ' . (int)$cat_id;
+							FROM ' . DIR_CAT_TABLE.'
+							WHERE cat_id = ' . (int) $cat_id;
 						$result = $db->sql_query($sql);
 						$row = $db->sql_fetchrow($result);
 						$db->sql_freeresult($result);
 
 						if (!$row)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						sync_dir_cat($cat_id);
@@ -622,26 +622,26 @@ 
 
 						if (!$cat_id)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-							FROM ' . DIR_CAT_TABLE . '
-							WHERE cat_id = ' . (int)$cat_id;
+							FROM ' . DIR_CAT_TABLE.'
+							WHERE cat_id = ' . (int) $cat_id;
 						$result = $db->sql_query($sql);
 						$row = $db->sql_fetchrow($result);
 						$db->sql_freeresult($result);
 
 						if (!$row)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						$move_cat_name = $this->move_cat_by($row, $action, 1);
 
 						if ($move_cat_name !== false)
 						{
-							add_log('admin', 'LOG_DIR_CAT_' . strtoupper($action), $row['cat_name'], $move_cat_name);
+							add_log('admin', 'LOG_DIR_CAT_'.strtoupper($action), $row['cat_name'], $move_cat_name);
 							$cache->destroy('sql', DIR_CAT_TABLE);
 						}
 
@@ -731,8 +731,8 @@ 
 						}
 
 						$sql = 'SELECT cat_id
-							FROM ' . DIR_CAT_TABLE . '
-							WHERE cat_id <> ' . (int)$cat_id;
+							FROM ' . DIR_CAT_TABLE.'
+							WHERE cat_id <> ' . (int) $cat_id;
 						$result = $db->sql_query_limit($sql, 1);
 
 						if ($db->sql_fetchrow($result))
@@ -749,14 +749,14 @@ 
 							'S_CAT_PARENT_ID'	=> $cat_data['parent_id'],
 							'S_ADD_ACTION'		=> ($action == 'add') ? true : false,
 
-							'U_BACK'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-							'U_EDIT_ACTION'		=> $this->u_action . "&amp;parent_id={$this->parent_id}&amp;action=$action&amp;c=$cat_id",
+							'U_BACK'			=> $this->u_action.'&amp;parent_id='.$this->parent_id,
+							'U_EDIT_ACTION'		=> $this->u_action."&amp;parent_id={$this->parent_id}&amp;action=$action&amp;c=$cat_id",
 
 							'L_TITLE'					=> $user->lang[$this->page_title],
 							'ERROR_MSG'					=> (sizeof($errors)) ? implode('<br />', $errors) : '',
-							'ICON_IMAGE'				=> ($cat_data['cat_icon']) ? $phpbb_root_path . 'images/directory/icons/' . $cat_data['cat_icon'] : $phpbb_admin_path . 'images/spacer.gif',
+							'ICON_IMAGE'				=> ($cat_data['cat_icon']) ? $phpbb_root_path.'images/directory/icons/'.$cat_data['cat_icon'] : $phpbb_admin_path.'images/spacer.gif',
 
-							'DIR_ICON_PATH'				=> $phpbb_root_path . 'images/directory/icons',
+							'DIR_ICON_PATH'				=> $phpbb_root_path.'images/directory/icons',
 							'DIR_CAT_NAME'				=> $cat_data['cat_name'],
 							'DIR_CAT_DESC'				=> $dir_cat_desc_data['text'],
 
@@ -789,7 +789,7 @@ 
 
 						if (!$cat_id)
 						{
-							trigger_error($user->lang['DIR_NO_CAT'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+							trigger_error($user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 						}
 
 						$cat_data = $this->get_cat_info($cat_id);
@@ -805,8 +805,8 @@ 
 						$cat_list = make_cat_select($cat_data['parent_id'], $subcats_id);
 
 						$sql = 'SELECT cat_id
-							FROM ' . DIR_CAT_TABLE . '
-							WHERE cat_id <> ' . (int)$cat_id;
+							FROM ' . DIR_CAT_TABLE.'
+							WHERE cat_id <> ' . (int) $cat_id;
 						$result = $db->sql_query_limit($sql, 1);
 
 						if ($db->sql_fetchrow($result))
@@ -821,8 +821,8 @@ 
 
 						$template->assign_vars(array(
 							'S_DELETE_DIR_CAT'		=> true,
-							'U_ACTION'				=> $this->u_action . "&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$cat_id",
-							'U_BACK'				=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+							'U_ACTION'				=> $this->u_action."&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$cat_id",
+							'U_BACK'				=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
 							'DIR_CAT_NAME'			=> $cat_data['cat_name'],
 							'S_HAS_SUBCATS'		=> ($cat_data['right_id'] - $cat_data['left_id'] > 1) ? true : false,
@@ -842,7 +842,7 @@ 
 				}
 				else
 				{
-					$navigation = '<a href="' . $this->u_action . '">' . $user->lang['DIR_INDEX'] . '</a>';
+					$navigation = '<a href="'.$this->u_action.'">'.$user->lang['DIR_INDEX'].'</a>';
 
 					$cats_nav = get_dir_cat_branch($this->parent_id, 'parents', 'descending');
 
@@ -850,11 +850,11 @@ 
 					{
 						if ($row['cat_id'] == $this->parent_id)
 						{
-							$navigation .= ' -&gt; ' . $row['cat_name'];
+							$navigation .= ' -&gt; '.$row['cat_name'];
 						}
 						else
 						{
-							$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['cat_id'] . '">' . $row['cat_name'] . '</a>';
+							$navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
 						}
 					}
 				}
@@ -868,8 +868,8 @@ 
 				}
 
 				$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_name, cat_icon, cat_desc_uid, cat_desc_bitfield, cat_desc, cat_desc_options, cat_links
-					FROM ' . DIR_CAT_TABLE . '
-					WHERE parent_id = ' . (int)$this->parent_id . '
+					FROM ' . DIR_CAT_TABLE.'
+					WHERE parent_id = ' . (int) $this->parent_id.'
 					ORDER BY left_id';
 				$result = $db->sql_query($sql);
 
@@ -877,23 +877,23 @@ 
 				{
 					do
 					{
-						$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['DIR_SUBCAT'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '" />';
+						$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$user->lang['DIR_SUBCAT'].'" />' : '<img src="images/icon_folder.gif" alt="'.$user->lang['FOLDER'].'" />';
 
-						$url = $this->u_action . "&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
+						$url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
 
 						$template->assign_block_vars('cats', array(
 							'FOLDER_IMAGE'		=> $folder_image,
-							'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="' . $phpbb_root_path . 'images/directory/icons/' . $row['cat_icon'] . '" alt="" />' : '',
+							'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="'.$phpbb_root_path.'images/directory/icons/'.$row['cat_icon'].'" alt="" />' : '',
 							'CAT_NAME'			=> $row['cat_name'],
 							'CAT_DESCRIPTION'	=> generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
 							'CAT_LINKS'			=> $row['cat_links'],
 
-							'U_CAT'				=> $this->u_action . '&amp;parent_id=' . $row['cat_id'],
-							'U_MOVE_UP'			=> $url . '&amp;action=move_up',
-							'U_MOVE_DOWN'		=> $url . '&amp;action=move_down',
-							'U_EDIT'			=> $url . '&amp;action=edit',
-							'U_DELETE'			=> $url . '&amp;action=delete',
-							'U_SYNC'			=> $url . '&amp;action=sync')
+							'U_CAT'				=> $this->u_action.'&amp;parent_id='.$row['cat_id'],
+							'U_MOVE_UP'			=> $url.'&amp;action=move_up',
+							'U_MOVE_DOWN'		=> $url.'&amp;action=move_down',
+							'U_EDIT'			=> $url.'&amp;action=edit',
+							'U_DELETE'			=> $url.'&amp;action=delete',
+							'U_SYNC'			=> $url.'&amp;action=sync')
 						);
 					}
 					while ($row = $db->sql_fetchrow($result));
@@ -902,14 +902,14 @@ 
 				{
 					$row = $this->get_cat_info($this->parent_id);
 
-					$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;c=' . $row['cat_id'];
+					$url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
 
 					$template->assign_vars(array(
 						'S_NO_CATS'			=> true,
 
-						'U_EDIT'			=> $url . '&amp;action=edit',
-						'U_DELETE'			=> $url . '&amp;action=delete',
-						'U_SYNC'			=> $url . '&amp;action=sync')
+						'U_EDIT'			=> $url.'&amp;action=edit',
+						'U_DELETE'			=> $url.'&amp;action=delete',
+						'U_SYNC'			=> $url.'&amp;action=sync')
 					);
 				}
 				$db->sql_freeresult($result);
@@ -919,10 +919,10 @@ 
 					'NAVIGATION'	=> $navigation,
 					'CAT_BOX'		=> $cat_box,
 					'U_SEL_ACTION'	=> $this->u_action,
-					'U_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+					'U_ACTION'		=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
-					'U_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
-					'UA_PROGRESS_BAR'	=> addslashes($this->u_action . '&amp;action=progress_bar'),
+					'U_PROGRESS_BAR'	=> $this->u_action.'&amp;action=progress_bar',
+					'UA_PROGRESS_BAR'	=> addslashes($this->u_action.'&amp;action=progress_bar'),
 				));
 
 			break;
@@ -931,8 +931,8 @@ 
 				$this->page_title = 'ACP_DIRECTORY';
 				$this->tpl_name = 'acp_dir_val';
 
-				$mark	= (isset($_POST['link_id'])) ? request_var('link_id', array(0)) : array();
-				$start	= request_var('start', 0);
+				$mark = (isset($_POST['link_id'])) ? request_var('link_id', array(0)) : array();
+				$start = request_var('start', 0);
 				$submit = isset($_POST['submit']);
 
 				$form_key = 'acp_dir_val';
@@ -941,15 +941,15 @@ 
 
 				if (!class_exists('messenger'))
 				{
-					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+					include($phpbb_root_path.'includes/functions_messenger.'.$phpEx);
 				}
-				$messenger	= new messenger(false);
+				$messenger = new messenger(false);
 
 				if ($submit && sizeof($mark))
 				{
 					if ($action !== 'delete' && !check_form_key($form_key))
 					{
-						trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+						trigger_error($user->lang['FORM_INVALID'].adm_back_link($this->u_action), E_USER_WARNING);
 					}
 
 					$sql_array = array(
@@ -994,7 +994,7 @@ 
 											'ON'	=> 'an.n_user_id = u.user_id'
 										)
 									),
-									'WHERE'		=> 'an.n_cat_id = ' . (int)$row['link_cat']);
+									'WHERE'		=> 'an.n_cat_id = '.(int) $row['link_cat']);
 								$sql = $db->sql_build_query('SELECT', $sql_array);
 								$result2 = $db->sql_query($sql);
 
@@ -1010,15 +1010,15 @@ 
 								$db->sql_freeresult($result2);
 							}
 
-							if(isset($subscibed_cat[$row['link_cat']]))
+							if (isset($subscibed_cat[$row['link_cat']]))
 							{
 								$messenger->replyto($config['board_email']);
 
 								$cat_data2 = $subscibed_cat[$row['link_cat']];
 
-								$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-								$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-								$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+								$messenger->headers('X-AntiAbuse: Board servername - '.$config['server_name']);
+								$messenger->headers('X-AntiAbuse: User_id - '.$user->data['user_id']);
+								$messenger->headers('X-AntiAbuse: Username - '.$user->data['username']);
 
 								foreach ($cat_data2 as $user_id => $user_data)
 								{
@@ -1039,15 +1039,15 @@ 
 
 							}
 
-							$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET link_active = 1, link_time = '. time() .', link_cat = '.request_var('c'.$row['link_id'], 0).'
-								WHERE link_id = ' . (int)$row['link_id'];
+							$sql = 'UPDATE '.DIR_LINK_TABLE.' SET link_active = 1, link_time = '.time().', link_cat = '.request_var('c'.$row['link_id'], 0).'
+								WHERE link_id = ' . (int) $row['link_id'];
 							$db->sql_query($sql);
 						}
-						elseif($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+						elseif ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 						{
-							if (file_exists($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner'])))
+							if (file_exists($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner'])))
 							{
-								@unlink($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner']));
+								@unlink($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner']));
 							}
 						}
 					}
@@ -1059,8 +1059,8 @@ 
 
 							foreach ($cat_data as $cat_id => $count)
 							{
-								$sql = 'UPDATE ' . DIR_CAT_TABLE . ' SET cat_links = cat_links + '.$count.'
-									WHERE cat_id = ' . (int)$cat_id;
+								$sql = 'UPDATE '.DIR_CAT_TABLE.' SET cat_links = cat_links + '.$count.'
+									WHERE cat_id = ' . (int) $cat_id;
 								$db->sql_query($sql);
 							}
 
@@ -1074,7 +1074,7 @@ 
 							{
 								foreach ($mark as $link_id)
 								{
-									$sql = 'DELETE FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int)$link_id;
+									$sql = 'DELETE FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $link_id;
 									$db->sql_query($sql);
 								}
 
@@ -1096,9 +1096,9 @@ 
 
 					$messenger->reset();
 
-					$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+					$messenger->headers('X-AntiAbuse: Board servername - '.$config['server_name']);
+					$messenger->headers('X-AntiAbuse: User_id - '.$user->data['user_id']);
+					$messenger->headers('X-AntiAbuse: Username - '.$user->data['username']);
 
 					foreach ($link_data as $id => $row)
 					{
@@ -1106,12 +1106,12 @@ 
 						$email = ($row['link_user_id'] == ANONYMOUS) ? $row['link_guest_email'] : $row['user_email'];
 
 						$messenger->template('mods/directory/user_validation', $row['user_lang']);
-						$messenger->subject($user->lang['EMAIL_SUBJECT_' . strtoupper($action)]);
+						$messenger->subject($user->lang['EMAIL_SUBJECT_'.strtoupper($action)]);
 						$messenger->to($email, $username);
 
 						$messenger->assign_vars(array(
 							'USERNAME'	=> htmlspecialchars_decode($username),
-							'TEXT'		=> sprintf($user->lang['EMAIL_TEXT_' . strtoupper($action)], $row['link_name'], htmlspecialchars_decode($config['sitename']), generate_board_url())
+							'TEXT'		=> sprintf($user->lang['EMAIL_TEXT_'.strtoupper($action)], $row['link_name'], htmlspecialchars_decode($config['sitename']), generate_board_url())
 						));
 
 						$messenger->send($row['user_notify_type']);
@@ -1119,7 +1119,7 @@ 
 				}
 
 				$sql = 'SELECT COUNT(1) AS total_links
-					FROM ' . DIR_LINK_TABLE . '
+					FROM ' . DIR_LINK_TABLE.'
 					WHERE link_active = 0';
 				$result = $db->sql_query($sql);
 				$total_links = (int) $db->sql_fetchfield('total_links');
@@ -1157,7 +1157,7 @@ 
 					{
 						if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 						{
-							$u_banner = $phpbb_root_path.'images/directory/banners/' . basename($row['link_banner']);
+							$u_banner = $phpbb_root_path.'images/directory/banners/'.basename($row['link_banner']);
 						}
 						else
 						{
@@ -1175,7 +1175,7 @@ 
 							$height /= $coef_max;
 						}
 
-						$s_banner = '<img src="' . $u_banner . '" width="' . $width . '" height="' . $height . '" border="0" alt="" />';
+						$s_banner = '<img src="'.$u_banner.'" width="'.$width.'" height="'.$height.'" border="0" alt="" />';
 					}
 
 					$username = ($row['link_user_id'] == ANONYMOUS) ? $row['link_guest_email'] : $row['username'];
@@ -1196,9 +1196,9 @@ 
 				$option_ary = array('activate' => 'DIR_LINK_ACTIVATE', 'delete' => 'DIR_LINK_DELETE');
 
 				$template->assign_vars(array(
-					'PAGINATION'			=> generate_pagination($this->u_action . "&amp;i=$id&amp;action=$action&amp;mode=$mode", $total_links, 10, $start),
+					'PAGINATION'			=> generate_pagination($this->u_action."&amp;i=$id&amp;action=$action&amp;mode=$mode", $total_links, 10, $start),
 					'PAGE_NUMBER'			=> on_page($total_links, 10, $start),
-					'U_ACTION'				=> $this->u_action . '&amp;start=' . $start,
+					'U_ACTION'				=> $this->u_action.'&amp;start='.$start,
 					'S_LINKS_OPTIONS'		=> build_select($option_ary),
 				));
 
@@ -1219,7 +1219,7 @@ 
 		{
 			$selected = ($url == $value) ? 'selected="selected"' : '';
 
-			$tpl .= '<option value="' . $url . '" ' . $selected . '>' . $service . '</option>';
+			$tpl .= '<option value="'.$url.'" '.$selected.'>'.$service.'</option>';
 		}
 		$tpl .= '</select>';
 
@@ -1247,7 +1247,7 @@ 
 		{
 			$selected = ($i == $value) ? '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>';
 		}
 		$tpl .= '</select>';
 
@@ -1259,8 +1259,8 @@ 
 		global $db;
 
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
-			FROM ' . DIR_CAT_TABLE . '
-			WHERE cat_id = ' . (int)$dir_cat_id;
+			FROM ' . DIR_CAT_TABLE.'
+			WHERE cat_id = ' . (int) $dir_cat_id;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
@@ -1310,7 +1310,7 @@ 
 			$cat_data_sql['cat_cron_enable'] = 0;
 		}
 
-		if(!$cat_data_sql['cat_cron_enable'])
+		if (!$cat_data_sql['cat_cron_enable'])
 		{
 			$cat_data_sql['cat_cron_next'] = 0;
 		}
@@ -1326,25 +1326,25 @@ 
 			if ($cat_data_sql['parent_id'])
 			{
 				$sql = 'SELECT left_id, right_id
-					FROM ' . DIR_CAT_TABLE . '
-					WHERE cat_id = ' . (int)$cat_data_sql['parent_id'];
+					FROM ' . DIR_CAT_TABLE.'
+					WHERE cat_id = ' . (int) $cat_data_sql['parent_id'];
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
 				if (!$row)
 				{
-					trigger_error($user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&amp;' . $this->parent_id), E_USER_WARNING);
+					trigger_error($user->lang['PARENT_NOT_EXIST'].adm_back_link($this->u_action.'&amp;'.$this->parent_id), E_USER_WARNING);
 				}
 
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+				$sql = 'UPDATE '.DIR_CAT_TABLE.'
 					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE left_id > ' . (int)$row['right_id'];
+					WHERE left_id > ' . (int) $row['right_id'];
 				$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+				$sql = 'UPDATE '.DIR_CAT_TABLE.'
 					SET right_id = right_id + 2
-					WHERE ' . (int)$row['left_id'] . ' BETWEEN left_id AND right_id';
+					WHERE ' . (int) $row['left_id'].' BETWEEN left_id AND right_id';
 				$db->sql_query($sql);
 
 				$cat_data_sql['left_id'] = $row['right_id'];
@@ -1364,10 +1364,10 @@ 
 
 			if ($cat_data_sql['cat_cron_enable'])
 			{
-				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 			}
 
-			$sql = 'INSERT INTO ' . DIR_CAT_TABLE . ' ' . $db->sql_build_array('INSERT', $cat_data_sql);
+			$sql = 'INSERT INTO '.DIR_CAT_TABLE.' '.$db->sql_build_array('INSERT', $cat_data_sql);
 			$db->sql_query($sql);
 
 			$cat_data['cat_id'] = $db->sql_nextid();
@@ -1389,18 +1389,18 @@ 
 				return $errors;
 			}
 
-			if($cat_data_sql['cat_cron_enable'])
+			if ($cat_data_sql['cat_cron_enable'])
 			{
-				if($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable'])
+				if ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable'])
 				{
-					$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+					$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 				}
 			}
 
 			if ($row['cat_name'] != $cat_data_sql['cat_name'])
 			{
 				// the cat name has changed, clear the parents list of all categories (for safety)
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+				$sql = 'UPDATE '.DIR_CAT_TABLE."
 					SET cat_parents = ''";
 				$db->sql_query($sql);
 			}
@@ -1409,9 +1409,9 @@ 
 			$cat_id = $cat_data_sql['cat_id'];
 			unset($cat_data_sql['cat_id']);
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $cat_data_sql) . '
-				WHERE cat_id = ' . (int)$cat_id;
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
+				SET ' . $db->sql_build_array('UPDATE', $cat_data_sql).'
+				WHERE cat_id = ' . (int) $cat_id;
 			$db->sql_query($sql);
 
 			// Add it back
@@ -1440,16 +1440,16 @@ 
 		}
 
 		// Resync parents
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET right_id = right_id - $diff, cat_parents = ''
-			WHERE left_id < " . (int)$from_data['right_id'] . "
-				AND right_id > " . (int)$from_data['right_id'];
+			WHERE left_id < ".(int) $from_data['right_id']."
+				AND right_id > " . (int) $from_data['right_id'];
 		$db->sql_query($sql);
 
 		// Resync righthand side of tree
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET left_id = left_id - $diff, right_id = right_id - $diff, cat_parents = ''
-			WHERE left_id > " . (int)$from_data['right_id'];
+			WHERE left_id > ".(int) $from_data['right_id'];
 		$db->sql_query($sql);
 
 		if ($to_id > 0)
@@ -1458,16 +1458,16 @@ 
 			$to_data = $this->get_cat_info($to_id);
 
 			// Resync new parents
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
 				SET right_id = right_id + $diff, cat_parents = ''
-				WHERE " . (int)$to_data['right_id'] . ' BETWEEN left_id AND right_id
+				WHERE ".(int) $to_data['right_id'].' BETWEEN left_id AND right_id
 					AND ' . $db->sql_in_set('cat_id', $moved_ids, true);
 			$db->sql_query($sql);
 
 			// Resync the righthand side of the tree
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
 				SET left_id = left_id + $diff, right_id = right_id + $diff, cat_parents = ''
-				WHERE left_id > " . (int)$to_data['right_id'] . '
+				WHERE left_id > ".(int) $to_data['right_id'].'
 					AND ' . $db->sql_in_set('cat_id', $moved_ids, true);
 			$db->sql_query($sql);
 
@@ -1476,28 +1476,28 @@ 
 
 			if ($to_data['right_id'] > $from_data['right_id'])
 			{
-				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
+				$diff = '+ '.($to_data['right_id'] - $from_data['right_id'] - 1);
 			}
 			else
 			{
-				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
+				$diff = '- '.abs($to_data['right_id'] - $from_data['right_id'] - 1);
 			}
 		}
 		else
 		{
 			$sql = 'SELECT MAX(right_id) AS right_id
-				FROM ' . DIR_CAT_TABLE . '
+				FROM ' . DIR_CAT_TABLE.'
 				WHERE ' . $db->sql_in_set('cat_id', $moved_ids, true);
 			$result = $db->sql_query($sql);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			$diff = '+ ' . ($row['right_id'] - $from_data['left_id'] + 1);
+			$diff = '+ '.($row['right_id'] - $from_data['left_id'] + 1);
 		}
 
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET left_id = left_id $diff, right_id = right_id $diff, cat_parents = ''
-			WHERE " . $db->sql_in_set('cat_id', $moved_ids);
+			WHERE ".$db->sql_in_set('cat_id', $moved_ids);
 		$db->sql_query($sql);
 
 		return $errors;
@@ -1532,9 +1532,9 @@ 
 		* module will move as far as possible
 		*/
 		$sql = 'SELECT cat_id, cat_name, left_id, right_id
-			FROM ' . DIR_CAT_TABLE . '
-			WHERE parent_id = ' . (int)$dir_cat_row['parent_id'] . '
-				AND ' . (($action == 'move_up') ? 'right_id < ' . (int)$dir_cat_row['right_id'] . ' ORDER BY right_id DESC' : 'left_id > ' . (int)$dir_cat_row['left_id'] . ' ORDER BY left_id ASC');
+			FROM ' . DIR_CAT_TABLE.'
+			WHERE parent_id = ' . (int) $dir_cat_row['parent_id'].'
+				AND ' . (($action == 'move_up') ? 'right_id < '.(int) $dir_cat_row['right_id'].' ORDER BY right_id DESC' : 'left_id > '.(int) $dir_cat_row['left_id'].' ORDER BY left_id ASC');
 		$result = $db->sql_query_limit($sql, $steps);
 
 		$target = array();
@@ -1581,7 +1581,7 @@ 
 		}
 
 		// Now do the dirty job
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET left_id = left_id + CASE
 				WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
 				ELSE {$diff_down}
@@ -1625,8 +1625,8 @@ 
 				$log_action_posts = 'MOVE_LINKS';
 
 				$sql = 'SELECT cat_name
-					FROM ' . DIR_CAT_TABLE . '
-					WHERE cat_id = ' . (int)$links_to_id;
+					FROM ' . DIR_CAT_TABLE.'
+					WHERE cat_id = ' . (int) $links_to_id;
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
@@ -1666,7 +1666,7 @@ 
 
 			$diff = sizeof($cat_ids) * 2;
 
-			$sql = 'DELETE FROM ' . DIR_CAT_TABLE . '
+			$sql = 'DELETE FROM '.DIR_CAT_TABLE.'
 				WHERE ' . $db->sql_in_set('cat_id', $cat_ids);
 			$db->sql_query($sql);
 
@@ -1682,8 +1682,8 @@ 
 				$log_action_cats = 'MOVE_CATS';
 
 				$sql = 'SELECT cat_name
-					FROM ' . DIR_CAT_TABLE . '
-					WHERE cat_id = ' . (int)$subcats_to_id;
+					FROM ' . DIR_CAT_TABLE.'
+					WHERE cat_id = ' . (int) $subcats_to_id;
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
@@ -1697,8 +1697,8 @@ 
 					$subcats_to_name = $row['cat_name'];
 
 					$sql = 'SELECT cat_id
-						FROM ' . DIR_CAT_TABLE . '
-						WHERE parent_id = ' . (int)$cat_id;
+						FROM ' . DIR_CAT_TABLE.'
+						WHERE parent_id = ' . (int) $cat_id;
 					$result = $db->sql_query($sql);
 
 					while ($row = $db->sql_fetchrow($result))
@@ -1710,14 +1710,14 @@ 
 					// Grab new cat data for correct tree updating later
 					$cat_data = $this->get_cat_info($cat_id);
 
-					$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-						SET parent_id = ' . (int)$subcats_to_id . '
-							WHERE parent_id = ' . (int)$cat_id;
+					$sql = 'UPDATE '.DIR_CAT_TABLE.'
+						SET parent_id = ' . (int) $subcats_to_id.'
+							WHERE parent_id = ' . (int) $cat_id;
 					$db->sql_query($sql);
 
 					$diff = 2;
-					$sql = 'DELETE FROM ' . DIR_CAT_TABLE . '
-						WHERE cat_id = ' . (int)$cat_id;
+					$sql = 'DELETE FROM '.DIR_CAT_TABLE.'
+						WHERE cat_id = ' . (int) $cat_id;
 					$db->sql_query($sql);
 				}
 			}
@@ -1730,18 +1730,18 @@ 
 		else
 		{
 			$diff = 2;
-			$sql = 'DELETE FROM ' . DIR_CAT_TABLE . '
-				WHERE cat_id = ' . (int)$cat_id;
+			$sql = 'DELETE FROM '.DIR_CAT_TABLE.'
+				WHERE cat_id = ' . (int) $cat_id;
 			$db->sql_query($sql);
 		}
 
 		// Resync tree
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET right_id = right_id - $diff
 			WHERE left_id < {$cat_data['right_id']} AND right_id > {$cat_data['right_id']}";
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+		$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET left_id = left_id - $diff, right_id = right_id - $diff
 			WHERE left_id > {$cat_data['right_id']}";
 		$db->sql_query($sql);
@@ -1794,13 +1794,13 @@ 
 	{
 		global $db;
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-			SET link_cat = ' . (int)$to_id . '
-			WHERE link_cat = ' . (int)$from_id;
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
+			SET link_cat = ' . (int) $to_id.'
+			WHERE link_cat = ' . (int) $from_id;
 		$db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . DIR_NOTIFICATION_TABLE . '
-			WHERE n_cat_id = ' . (int)$from_id;
+		$sql = 'DELETE FROM '.DIR_NOTIFICATION_TABLE.'
+			WHERE n_cat_id = ' . (int) $from_id;
 		$db->sql_query($sql);
 
 		sync_dir_cat($to_id);
@@ -1816,8 +1816,8 @@ 
 
 		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
 		$sql = 'SELECT link_id, link_banner
-			FROM ' . DIR_LINK_TABLE . '
-			WHERE link_cat = ' . (int)$cat_id;
+			FROM ' . DIR_LINK_TABLE.'
+			WHERE link_cat = ' . (int) $cat_id;
 		$result = $db->sql_query($sql);
 
 		$link_ids = array();
@@ -1825,11 +1825,11 @@ 
 		{
 			$link_ids[] = $row['link_id'];
 
-			if($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+			if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 			{
-				if (file_exists($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner'])))
+				if (file_exists($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner'])))
 				{
-					@unlink($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner']));
+					@unlink($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner']));
 				}
 			}
 		}
@@ -1845,7 +1845,7 @@ 
 
 			foreach ($link_datas_ary as $table => $field)
 			{
-				$db->sql_query("DELETE FROM $table WHERE " . $db->sql_in_set($field, $link_ids));
+				$db->sql_query("DELETE FROM $table WHERE ".$db->sql_in_set($field, $link_ids));
 			}
 		}
 
@@ -1857,7 +1857,7 @@ 
 
 		foreach ($cat_datas_ary as $table => $field)
 		{
-			$db->sql_query("DELETE FROM $table WHERE $field = " . (int)$cat_id);
+			$db->sql_query("DELETE FROM $table WHERE $field = ".(int) $cat_id);
 		}
 
 		$db->sql_transaction('commit');
@@ -1888,9 +1888,9 @@ 
 	$rows = array();
 
 	$sql = 'SELECT f2.cat_id, f2.cat_name, f2.left_id, f2.right_id
-		FROM ' . DIR_CAT_TABLE . ' f1
-		LEFT JOIN ' . DIR_CAT_TABLE . " f2 ON ($condition)
-		WHERE f1.cat_id = " . (int)$dir_cat_id . "
+		FROM ' . DIR_CAT_TABLE.' f1
+		LEFT JOIN ' . DIR_CAT_TABLE." f2 ON ($condition)
+		WHERE f1.cat_id = ".(int) $dir_cat_id."
 		ORDER BY f2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC');
 	$result = $db->sql_query($sql);
 
@@ -1914,7 +1914,7 @@ 
 
 	// This query is identical to the jumpbox one
 	$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-		FROM ' . DIR_CAT_TABLE . '
+		FROM ' . DIR_CAT_TABLE.'
 		ORDER BY left_id ASC';
 	$result = $db->sql_query($sql);
 
@@ -1944,7 +1944,7 @@ 
 		}
 
 		$selected = (($row['cat_id'] == $select_id) ? ' selected="selected"' : '');
-		$cat_list .= '<option value="' . $row['cat_id'] . '"' . (($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected) . '>' . $padding . $row['cat_name'] . '</option>';
+		$cat_list .= '<option value="'.$row['cat_id'].'"'.(($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected).'>'.$padding.$row['cat_name'].'</option>';
 	}
 	$db->sql_freeresult($result);
 	unset($padding_store);
@@ -1957,16 +1957,16 @@ 
 	global $db;
 
 	$sql = 'SELECT COUNT(link_id) AS num_links
-		FROM ' . DIR_LINK_TABLE . '
-		WHERE link_cat = ' . (int)$cat_id . '
+		FROM ' . DIR_LINK_TABLE.'
+		WHERE link_cat = ' . (int) $cat_id.'
 		AND link_active = 1';
 	$result = $db->sql_query($sql);
 	$total_links = (int) $db->sql_fetchfield('num_links');
 	$db->sql_freeresult($result);
 
-	$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-		SET cat_links = ' . $total_links . '
-		WHERE cat_id = ' . (int)$cat_id;
+	$sql = 'UPDATE '.DIR_CAT_TABLE.'
+		SET cat_links = ' . $total_links.'
+		WHERE cat_id = ' . (int) $cat_id;
 	$db->sql_query($sql);
 
 	return;
@@ -1976,36 +1976,36 @@ 
 {
 	global $db;
 
-	$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+	$sql = 'UPDATE '.DIR_LINK_TABLE.'
 		SET	link_comment = 0,
 			link_note = 0,
 			link_vote = 0
-		WHERE link_id BETWEEN ' . (int)$start . ' AND ' . (int)$stop;
+		WHERE link_id BETWEEN ' . (int) $start.' AND '.(int) $stop;
 	$db->sql_query($sql);
 
-	$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM ' . DIR_VOTE_TABLE . '
-		WHERE vote_link_id BETWEEN ' . (int)$start . ' AND ' . (int)$stop . '
+	$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM '.DIR_VOTE_TABLE.'
+		WHERE vote_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 		GROUP BY vote_link_id';
 	$result = $db->sql_query($sql);
 	while ($tmp = $db->sql_fetchrow($result))
 	{
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET
-			link_note = ' . (int)$tmp['total'] . ',
-			link_vote = ' . (int)$tmp['nb_vote'] . '
-			WHERE link_id = ' . (int)$tmp['vote_link_id'];
+		$sql = 'UPDATE '.DIR_LINK_TABLE.' SET
+			link_note = ' . (int) $tmp['total'].',
+			link_vote = ' . (int) $tmp['nb_vote'].'
+			WHERE link_id = ' . (int) $tmp['vote_link_id'];
 		$db->sql_query($sql);
 	}
 	$db->sql_freeresult($result);
 
-	$sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment FROM ' . DIR_COMMENT_TABLE . '
-		WHERE comment_link_id BETWEEN ' . (int)$start . ' AND ' . (int)$stop . '
+	$sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment FROM '.DIR_COMMENT_TABLE.'
+		WHERE comment_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 		GROUP BY comment_link_id';
 	$result = $db->sql_query($sql);
 	while ($tmp = $db->sql_fetchrow($result))
 	{
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET
-			link_comment = ' . (int)$tmp['nb_comment'] . '
-			WHERE link_id = ' . (int)$tmp['comment_link_id'];
+		$sql = 'UPDATE '.DIR_LINK_TABLE.' SET
+			link_comment = ' . (int) $tmp['nb_comment'].'
+			WHERE link_id = ' . (int) $tmp['comment_link_id'];
 		$db->sql_query($sql);
 	}
 	$db->sql_freeresult($result);
@@ -2017,7 +2017,7 @@ 
 {
 	global $phpbb_root_path;
 
-	$imglist = filelist($phpbb_root_path . 'images/directory/icons', '');
+	$imglist = filelist($phpbb_root_path.'images/directory/icons', '');
 	$edit_img = $filename_list = '';
 	$ranks = $existing_imgs = array();
 
@@ -2027,7 +2027,7 @@ 
 
 		foreach ($img_ary as $img)
 		{
-			$img = $path . $img;
+			$img = $path.$img;
 
 			if (!in_array($img, $existing_imgs) || $action == 'edit')
 			{
@@ -2046,11 +2046,11 @@ 
 					continue;
 				}
 
-				$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
+				$filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
 			}
 		}
 	}
-	$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
+	$filename_list = '<option value=""'.(($edit_img == '') ? ' selected="selected"' : '').'>----------</option>'.$filename_list;
 	return ($filename_list);
 }
 
@@ -2059,7 +2059,7 @@ 
 	global $db, $phpbb_root_path;
 
 	$banner_path = 'images/directory/banners/';
-	$imglist = filelist($phpbb_root_path . $banner_path);
+	$imglist = filelist($phpbb_root_path.$banner_path);
 	$physical_files = $logical_files = $orphan_files = array();
 
 	if (!empty($imglist['']))
@@ -2067,15 +2067,15 @@ 
 		$imglist = array_values($imglist);
 		$imglist = $imglist[0];
 
-		foreach($imglist as $key => $img)
+		foreach ($imglist as $key => $img)
 		{
 			$physical_files[] = $img;
 		}
-		$sql = 'SELECT link_banner FROM ' . DIR_LINK_TABLE . '
+		$sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.'
 		WHERE link_banner <> \'\'';
 		$result = $db->sql_query($sql);
 
-		while($row = $db->sql_fetchrow($result))
+		while ($row = $db->sql_fetchrow($result))
 		{
 			if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 			{
@@ -2087,7 +2087,7 @@ 
 		$orphan_files = array_diff($physical_files, $logical_files);
 	}
 
-	if(!$delete)
+	if (!$delete)
 	{
 		return sizeof($orphan_files);
 	}
@@ -2099,7 +2099,7 @@ 
 	{
 		if (in_array($file, $orphan_files))
 		{
-			@unlink($directory .'/'.$file);
+			@unlink($directory.'/'.$file);
 		}
 	}
 }

root/includes/mods/directory/functions.php

Doc Comments +15 added lines, -19 removed lines

@@ -55,7 +55,6 @@ 
 	* Edit a link of the db
 	*
 	* @param array $data contains all datas to edit in db
-	* @param int $u is link's id, for WHERE clause
 	*/
 	function edit($data, $url_id, $need_approval)
 	{
@@ -95,7 +94,6 @@ 
 	/**
 	* Del a link of the db
 	*
-	* @param int $u is link's id, for WHERE clause
 	*/
 	function del($url_id, $cat_id, $cron = false)
 	{
@@ -168,7 +166,6 @@ 
 	/**
 	* Increments link view counter
 	*
-	* @param int $u is link's id, for WHERE clause
 	*/
 	function view($url_id)
 	{
@@ -198,7 +195,7 @@ 
 	*
 	* @param string $url
 	*
-	* @return true if ok, else false.
+	* @return boolean if ok, else false.
 	*/
 	function checkurl($url)
 	{
@@ -242,7 +239,7 @@ 
 	*
 	* @param string $url to clean
 	*
-	* @return the correct string.
+	* @return string correct string.
 	*/
 	function clean_url($url)
 	{
@@ -260,7 +257,7 @@ 
 	 *
 	 * @param array $data link's data from db
 	 *
-	 * @return flag image.
+	 * @return string image.
 	 */
 	function display_flag($data)
 	{
@@ -319,7 +316,7 @@ 
 	*
 	* @param array $data link's data from db
 	*
-	* @return the html code.
+	* @return null|string html code.
 	*/
 	function display_vote($data, $votes_status)
 	{
@@ -392,7 +389,7 @@ 
 	*
 	* @param array $data link's data from db
 	*
-	* @return pr image, false or 'n/a'.
+	* @return string|false image, false or 'n/a'.
 	*/
 	function display_pagerank($data)
 	{
@@ -427,9 +424,7 @@ 
 	* Display and resize a banner
 	*
 	* @param array $data link's data from db
-	* @param bool $have_banner
-	*
-	* @return banner image.
+	* @return string
 	*/
 	function display_bann($data)
 	{
@@ -465,9 +460,9 @@ 
 	* Display number of comments and link for posting
 	*
 	* @param int $u is link_id from db
-	* @param int $nb_comments si number of comments for this link
+	* @param int $nb_comment si number of comments for this link
 	*
-	* @return html code (counter + link).
+	* @return null|string code (counter + link).
 	*/
 	function display_comm($u, $nb_comment, $comments_status)
 	{
@@ -598,7 +593,6 @@ 
 	/**
 	 * Send a email to user who want be notify of a new publication link
 	 *
-	 * @param array $data link's data from db
 	 */
 	function notify_member($site)
 	{
@@ -661,7 +655,7 @@ 
 	*
 	* @param string $url is link's url
 	*
-	* @return the thumb url
+	* @return string thumb url
 	*/
 	function thumb_process($url)
 	{
@@ -794,7 +788,7 @@ 
 	*
 	* @param string $banner is banner's remote url
 	*
-	* @return false if error, true for ok
+	* @return false|string if error, true for ok
 	*/
 	function banner_remote($banner, &$error)
 	{
@@ -865,7 +859,7 @@ 
 	* @param string $destination path to banner directory
 	* @param string $file is file's name
 	*
-	* @return true if delete success, else false
+	* @return boolean if delete success, else false
 	*/
 	function banner_delete($destination, $file)
 	{
@@ -1423,10 +1417,9 @@ 
 /**
  * List flags
  *
- * @param string $dir is flag directory path
  * @param $value selected flag
  *
- * @return html code
+ * @return string code
  */
 function get_dir_flag_list($value)
 {
@@ -1638,6 +1631,9 @@ 
 	}
 }
 
+/**
+ * @param boolean $optional
+ */
 function validate_link_back($remote_url, $optional, $cron = false)
 {
 	global $config;

Indentation +138 added lines, -138 removed lines

@@ -24,10 +24,10 @@ 
 class link
 {
 	/**
-	* Add a link into db
-	*
-	* @param array $data contains all datas to insert in db
-	*/
+	 * Add a link into db
+	 *
+	 * @param array $data contains all datas to insert in db
+	 */
 	function add($data)
 	{
 		global $db, $auth, $config, $categorie;
@@ -52,11 +52,11 @@ 
 	}
 
 	/**
-	* Edit a link of the db
-	*
-	* @param array $data contains all datas to edit in db
-	* @param int $u is link's id, for WHERE clause
-	*/
+	 * Edit a link of the db
+	 *
+	 * @param array $data contains all datas to edit in db
+	 * @param int $u is link's id, for WHERE clause
+	 */
 	function edit($data, $url_id, $need_approval)
 	{
 		global $db, $cache;
@@ -93,10 +93,10 @@ 
 	}
 
 	/**
-	* Del a link of the db
-	*
-	* @param int $u is link's id, for WHERE clause
-	*/
+	 * Del a link of the db
+	 *
+	 * @param int $u is link's id, for WHERE clause
+	 */
 	function del($url_id, $cat_id, $cron = false)
 	{
 		global $db, $mode, $phpEx, $phpbb_root_path, $user;
@@ -166,10 +166,10 @@ 
 	}
 
 	/**
-	* Increments link view counter
-	*
-	* @param int $u is link's id, for WHERE clause
-	*/
+	 * Increments link view counter
+	 *
+	 * @param int $u is link's id, for WHERE clause
+	 */
 	function view($url_id)
 	{
 		global $db, $user;
@@ -194,12 +194,12 @@ 
 	}
 
 	/**
-	* Verify that an URL exist before add into db
-	*
-	* @param string $url
-	*
-	* @return true if ok, else false.
-	*/
+	 * Verify that an URL exist before add into db
+	 *
+	 * @param string $url
+	 *
+	 * @return true if ok, else false.
+	 */
 	function checkurl($url)
 	{
 		$details = parse_url($url);
@@ -238,12 +238,12 @@ 
 	}
 
 	/**
-	* Delete the final '/', if no path
-	*
-	* @param string $url to clean
-	*
-	* @return the correct string.
-	*/
+	 * Delete the final '/', if no path
+	 *
+	 * @param string $url to clean
+	 *
+	 * @return the correct string.
+	 */
 	function clean_url($url)
 	{
 		$details = parse_url($url);
@@ -291,13 +291,13 @@ 
 	}
 
 	/**
-	* Calculate the link's note
-	*
-	* @param int $total_note is sum of all link's notes
-	* @param int $nb_vote is nb of votes
-	*
-	* @return the calculated note.
-	*/
+	 * Calculate the link's note
+	 *
+	 * @param int $total_note is sum of all link's notes
+	 * @param int $nb_vote is nb of votes
+	 *
+	 * @return the calculated note.
+	 */
 	function display_note($total_note, $nb_vote, $votes_status)
 	{
 		if(!$votes_status)
@@ -315,12 +315,12 @@ 
 	}
 
 	/**
-	* Display the vote form for auth users
-	*
-	* @param array $data link's data from db
-	*
-	* @return the html code.
-	*/
+	 * Display the vote form for auth users
+	 *
+	 * @param array $data link's data from db
+	 *
+	 * @return the html code.
+	 */
 	function display_vote($data, $votes_status)
 	{
 		if(!$votes_status)
@@ -359,14 +359,14 @@ 
 	}
 
 	/**
-	* Display link's thumb if thumb service enabled.
-	* if thumb don't exists in db or if a new service was choosen in acp
-	* thumb is research
-	*
-	* @param array $data link's data from db
-	*
-	* @return thumb or nothing.
-	*/
+	 * Display link's thumb if thumb service enabled.
+	 * if thumb don't exists in db or if a new service was choosen in acp
+	 * thumb is research
+	 *
+	 * @param array $data link's data from db
+	 *
+	 * @return thumb or nothing.
+	 */
 	function display_thumb($data)
 	{
 		global $config, $db;
@@ -388,12 +388,12 @@ 
 	}
 
 	/**
-	* Display and calculate PageRank if needed
-	*
-	* @param array $data link's data from db
-	*
-	* @return pr image, false or 'n/a'.
-	*/
+	 * Display and calculate PageRank if needed
+	 *
+	 * @param array $data link's data from db
+	 *
+	 * @return pr image, false or 'n/a'.
+	 */
 	function display_pagerank($data)
 	{
 		global $config, $db, $user;
@@ -424,13 +424,13 @@ 
 	}
 
 	/**
-	* Display and resize a banner
-	*
-	* @param array $data link's data from db
-	* @param bool $have_banner
-	*
-	* @return banner image.
-	*/
+	 * Display and resize a banner
+	 *
+	 * @param array $data link's data from db
+	 * @param bool $have_banner
+	 *
+	 * @return banner image.
+	 */
 	function display_bann($data)
 	{
 		global $config, $phpbb_root_path;
@@ -462,13 +462,13 @@ 
 	}
 
 	/**
-	* Display number of comments and link for posting
-	*
-	* @param int $u is link_id from db
-	* @param int $nb_comments si number of comments for this link
-	*
-	* @return html code (counter + link).
-	*/
+	 * Display number of comments and link for posting
+	 *
+	 * @param int $u is link_id from db
+	 * @param int $nb_comments si number of comments for this link
+	 *
+	 * @return html code (counter + link).
+	 */
 	function display_comm($u, $nb_comment, $comments_status)
 	{
 		if(!$comments_status)
@@ -486,10 +486,10 @@ 
 	}
 
 	/**
-	* Add a vote in db, for a specifi link
-	*
-	* @param int $u is link_id from db
-	*/
+	 * Add a vote in db, for a specifi link
+	 *
+	 * @param int $u is link_id from db
+	 */
 	function add_vote($u)
 	{
 		global $user, $db, $id, $start, $phpEx;
@@ -546,9 +546,9 @@ 
 	}
 
 	/**
-	* Send a email to administrator for notify a new link
-	* when approbation enabled
-	*/
+	 * Send a email to administrator for notify a new link
+	 * when approbation enabled
+	 */
 	function notify_admin()
 	{
 		global $config, $db, $user;
@@ -657,12 +657,12 @@ 
 	}
 
 	/**
-	* Search an appropriate thumb for url
-	*
-	* @param string $url is link's url
-	*
-	* @return the thumb url
-	*/
+	 * Search an appropriate thumb for url
+	 *
+	 * @param string $url is link's url
+	 *
+	 * @return the thumb url
+	 */
 	function thumb_process($url)
 	{
 		global $config, $phpbb_root_path;
@@ -704,10 +704,10 @@ 
 	}
 
 	/**
-	* primary work on banner, can edit, copy or check a banner
-	*
-	* @param string $banner is banner's remote url
-	*/
+	 * primary work on banner, can edit, copy or check a banner
+	 *
+	 * @param string $banner is banner's remote url
+	 */
 	function banner_process(&$banner, &$error)
 	{
 		global $config, $phpbb_root_path;
@@ -750,13 +750,13 @@ 
 	}
 
 	/**
-	* Copy a remonte banner to server.
-	* called by banner_process()
-	*
-	* @param string $banner is banner's remote url
-	*
-	* @return file's name of the local banner
-	*/
+	 * Copy a remonte banner to server.
+	 * called by banner_process()
+	 *
+	 * @param string $banner is banner's remote url
+	 *
+	 * @return file's name of the local banner
+	 */
 	function banner_upload($banner, &$error)
 	{
 		global $phpbb_root_path, $config, $db, $user, $phpEx;
@@ -789,13 +789,13 @@ 
 	}
 
 	/**
-	* Check than remote banner exists
-	* called by banner_process()
-	*
-	* @param string $banner is banner's remote url
-	*
-	* @return false if error, true for ok
-	*/
+	 * Check than remote banner exists
+	 * called by banner_process()
+	 *
+	 * @param string $banner is banner's remote url
+	 *
+	 * @return false if error, true for ok
+	 */
 	function banner_remote($banner, &$error)
 	{
 		global $config, $db, $user, $phpbb_root_path, $phpEx;
@@ -860,13 +860,13 @@ 
 	}
 
 	/**
-	* Delete a banner from server
-	*
-	* @param string $destination path to banner directory
-	* @param string $file is file's name
-	*
-	* @return true if delete success, else false
-	*/
+	 * Delete a banner from server
+	 *
+	 * @param string $destination path to banner directory
+	 * @param string $file is file's name
+	 *
+	 * @return true if delete success, else false
+	 */
 	function banner_delete($destination, $file)
 	{
 		global $phpbb_root_path;
@@ -886,15 +886,15 @@ 
 	}
 
 	/**
-	* PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
-	*
-	* @copyright 2012 HM2K <hm2k@php.net>
-	* @link http://pagerank.phurix.net/
-	* @author James Wade <hm2k@php.net>
-	* @version $Revision: 2.1 $
-	* @require PHP 4.3.0 (file_get_contents)
-	* @updated 06/10/11
-	*/
+	 * PageRank Lookup (Based on Google Toolbar for Mozilla Firefox)
+	 *
+	 * @copyright 2012 HM2K <hm2k@php.net>
+	 * @link http://pagerank.phurix.net/
+	 * @author James Wade <hm2k@php.net>
+	 * @version $Revision: 2.1 $
+	 * @require PHP 4.3.0 (file_get_contents)
+	 * @updated 06/10/11
+	 */
 	function pagerank_process($q)
 	{
 		global $user;
@@ -934,10 +934,10 @@ 
 class comment
 {
 	/**
-	* Add a comment
-	*
-	* @param array $data is link's data from db
-	*/
+	 * Add a comment
+	 *
+	 * @param array $data is link's data from db
+	 */
 	function add($data)
 	{
 		global $db, $config;
@@ -956,12 +956,12 @@ 
 	}
 
 	/**
-	* Edit a comment
-	*
-	* @param array $data is datas to edit
-	* @param $id comment_id from db
-	*
-	*/
+	 * Edit a comment
+	 *
+	 * @param array $data is datas to edit
+	 * @param $id comment_id from db
+	 *
+	 */
 	function edit($data, $id)
 	{
 		global $db;
@@ -972,11 +972,11 @@ 
 	}
 
 	/**
-	* Delete a comment
-	*
-	* @param string $id is comment_id from db
-	* @param string $u is link_db
-	*/
+	 * Delete a comment
+	 *
+	 * @param string $id is comment_id from db
+	 * @param string $u is link_db
+	 */
 	function del($id, $u)
 	{
 		global $user, $db, $phpEx;
@@ -1019,8 +1019,8 @@ 
 	var $data = array();
 
 	/**
-	* Get somes categorie infos
-	*/
+	 * Get somes categorie infos
+	 */
 	function categorie($id = 0)
 	{
 		global $db;
@@ -1104,8 +1104,8 @@ 
 	}
 
 	/**
-	* Display cat or subcat
-	*/
+	 * Display cat or subcat
+	 */
 	function display()
 	{
 		global $db, $template, $phpbb_root_path;
@@ -1252,8 +1252,8 @@ 
 	var $categorie	= array();
 
 	/**
-	* Constructor
-	*/
+	 * Constructor
+	 */
 	function directory_cron($catrow)
 	{
 		$this->categorie = $catrow;

Spacing +160 added lines, -160 removed lines

@@ -34,14 +34,14 @@ 
 
 		$db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_LINK_TABLE . ' ' . $db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_LINK_TABLE.' '.$db->sql_build_array('INSERT', $data);
 		$db->sql_query($sql);
 
 		if (!$categorie->data['cat_validate'] || $auth->acl_get('a_') || $auth->acl_get('m_'))
 		{
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links + 1
-				WHERE cat_id = ' . (int)$data['link_cat'];
+				WHERE cat_id = ' . (int) $data['link_cat'];
 			$db->sql_query($sql);
 		}
 		elseif ($config['dir_mail'] && $config['email_enable'])
@@ -67,14 +67,14 @@ 
 		{
 			$db->sql_transaction('begin');
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . ' SET cat_links = cat_links - 1
-				WHERE cat_id = ' . (int)$old_cat;
+			$sql = 'UPDATE '.DIR_CAT_TABLE.' SET cat_links = cat_links - 1
+				WHERE cat_id = ' . (int) $old_cat;
 			$db->sql_query($sql);
 
-			if(!$need_approval)
+			if (!$need_approval)
 			{
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . ' SET cat_links = cat_links + 1
-					WHERE cat_id = ' . (int)$data['link_cat'];
+				$sql = 'UPDATE '.DIR_CAT_TABLE.' SET cat_links = cat_links + 1
+					WHERE cat_id = ' . (int) $data['link_cat'];
 				$db->sql_query($sql);
 			}
 			else
@@ -85,8 +85,8 @@ 
 			$db->sql_transaction('commit');
 		}
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $data) . '
-			WHERE link_id = ' . (int)$url_id;
+		$sql = 'UPDATE '.DIR_LINK_TABLE.' SET '.$db->sql_build_array('UPDATE', $data).'
+			WHERE link_id = ' . (int) $url_id;
 		$db->sql_query($sql);
 
 		$cache->destroy('sql', DIR_LINK_TABLE);
@@ -114,16 +114,16 @@ 
 				DIR_VOTE_TABLE		=> 'vote_link_id',
 			);
 
-			$sql = 'SELECT link_banner FROM ' . DIR_LINK_TABLE . ' WHERE '. $db->sql_in_set('link_id', $url_array);
+			$sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.' WHERE '.$db->sql_in_set('link_id', $url_array);
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				if($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+				if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 				{
-					if (file_exists($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner'])))
+					if (file_exists($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner'])))
 					{
-						@unlink($phpbb_root_path . 'images/directory/banners' .'/'. basename($row['link_banner']));
+						@unlink($phpbb_root_path.'images/directory/banners'.'/'.basename($row['link_banner']));
 					}
 				}
 			}
@@ -133,14 +133,14 @@ 
 				$db->sql_query("DELETE FROM $table WHERE ".$db->sql_in_set($field, $url_array));
 			}
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links - '.sizeof($url_array).'
-			WHERE cat_id = ' . (int)$cat_id;
+			WHERE cat_id = ' . (int) $cat_id;
 			$db->sql_query($sql);
 
 			$db->sql_transaction('commit');
 
-			if($cron)
+			if ($cron)
 			{
 				include($phpbb_root_path.'includes/acp/acp_directory.'.$phpEx);
 				sync_dir_cat($this->categorie['cat_id']);
@@ -149,7 +149,7 @@ 
 			{
 				$meta_info = append_sid("{$phpbb_root_path}directory.$phpEx", "mode=cat&id=$cat_id");
 				meta_refresh(3, $meta_info);
-				$message = $user->lang['DIR_DELETE_OK'] . "<br /><br />" . $user->lang('DIR_CLICK_RETURN_DIR', '<a href="' . append_sid("{$phpbb_root_path}directory.$phpEx") . '">', '</a>') . '<br /><br />' . $user->lang('DIR_CLICK_RETURN_CAT', '<a href="' . append_sid("{$phpbb_root_path}directory.$phpEx", "mode=cat&amp;id=$cat_id") . '">', '</a>');
+				$message = $user->lang['DIR_DELETE_OK']."<br /><br />".$user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.append_sid("{$phpbb_root_path}directory.$phpEx").'">', '</a>').'<br /><br />'.$user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.append_sid("{$phpbb_root_path}directory.$phpEx", "mode=cat&amp;id=$cat_id").'">', '</a>');
 				trigger_error($message);
 			}
 		}
@@ -157,8 +157,8 @@ 
 		{
 			$s_hidden_fields = build_hidden_fields(array(
 				'mode'	=> $mode,
-				'id'	=> (int)$cat_id,
-				'u'		=> (int)$url_id,
+				'id'	=> (int) $cat_id,
+				'u'		=> (int) $url_id,
 			));
 
 			confirm_box(false, 'DIR_DELETE_SITE', $s_hidden_fields);
@@ -174,8 +174,8 @@ 
 	{
 		global $db, $user;
 
-		$sql = 'SELECT link_id, link_url FROM ' . DIR_LINK_TABLE . '
-					WHERE link_id = ' . (int)$url_id;
+		$sql = 'SELECT link_id, link_url FROM '.DIR_LINK_TABLE.'
+					WHERE link_id = ' . (int) $url_id;
 		$result = $db->sql_query($sql);
 		$data = $db->sql_fetchrow($result);
 
@@ -184,9 +184,9 @@ 
 			trigger_error($user->lang['DIR_ERROR_NO_LINKS'], E_USER_ERROR);
 		}
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_view = link_view + 1
-			WHERE link_id = ' . (int)$url_id;
+			WHERE link_id = ' . (int) $url_id;
 		$db->sql_query($sql);
 
 		redirect($data['link_url'], false, true);
@@ -248,7 +248,7 @@ 
 	{
 		$details = parse_url($url);
 
-		if(isset($details['path']) && $details['path'] == '/' && !isset($details['query']))
+		if (isset($details['path']) && $details['path'] == '/' && !isset($details['query']))
 		{
 			return substr($url, 0, -1);
 		}
@@ -268,7 +268,7 @@ 
 
 		$extra = '';
 
-		if(!empty($data['link_flag']))
+		if (!empty($data['link_flag']))
 		{
 			if (file_exists('images/directory/flags/'.$data['link_flag']))
 			{
@@ -282,11 +282,11 @@ 
 					$extra = 'alt = "'.$country.'" title = "'.$country.'"';
 				}
 
-				return '<img src="' . $phpbb_root_path . 'images/directory/flags/' . $data['link_flag'] . '" '.$extra.' />&nbsp;';
+				return '<img src="'.$phpbb_root_path.'images/directory/flags/'.$data['link_flag'].'" '.$extra.' />&nbsp;';
 			}
 		}
 
-		return '<img src="' . $phpbb_root_path . 'images/directory/flags/no_flag.png" />&nbsp;';
+		return '<img src="'.$phpbb_root_path.'images/directory/flags/no_flag.png" />&nbsp;';
 
 	}
 
@@ -300,7 +300,7 @@ 
 	*/
 	function display_note($total_note, $nb_vote, $votes_status)
 	{
-		if(!$votes_status)
+		if (!$votes_status)
 		{
 			return;
 		}
@@ -309,7 +309,7 @@ 
 
 		$note = ($nb_vote < 1) ? '' : $total_note / $nb_vote;
 		$note = (strlen($note) > 2) ? number_format($note, 1) : $note;
-		$note = ($nb_vote) ? '<b>' . $user->lang('DIR_FROM_TEN', $note) . '</b>' : $user->lang['DIR_NO_NOTE'];
+		$note = ($nb_vote) ? '<b>'.$user->lang('DIR_FROM_TEN', $note).'</b>' : $user->lang['DIR_NO_NOTE'];
 
 		return $note;
 	}
@@ -323,7 +323,7 @@ 
 	*/
 	function display_vote($data, $votes_status)
 	{
-		if(!$votes_status)
+		if (!$votes_status)
 		{
 			return;
 		}
@@ -338,20 +338,20 @@ 
 				if (empty($data['vote_user_id']))
 				{
 					$list = '<select name="vote">';
-					for ( $i = 0; $i <= 10; $i++ )
+					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>';
 
 					$params = array(
 						'mode'	=> 'cat',
-						'id'	=> (int)$data['link_cat'],
+						'id'	=> (int) $data['link_cat'],
 						'start'	=> $start,
-						'u'		=> (int)$data['link_id'],
+						'u'		=> (int) $data['link_id'],
 						'order'	=> $order);
 
-					return '<br /><form action="' . append_sid("{$directory_root_path}directory.$phpEx", $params, true) . '" method="post"><div>' . $list . '&nbsp;<input type="submit" name="submit_vote" value="' . $user->lang['DIR_VOTE'] . '" class="mainoption" /></div></form>';
+					return '<br /><form action="'.append_sid("{$directory_root_path}directory.$phpEx", $params, true).'" method="post"><div>'.$list.'&nbsp;<input type="submit" name="submit_vote" value="'.$user->lang['DIR_VOTE'].'" class="mainoption" /></div></form>';
 				}
 			}
 		}
@@ -371,14 +371,14 @@ 
 	{
 		global $config, $db;
 
-		if($config['dir_activ_thumb'])
+		if ($config['dir_activ_thumb'])
 		{
 			if (!$data['link_thumb'] || ($config['dir_thumb_service_reverse'] && (!strstr($data['link_thumb'], 'ascreen.jpg') && (!strstr($data['link_thumb'], $config['dir_thumb_service'])))))
 			{
 				$thumb = $this->thumb_process($data['link_url']);
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET link_thumb = "' . $db->sql_escape($thumb) . '"
-					WHERE link_id = ' . (int)$data['link_id'];
+				$sql = 'UPDATE '.DIR_LINK_TABLE.' SET link_thumb = "'.$db->sql_escape($thumb).'"
+					WHERE link_id = ' . (int) $data['link_id'];
 				$db->sql_query($sql);
 
 				return $thumb;
@@ -398,24 +398,24 @@ 
 	{
 		global $config, $db, $user;
 
-		if($config['dir_activ_pagerank'])
+		if ($config['dir_activ_pagerank'])
 		{
 			if ($data['link_pagerank'] == '')
 			{
 				$pagerank = $this->pagerank_process($data['link_url']);
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET link_pagerank = ' . (int)$pagerank . '
-					WHERE link_id = ' . (int)$data['link_id'];
+				$sql = 'UPDATE '.DIR_LINK_TABLE.' SET link_pagerank = '.(int) $pagerank.'
+					WHERE link_id = ' . (int) $data['link_id'];
 				$db->sql_query($sql);
 			}
 			else
 			{
-				$pagerank = (int)$data['link_pagerank'];
+				$pagerank = (int) $data['link_pagerank'];
 			}
 
-			$prpos=40*$pagerank/10;
-			$prneg=40-$prpos;
-			$html='<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
+			$prpos = 40 * $pagerank / 10;
+			$prneg = 40 - $prpos;
+			$html = '<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
 
 			$pagerank = $pagerank == '-1' ? $user->lang['DIR_PAGERANK_NOT_AVAILABLE'] : $user->lang('DIR_FROM_TEN', $pagerank);
 			return $html.$pagerank;
@@ -455,7 +455,7 @@ 
 				$height /= $coef_max;
 			}
 
-			$s_banner = '<img src="' . $path . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			$s_banner = '<img src="'.$path.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
 		}
 
 		return $s_banner;
@@ -471,16 +471,16 @@ 
 	*/
 	function display_comm($u, $nb_comment, $comments_status)
 	{
-		if(!$comments_status)
+		if (!$comments_status)
 		{
 			return;
 		}
 
 		global $user, $directory_root_path, $phpEx;
 
-		$comment_url = append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int)$u));
-		$l_nb_comment = ($nb_comment > 1) ? $user->lang['DIR_COMMENTS']: $user->lang['DIR_COMMENT'];
-		$s_comment = '&nbsp;&nbsp;&nbsp;<a href="' . $comment_url . '" onclick="window.open(\'' . $comment_url . '\', \'phpBB_dir_comment\', \'HEIGHT=600, resizable=yes, scrollbars=yes, WIDTH=905\');return false;" class="gen"><b>' . $nb_comment . '</b> ' . $l_nb_comment . '</a>';
+		$comment_url = append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int) $u));
+		$l_nb_comment = ($nb_comment > 1) ? $user->lang['DIR_COMMENTS'] : $user->lang['DIR_COMMENT'];
+		$s_comment = '&nbsp;&nbsp;&nbsp;<a href="'.$comment_url.'" onclick="window.open(\''.$comment_url.'\', \'phpBB_dir_comment\', \'HEIGHT=600, resizable=yes, scrollbars=yes, WIDTH=905\');return false;" class="gen"><b>'.$nb_comment.'</b> '.$l_nb_comment.'</a>';
 
 		return $s_comment;
 	}
@@ -501,12 +501,12 @@ 
 		}
 
 		$data = array(
-			'vote_link_id' 		=> (int)$u,
-			'vote_user_id' 		=> (int)$user->data['user_id'],
+			'vote_link_id' 		=> (int) $u,
+			'vote_user_id' 		=> (int) $user->data['user_id'],
 		);
 
 		// We check if user had already vot for this website.
-		$sql = 'SELECT vote_link_id FROM ' . DIR_VOTE_TABLE . ' WHERE ' . $db->sql_build_array('SELECT', $data);
+		$sql = 'SELECT vote_link_id FROM '.DIR_VOTE_TABLE.' WHERE '.$db->sql_build_array('SELECT', $data);
 		$result = $db->sql_query($sql);
 		$data = $db->sql_fetchrow($result);
 
@@ -516,19 +516,19 @@ 
 		}
 
 		$data = array(
-			'vote_link_id' 		=> (int)$u,
+			'vote_link_id' 		=> (int) $u,
 			'vote_user_id' 		=> $user->data['user_id'],
 			'vote_note'			=> request_var('vote', 0),
 		);
 
 		$db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_VOTE_TABLE . ' ' . $db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_VOTE_TABLE.' '.$db->sql_build_array('INSERT', $data);
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . ' SET link_vote = link_vote + 1,
-			link_note = link_note + ' . (int)$data['vote_note'] . '
-		WHERE link_id = ' . (int)$u;
+		$sql = 'UPDATE '.DIR_LINK_TABLE.' SET link_vote = link_vote + 1,
+			link_note = link_note + ' . (int) $data['vote_note'].'
+		WHERE link_id = ' . (int) $u;
 		$db->sql_query($sql);
 
 		$db->sql_transaction('commit');
@@ -541,7 +541,7 @@ 
 
 		$meta_info = append_sid("{$directory_root_path}directory.$phpEx", $params, true);
 		meta_refresh(3, $meta_info);
-		$message = $user->lang['DIR_VOTE_OK'] . '<br /><br />' . sprintf($user->lang['DIR_CLICK_RETURN_LIEN'], '<a href="' . append_sid("{$directory_root_path}directory.$phpEx", $params, true) . '">', '</a>');
+		$message = $user->lang['DIR_VOTE_OK'].'<br /><br />'.sprintf($user->lang['DIR_CLICK_RETURN_LIEN'], '<a href="'.append_sid("{$directory_root_path}directory.$phpEx", $params, true).'">', '</a>');
 		trigger_error($message);
 	}
 
@@ -558,7 +558,7 @@ 
 		{
 			// Get the appropriate username, etc.
 			$sql = 'SELECT username, user_email, user_lang, user_jabber, user_notify_type
-				FROM ' . USERS_TABLE . ' u, '. GROUPS_TABLE .' g, ' . USER_GROUP_TABLE . ' ug
+				FROM ' . USERS_TABLE.' u, '.GROUPS_TABLE.' g, '.USER_GROUP_TABLE.' ug
 				WHERE ug.user_id = u.user_id
 					AND ug.user_pending = 0
 					AND ug.group_id = g.group_id
@@ -567,9 +567,9 @@ 
 
 			if (!class_exists('messenger'))
 			{
-				include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+				include($phpbb_root_path.'includes/functions_messenger.'.$phpEx);
 			}
-			$messenger	= new messenger(false);
+			$messenger = new messenger(false);
 
 			while ($row = $db->sql_fetchrow($result))
 			{
@@ -580,10 +580,10 @@ 
 				$messenger->im($row['user_jabber'], $row['username']);
 				$notify_type = $row['user_notify_type'];
 
-				$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-				$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-				$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-				$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+				$messenger->headers('X-AntiAbuse: Board servername - '.$config['server_name']);
+				$messenger->headers('X-AntiAbuse: User_id - '.$user->data['user_id']);
+				$messenger->headers('X-AntiAbuse: Username - '.$user->data['username']);
+				$messenger->headers('X-AntiAbuse: User IP - '.$user->ip);
 
 				$messenger->assign_vars(array(
 					'USERNAME'		=> htmlspecialchars_decode($row['username']),
@@ -615,21 +615,21 @@ 
 					'ON'	=> 'an.n_user_id = u.user_id'
 				)
 			),
-			'WHERE'		=> 'an.n_cat_id = ' . (int)$site['link_cat']);
+			'WHERE'		=> 'an.n_cat_id = '.(int) $site['link_cat']);
 		$sql = $db->sql_build_query('SELECT', $sql_array);
 		$result = $db->sql_query($sql);
 
 		if (!class_exists('messenger'))
 		{
-			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+			include($phpbb_root_path.'includes/functions_messenger.'.$phpEx);
 		}
-		$messenger	= new messenger(false);
+		$messenger = new messenger(false);
 
 		$row = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$username	= $row['username'];
-			$email		= $row['user_email'];
+			$username = $row['username'];
+			$email = $row['user_email'];
 			strip_bbcode($site['link_description']);
 
 			$messenger->template('mods/directory/notification', $row['user_lang']);
@@ -638,10 +638,10 @@ 
 
 			$messenger->im($row['user_jabber'], $row['username']);
 
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->headers('X-AntiAbuse: Board servername - '.$config['server_name']);
+			$messenger->headers('X-AntiAbuse: User_id - '.$user->data['user_id']);
+			$messenger->headers('X-AntiAbuse: Username - '.$user->data['username']);
+			$messenger->headers('X-AntiAbuse: User IP - '.$user->ip);
 
 			$messenger->assign_vars(array(
 				'USERNAME'			=> $row['username'],
@@ -667,17 +667,17 @@ 
 	{
 		global $config, $phpbb_root_path;
 
-		if(!$config['dir_activ_thumb'])
+		if (!$config['dir_activ_thumb'])
 		{
 			return $phpbb_root_path.'images/directory/nothumb.gif';
 		}
 
 		$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($config['dir_activ_thumb_remote'])
+		if ($config['dir_activ_thumb_remote'])
 		{
 			if ($this->ascreen_exist($details['scheme'], $details['host']))
 			{
@@ -717,7 +717,7 @@ 
 		$destination = 'images/directory/banners';
 
 		// Can we upload?
-		$can_upload = ($config['dir_storage_banner'] && file_exists($phpbb_root_path . $destination) && phpbb_is_writable($phpbb_root_path . $destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+		$can_upload = ($config['dir_storage_banner'] && file_exists($phpbb_root_path.$destination) && phpbb_is_writable($phpbb_root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
 		if ($banner && $can_upload)
 		{
@@ -743,7 +743,7 @@ 
 
 			$banner = isset($file) ? $file : '';
 		}
-		elseif(isset($file))
+		elseif (isset($file))
 		{
 			$this->banner_delete($destination, $file);
 		}
@@ -762,15 +762,15 @@ 
 		global $phpbb_root_path, $config, $db, $user, $phpEx;
 
 		// Init upload class
-		if(!class_exists('fileupload'))
+		if (!class_exists('fileupload'))
 		{
-			include($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
+			include($phpbb_root_path.'includes/functions_upload.'.$phpEx);
 		}
 		$upload = new fileupload('DIR_BANNER_', array('jpg', 'jpeg', 'gif', 'png'), $config['dir_banner_filesize']);
 
 		$file = $upload->remote_upload($banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		$destination = 'images/directory/banners';
@@ -785,7 +785,7 @@ 
 		}
 		@chmod($file->destination_file, 0644);
 
-		return $prefix .strtolower($file->uploadname);
+		return $prefix.strtolower($file->uploadname);
 	}
 
 	/**
@@ -802,7 +802,7 @@ 
 
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
 		{
-			$banner = 'http://' . $banner;
+			$banner = 'http://'.$banner;
 		}
 		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
 		{
@@ -827,12 +827,12 @@ 
 		$height = $image_data[1];
 
 		// Check image type
-		if(!class_exists('fileupload'))
+		if (!class_exists('fileupload'))
 		{
-			include($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
+			include($phpbb_root_path.'includes/functions_upload.'.$phpEx);
 		}
-		$types		= fileupload::image_types();
-		$extension	= strtolower(filespec::get_extension($banner));
+		$types = fileupload::image_types();
+		$extension = strtolower(filespec::get_extension($banner));
 
 		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
 		{
@@ -876,9 +876,9 @@ 
 			$destination = substr($destination, 0, -1);
 		}
 
-		if (file_exists($phpbb_root_path . $destination .'/'.$file))
+		if (file_exists($phpbb_root_path.$destination.'/'.$file))
 		{
-			@unlink($phpbb_root_path . $destination .'/'.$file);
+			@unlink($phpbb_root_path.$destination.'/'.$file);
 			return true;
 		}
 
@@ -903,23 +903,23 @@ 
 		$seed = $user->lang['SEED'];
 		$result = 0x01020345;
 		$len = strlen($q);
-		for ($i=0; $i<$len; $i++)
+		for ($i = 0; $i < $len; $i++)
 		{
-			$result ^= ord($seed{$i%strlen($seed)}) ^ ord($q{$i});
+			$result ^= ord($seed{$i % strlen($seed)}) ^ ord($q{$i});
 			$result = (($result >> 23) & 0x1ff) | $result << 9;
 		}
 		if (PHP_INT_MAX != 2147483647)
 		{
 			$result = -(~($result & 0xFFFFFFFF) + 1);
 		}
-		$ch=sprintf('8%x', $result);
-		$url='http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
-		$host = 'toolbarqueries.google'.$googleDomains[mt_rand(0,count($googleDomains)-1)];
+		$ch = sprintf('8%x', $result);
+		$url = 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
+		$host = 'toolbarqueries.google'.$googleDomains[mt_rand(0, count($googleDomains) - 1)];
 
-		$url=sprintf($url,$host,$ch,$q);
-		@$pr=trim(file_get_contents($url,false,$context));
+		$url = sprintf($url, $host, $ch, $q);
+		@$pr = trim(file_get_contents($url, false, $context));
 
-		if(is_numeric(substr(strrchr($pr, ':'), 1)))
+		if (is_numeric(substr(strrchr($pr, ':'), 1)))
 		{
 			return substr(strrchr($pr, ':'), 1);
 		}
@@ -944,12 +944,12 @@ 
 
 		$db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_COMMENT_TABLE . ' ' . $db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_COMMENT_TABLE.' '.$db->sql_build_array('INSERT', $data);
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_comment = link_comment + 1
-		WHERE link_id = ' . (int)$data['comment_link_id'];
+		WHERE link_id = ' . (int) $data['comment_link_id'];
 		$db->sql_query($sql);
 
 		$db->sql_transaction('commit');
@@ -966,8 +966,8 @@ 
 	{
 		global $db;
 
-		$sql = 'UPDATE ' . DIR_COMMENT_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $data) . '
-			WHERE comment_id = ' . (int)$id;
+		$sql = 'UPDATE '.DIR_COMMENT_TABLE.' SET '.$db->sql_build_array('UPDATE', $data).'
+			WHERE comment_id = ' . (int) $id;
 		$db->sql_query($sql);
 	}
 
@@ -986,18 +986,18 @@ 
 		{
 			$db->sql_transaction('begin');
 
-			$requete = 'DELETE FROM ' . DIR_COMMENT_TABLE . '
-				WHERE comment_id = ' . (int)$id;
+			$requete = 'DELETE FROM '.DIR_COMMENT_TABLE.'
+				WHERE comment_id = ' . (int) $id;
 			$db->sql_query($requete);
 
-			$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
 				SET link_comment = link_comment - 1
-			WHERE link_id = ' . (int)$u;
+			WHERE link_id = ' . (int) $u;
 			$db->sql_query($sql);
 
 			$db->sql_transaction('commit');
 
-			$redirect_url = append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int)$u));
+			$redirect_url = append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int) $u));
 			redirect($redirect_url);
 			//meta_refresh(3, $redirect_url);
 			//$message = $user->lang['DIR_COMMENT_DELETE_OK'];
@@ -1028,10 +1028,10 @@ 
 		if ($id)
 		{
 			$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id, cat_parents, cat_must_describe, cat_allow_votes, cat_allow_comments, cat_links, cat_validate, cat_link_back, cat_cron_enable, cat_cron_next, cat_cron_freq, cat_cron_enable, cat_cron_nb_check
-				FROM ' . DIR_CAT_TABLE . '
-				WHERE cat_id = ' . (int)$id;
+				FROM ' . DIR_CAT_TABLE.'
+				WHERE cat_id = ' . (int) $id;
 			$result = $db->sql_query($sql);
-			if(!$this->data = $db->sql_fetchrow($result))
+			if (!$this->data = $db->sql_fetchrow($result))
 			{
 				send_status_line(410, 'Gone');
 
@@ -1050,12 +1050,12 @@ 
 		global $db;
 
 		$sql = 'SELECT cat_validate
-				FROM ' . DIR_CAT_TABLE . '
-				WHERE cat_id = ' . (int)$id;
+				FROM ' . DIR_CAT_TABLE.'
+				WHERE cat_id = ' . (int) $id;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 
-		return (int)$row['cat_validate'];
+		return (int) $row['cat_validate'];
 	}
 
 	/**
@@ -1071,14 +1071,14 @@ 
 
 		// This query is identical to the jumpbox one
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			ORDER BY left_id ASC';
 		$result = $db->sql_query($sql, 600);
 
 		$right = 0;
 		$padding_store = array('0' => '');
 		$padding = '';
-		$cat_list = ($select_id) ? '' : '<option value="0" selected="selected" style="font-weight:bold;">'.$user->lang['DIR_NONE']. '</option>';
+		$cat_list = ($select_id) ? '' : '<option value="0" selected="selected" style="font-weight:bold;">'.$user->lang['DIR_NONE'].'</option>';
 
 		while ($row = $db->sql_fetchrow($result))
 		{
@@ -1095,7 +1095,7 @@ 
 			$right = $row['right_id'];
 
 			$selected = (($row['cat_id'] == $select_id) ? ' selected="selected"' : '');
-			$cat_list .= '<option value="' . $row['cat_id'] . '"' . $selected . '>' . $padding . $row['cat_name'] . '</option>';
+			$cat_list .= '<option value="'.$row['cat_id'].'"'.$selected.'>'.$padding.$row['cat_name'].'</option>';
 		}
 		$db->sql_freeresult($result);
 		unset($padding_store);
@@ -1112,7 +1112,7 @@ 
 		global $directory_root_path, $auth, $phpEx;
 
 		$cat_rows	= $subcats = array();
-		$parent_id	= $visible_cats = 0;
+		$parent_id = $visible_cats = 0;
 		$sql_from	= '';
 
 		$body = ($this->data) ? 'mods/directory/view_cat.html' : 'mods/directory/body.html';
@@ -1132,7 +1132,7 @@ 
 		else
 		{
 			$root_data = $this->data;
-			$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
+			$sql_where = 'left_id > '.$root_data['left_id'].' AND left_id < '.$root_data['right_id'];
 		}
 
 		$sql = $db->sql_build_query('SELECT', array(
@@ -1183,7 +1183,7 @@ 
 			{
 				foreach ($subcats[$dir_cat_id] as $subcat_id => $subcat_row)
 				{
-					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links']+$subcat_row['links']) : $row['cat_links'];
+					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links'] + $subcat_row['links']) : $row['cat_links'];
 
 					if ($subcat_row['display'] && $subcat_row['parent_id'] == $dir_cat_id)
 					{
@@ -1204,7 +1204,7 @@ 
 				'CAT_NAME'				=> $row['cat_name'],
 				'CAT_DESC'				=> generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
 				'CAT_LINKS'				=> $row['cat_links'],
-				'CAT_IMG'				=> $phpbb_root_path . 'images/directory/icons/'.$row['cat_icon'],
+				'CAT_IMG'				=> $phpbb_root_path.'images/directory/icons/'.$row['cat_icon'],
 
 				'U_CAT'					=> append_sid("{$directory_root_path}directory.$phpEx", array('mode' => 'cat', 'id' => $row['cat_id']))
 			));
@@ -1234,7 +1234,7 @@ 
 			'S_HAS_SUBCAT'		=> ($visible_cats) ? true : false,
 
 			'U_MAKE_SEARCH'		=> append_sid("{$directory_root_path}directory_search.$phpEx"),
-			'U_NEW_SITE' 		=> append_sid("{$directory_root_path}directory.$phpEx", "mode=new" . $param, true),
+			'U_NEW_SITE' 		=> append_sid("{$directory_root_path}directory.$phpEx", "mode=new".$param, true),
 		));
 
 		$template->set_filenames(array('body' => $body));
@@ -1249,7 +1249,7 @@ 
  */
 class directory_cron extends link {
 
-	var $categorie	= array();
+	var $categorie = array();
 
 	/**
 	* Constructor
@@ -1277,16 +1277,16 @@ 
 		),
 		'WHERE'		=> "l.link_back <> ''
 			AND l.link_active = 1
-				AND link_cat = " . (int)$this->categorie['cat_id']
+				AND link_cat = " . (int) $this->categorie['cat_id']
 		);
 		$sql = $db->sql_build_query('SELECT', $sql_array);
 		$result = $db->sql_query($sql);
 
 		while ($row = $db->sql_fetchrow($result))
 		{
-			if(validate_link_back($row['link_back'], false, true) !== false)
+			if (validate_link_back($row['link_back'], false, true) !== false)
 			{
-				if(!$this->categorie['cat_cron_nb_check'] || ($row['link_nb_check']+1) >= $this->categorie['cat_cron_nb_check'])
+				if (!$this->categorie['cat_cron_nb_check'] || ($row['link_nb_check'] + 1) >= $this->categorie['cat_cron_nb_check'])
 				{
 					$del_array[] = $row['link_id'];
 				}
@@ -1316,8 +1316,8 @@ 
 		global $db;
 
 		$sql = 'SELECT cat_name
-			FROM ' . DIR_CAT_TABLE . '
-			WHERE cat_id = ' . (int)$this->categorie['cat_id'];
+			FROM ' . DIR_CAT_TABLE.'
+			WHERE cat_id = ' . (int) $this->categorie['cat_id'];
 		$result = $db->sql_query($sql, 3600);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
@@ -1328,9 +1328,9 @@ 
 
 			$this->check();
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
 			SET cat_cron_next = $next_prune
-			WHERE cat_id = " . (int)$this->categorie['cat_id'];
+			WHERE cat_id = ".(int) $this->categorie['cat_id'];
 			$db->sql_query($sql);
 
 			add_log('admin', 'LOG_DIR_AUTO_PRUNE', $row['cat_name']);
@@ -1344,7 +1344,7 @@ 
 		global $db, $phpbb_root_path;
 
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_nb_check = link_nb_check + 1
 				WHERE ' . $db->sql_in_set('link_id', $u_array);
 		$db->sql_query($sql);
@@ -1358,15 +1358,15 @@ 
 
 		$user->add_lang(array('common', 'mods/directory'));
 
-		if(!class_exists('messenger'))
+		if (!class_exists('messenger'))
 		{
-			include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+			include($phpbb_root_path.'includes/functions_messenger.'.$phpEx);
 		}
-		$messenger	= new messenger(false);
+		$messenger = new messenger(false);
 
 		$row = array();
 		$next = (time() + ($this->categorie['cat_cron_freq'] * 86400));
-		foreach($m_array as $row)
+		foreach ($m_array as $row)
 		{
 			strip_bbcode($row['link_description']);
 
@@ -1376,10 +1376,10 @@ 
 
 			$messenger->im($row['user_jabber'], $row['username']);
 
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->headers('X-AntiAbuse: Board servername - '.$config['server_name']);
+			$messenger->headers('X-AntiAbuse: User_id - '.$user->data['user_id']);
+			$messenger->headers('X-AntiAbuse: Username - '.$user->data['username']);
+			$messenger->headers('X-AntiAbuse: User IP - '.$user->ip);
 
 			$messenger->assign_vars(array(
 				'USERNAME'			=> $row['username'],
@@ -1448,7 +1448,7 @@ 
 		$img_file = strtolower($file).'.png';
 		if (file_exists('images/directory/flags/'.$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>';
 		}
 	}
 
@@ -1532,9 +1532,9 @@ 
 		if ($dir_cat_data['cat_parents'] == '')
 		{
 			$sql = 'SELECT cat_id, cat_name
-				FROM ' . DIR_CAT_TABLE . '
-				WHERE left_id < ' . (int)$dir_cat_data['left_id'] . '
-					AND right_id > ' . (int)$dir_cat_data['right_id'] . '
+				FROM ' . DIR_CAT_TABLE.'
+				WHERE left_id < ' . (int) $dir_cat_data['left_id'].'
+					AND right_id > ' . (int) $dir_cat_data['right_id'].'
 				ORDER BY left_id ASC';
 			$result = $db->sql_query($sql);
 
@@ -1546,9 +1546,9 @@ 
 
 			$dir_cat_data['cat_parents'] = serialize($dir_cat_parents);
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . "
-				SET cat_parents = '" . $db->sql_escape($dir_cat_data['cat_parents']) . "'
-				WHERE parent_id = " . (int)$dir_cat_data['parent_id'];
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
+				SET cat_parents = '" . $db->sql_escape($dir_cat_data['cat_parents'])."'
+				WHERE parent_id = " . (int) $dir_cat_data['parent_id'];
 			$db->sql_query($sql);
 		}
 		else
@@ -1565,10 +1565,10 @@ 
 	global $config, $db, $template, $user;
 	global $directory_root_path, $phpEx;
 
-	if($config['dir_recent_block'])
+	if ($config['dir_recent_block'])
 	{
-		$limit_sql		= $config['dir_recent_rows'] * $config['dir_recent_columns'];
-		$exclude_array	= explode(',', str_replace(' ', '', $config['dir_recent_exclude']));
+		$limit_sql = $config['dir_recent_rows'] * $config['dir_recent_columns'];
+		$exclude_array = explode(',', str_replace(' ', '', $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',
@@ -1598,13 +1598,13 @@ 
 		}
 		$db->sql_freeresult($result);
 
-		if(sizeof($rowset))
+		if (sizeof($rowset))
 		{
 			$template->assign_block_vars('block', array(
-				'S_COL_WIDTH'			=> (100 / $config['dir_recent_columns']) . '%',
+				'S_COL_WIDTH'			=> (100 / $config['dir_recent_columns']).'%',
 			));
 
-			foreach($rowset as $row)
+			foreach ($rowset as $row)
 			{
 				if (($num % $config['dir_recent_columns']) == 0)
 				{
@@ -1620,11 +1620,11 @@ 
 					'COUNT'					=> $row['link_view'],
 					'COMMENT'				=> $row['link_comment'],
 
-					'U_CAT'					=> append_sid("{$directory_root_path}directory.$phpEx", array('mode' => 'cat', 'id' => (int)$row['link_cat'])),
-					'U_COMMENT'				=> append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int)$row['link_id'])),
+					'U_CAT'					=> append_sid("{$directory_root_path}directory.$phpEx", array('mode' => 'cat', 'id' => (int) $row['link_cat'])),
+					'U_COMMENT'				=> append_sid("{$directory_root_path}directory_comment.$phpEx", array('u' => (int) $row['link_id'])),
 
 					'L_DIR_SEARCH_NB_CLIC'	=> ($row['link_view'] > 1) ? $user->lang['DIR_SEARCH_NB_CLICS'] : $user->lang['DIR_SEARCH_NB_CLIC'],
-					'L_DIR_SEARCH_NB_COMM'	=> ($row['link_comment'] > 1) ? $user->lang['L_DIR_SEARCH_NB_COMMS']: $user->lang['L_DIR_SEARCH_NB_COMM'],
+					'L_DIR_SEARCH_NB_COMM'	=> ($row['link_comment'] > 1) ? $user->lang['L_DIR_SEARCH_NB_COMMS'] : $user->lang['L_DIR_SEARCH_NB_COMM'],
 				));
 				$num++;
 			}
@@ -1642,7 +1642,7 @@ 
 {
 	global $config;
 
-	if(!$cron)
+	if (!$cron)
 	{
 		if (empty($remote_url) && $optional)
 		{
@@ -1667,7 +1667,7 @@ 
 	{
 		$buff .= fgets($handle, 256);
 
-		if(stristr($buff, $config['server_name']))
+		if (stristr($buff, $config['server_name']))
 		{
 			@fclose($handle);
 			return false;

Braces +2 added lines, -1 removed lines

@@ -1247,7 +1247,8 @@
  * directory_cron class
  * @package phpBB3
  */
-class directory_cron extends link {
+class directory_cron extends link
+{
 
 	var $categorie	= array();
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -899,7 +899,7 @@
 	{
 		global $user;
 
-		$googleDomains = Array(".com", ".com.tr", ".de", ".fr", ".be", ".ca", ".ro", ".ch");
+		$googleDomains = array(".com", ".com.tr", ".de", ".fr", ".be", ".ca", ".ro", ".ch");
 		$seed = $user->lang['SEED'];
 		$result = 0x01020345;
 		$len = strlen($q);

root/directory.php

Indentation +2 added lines, -2 removed lines

@@ -188,8 +188,8 @@
 	if(!$error)
 	{
 		/**
-		* No errrors, we execute heavy tasks wich need a valid url
-		*/
+		 * No errrors, we execute heavy tasks wich need a valid url
+		 */
 
 		// Banner
 		$link->banner_process($banner, $error);

Spacing +95 added lines, -95 removed lines

@@ -18,9 +18,9 @@ 
 define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/mods/directory/functions.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+include($phpbb_root_path.'common.'.$phpEx);
+include($phpbb_root_path.'includes/mods/directory/functions.'.$phpEx);
+include($phpbb_root_path.'includes/functions_display.'.$phpEx);
 $directory_root_path = $config['dir_root_path'];
 
 // Start session management
@@ -29,23 +29,23 @@ 
 $user->setup('mods/directory');
 
 $mode 			= request_var('mode', '');
-$id				= request_var('id', 0);
-$u				= request_var('u', 0);
+$id = request_var('id', 0);
+$u = request_var('u', 0);
 $start			= request_var('start', 0);
 $submit			= (isset($_POST['submit'])) ? true : false;
 $refresh		= (isset($_POST['refresh_vc'])) ? true : false;
-$timestamp		= request_var('timestamp', 0);
+$timestamp = request_var('timestamp', 0);
 
-if($timestamp)
+if ($timestamp)
 {
-	echo $user->format_date((int)$timestamp);
+	echo $user->format_date((int) $timestamp);
 
 	garbage_collection();
 	exit_handler();
 }
 
-$categorie	= new categorie($id);
-$title		= $user->lang['DIRECTORY'];
+$categorie = new categorie($id);
+$title = $user->lang['DIRECTORY'];
 $s_hidden_fields = array();
 
 $template->assign_block_vars('navlinks', array(
@@ -53,13 +53,13 @@ 
 	'U_VIEW_FORUM'	=> append_sid("{$directory_root_path}directory.$phpEx"))
 );
 
-if($submit || $refresh || $mode == 'new')
+if ($submit || $refresh || $mode == 'new')
 {
 	// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-	if(!$user->data['is_registered'] && $config['dir_visual_confirm'])
+	if (!$user->data['is_registered'] && $config['dir_visual_confirm'])
 	{
-		include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
-		$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+		include($phpbb_root_path.'includes/captcha/captcha_factory.'.$phpEx);
+		$captcha = & phpbb_captcha_factory::get_instance($config['captcha_plugin']);
 		$captcha->init(CONFIRM_POST);
 	}
 }
@@ -73,18 +73,18 @@ 
 		redirect($redirect);
 	}
 
-	$sql = 'SELECT link_user_id FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int)$u;
+	$sql = 'SELECT link_user_id FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $u;
 	$result = $db->sql_query($sql);
 	$link_data = $db->sql_fetchrow($result);
 
-	if(empty($link_data))
+	if (empty($link_data))
 	{
 		trigger_error('DIR_ERROR_NO_LINKS');
 	}
 
 	$delete_allowed = $user->data['is_registered'] && ($auth->acl_get('m_delete_dir') || ($user->data['user_id'] == $link_data['link_user_id'] && $auth->acl_get('u_delete_dir')));
 
-	if(!$delete_allowed)
+	if (!$delete_allowed)
 	{
 		trigger_error('DIR_ERROR_NOT_AUTH');
 	}
@@ -92,7 +92,7 @@ 
 	$link->del($u, $id);
 }
 
-if (isset($_POST['submit_vote']) )
+if (isset($_POST['submit_vote']))
 {
 	if (!$auth->acl_get('u_vote_dir') || !$categorie->data['cat_allow_votes'])
 	{
@@ -114,16 +114,16 @@ 
 		trigger_error('FORM_INVALID');
 	}
 
-	$url			= request_var('url', '');
-	$site_name		= utf8_normalize_nfc(request_var('site_name', '', true));
+	$url = request_var('url', '');
+	$site_name = utf8_normalize_nfc(request_var('site_name', '', true));
 	$description	= utf8_normalize_nfc(request_var('description', '', true));
 	$guest_email	= request_var('guest_email', '');
-	$rss			= request_var('rss', '');
-	$banner 		= request_var('banner', '');
-	$back			= request_var('back', '');
-	$flag 			= request_var('flag', '');
+	$rss = request_var('rss', '');
+	$banner = request_var('banner', '');
+	$back = request_var('back', '');
+	$flag = request_var('flag', '');
 
-	include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+	include($phpbb_root_path.'includes/functions_user.'.$phpEx);
 
 	// We define variables to check
 	$data = array(
@@ -145,17 +145,17 @@ 
 		'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', !$categorie->data['cat_must_describe'], 1, $config['dir_length_describe'])),
 		'rss'			=>		array(
 			array('string', true, 12, 255),
-			array('match',	empty($rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+			array('match', empty($rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 		'banner'		=>		array(
 			array('string', true, 5, 255)),
 		'back'			=>		array(
-			array('string',	!$categorie->data['cat_link_back'], 12, 255),
+			array('string', !$categorie->data['cat_link_back'], 12, 255),
 			array('link_back', true)),
 		'cat'			=>		array(
 			array('num', '', 1)));
@@ -165,7 +165,7 @@ 
 	$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
 
 	// We check that url have good format
-	if(preg_match('/^(http|https):\/\//si', $url) && $config['dir_activ_checkurl'] && !$link->checkurl($url))
+	if (preg_match('/^(http|https):\/\//si', $url) && $config['dir_activ_checkurl'] && !$link->checkurl($url))
 	{
 		$error[] = $user->lang['DIR_ERROR_CHECK_URL'];
 	}
@@ -185,7 +185,7 @@ 
 		}
 	}
 
-	if(!$error)
+	if (!$error)
 	{
 		/**
 		* No errrors, we execute heavy tasks wich need a valid url
@@ -204,19 +204,19 @@ 
 	// Still no errors?? So let's go baby!
 	if (!$error)
 	{
-		$poll			= $uid			= $bitfield			= $options	= '';
-		$allow_bbcode	= $allow_urls	= $allow_smilies	= true;
+		$poll = $uid = $bitfield = $options = '';
+		$allow_bbcode = $allow_urls = $allow_smilies = true;
 		generate_text_for_storage($description, $uid, $bitfield, $options, $allow_bbcode, $allow_urls, $allow_smilies);
 
-		$banner	= (!$banner && !isset($_POST['delete_banner'])) ? request_var('old_banner', '') : $banner;
-		$url	= $link->clean_url($url);
+		$banner = (!$banner && !isset($_POST['delete_banner'])) ? request_var('old_banner', '') : $banner;
+		$url = $link->clean_url($url);
 
 		$data_edit = array(
 			'link_guest_email'	=> $guest_email,
 			'link_name'			=> $site_name,
 			'link_url'			=> $url,
 			'link_description'	=> $description,
-			'link_cat'			=> (int)$id,
+			'link_cat'			=> (int) $id,
 			'link_rss'			=> $rss,
 			'link_banner'		=> $banner,
 			'link_back'			=> $back,
@@ -224,7 +224,7 @@ 
 			'link_flags'		=> $options,
 			'link_flag'			=> $flag,
 			'link_bitfield'		=> $bitfield,
-			'link_pagerank'		=> (int)$pagerank,
+			'link_pagerank'		=> (int) $pagerank,
 			'link_thumb'		=> $thumb,
 		);
 
@@ -241,7 +241,7 @@ 
 				'link_time'			=> time(),
 				'link_view'			=> 0,
 				'link_active'		=> $need_approval ? false : true,
-				'link_user_id'		=> (int)$user->data['user_id'],
+				'link_user_id'		=> (int) $user->data['user_id'],
 			);
 
 			$data_add = array_merge($data_edit, $data_add);
@@ -259,13 +259,13 @@ 
 		$meta_info = append_sid("{$directory_root_path}directory.$phpEx", "mode=cat&id=$id");
 		meta_refresh(3, $meta_info);
 		$message	= ($need_approval) ? $user->lang['DIR_'.strtoupper($mode).'_SITE_ACTIVE'] : $user->lang['DIR_'.strtoupper($mode).'_SITE_OK'];
-		$message	= $message . "<br /><br />" . sprintf($user->lang['DIR_CLICK_RETURN_DIR'], '<a href="' . append_sid("{$directory_root_path}directory.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($user->lang['DIR_CLICK_RETURN_CAT'], '<a href="' . append_sid("{$directory_root_path}directory.$phpEx", "mode=cat&amp;id=$id") . '">', '</a>');
+		$message	= $message."<br /><br />".sprintf($user->lang['DIR_CLICK_RETURN_DIR'], '<a href="'.append_sid("{$directory_root_path}directory.$phpEx").'">', '</a>').'<br /><br />'.sprintf($user->lang['DIR_CLICK_RETURN_CAT'], '<a href="'.append_sid("{$directory_root_path}directory.$phpEx", "mode=cat&amp;id=$id").'">', '</a>');
 		trigger_error($message);
 
 	}
 	else
 	{
-		if($mode == 'edit')
+		if ($mode == 'edit')
 		{
 			$s_hidden_fields = array(
 				'old_cat_id'	=> request_var('old_cat_id', 0),
@@ -273,7 +273,7 @@ 
 			);
 		}
 
-		$template->assign_vars( array(
+		$template->assign_vars(array(
 			'ERROR'	=> (isset($error)) ? implode('<br />', $error) : ''
 		));
 	}
@@ -287,18 +287,18 @@ 
 		if (request_var('notif', 0))
 		{
 			$data = array(
-				'n_user_id' => (int)$user->data['user_id'],
-				'n_cat_id' 	=> (int)$id,
+				'n_user_id' => (int) $user->data['user_id'],
+				'n_cat_id' 	=> (int) $id,
 			);
 
-			$sql = 'INSERT INTO ' . DIR_NOTIFICATION_TABLE . ' ' . $db->sql_build_array('INSERT', $data);
+			$sql = 'INSERT INTO '.DIR_NOTIFICATION_TABLE.' '.$db->sql_build_array('INSERT', $data);
 			$db->sql_query($sql);
 		}
 		else
 		{
-			$sql = 'DELETE FROM ' . DIR_NOTIFICATION_TABLE . '
-						WHERE n_user_id = ' . (int)$user->data['user_id'] . '
-							AND n_cat_id = ' . (int)$id;
+			$sql = 'DELETE FROM '.DIR_NOTIFICATION_TABLE.'
+						WHERE n_user_id = ' . (int) $user->data['user_id'].'
+							AND n_cat_id = ' . (int) $id;
 			$db->sql_query($sql);
 		}
 	}
@@ -313,7 +313,7 @@ 
 
 	if ($mode == 'edit')
 	{
-		$sql = 'SELECT link_user_id FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int)$u;
+		$sql = 'SELECT link_user_id FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $u;
 		$result = $db->sql_query($sql);
 		$link_data = $db->sql_fetchrow($result);
 
@@ -335,8 +335,8 @@ 
 
 	if (!$submit && ($mode == 'edit'))
 	{
-		$sql = 'SELECT link_id, link_uid, 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 ' . DIR_LINK_TABLE . '
-				WHERE link_id = ' . (int)$u;
+		$sql = 'SELECT link_id, link_uid, 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 '.DIR_LINK_TABLE.'
+				WHERE link_id = ' . (int) $u;
 		$result = $db->sql_query($sql);
 
 		$site = $db->sql_fetchrow($result);
@@ -354,15 +354,15 @@ 
 		$description = generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
 		$site['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
 
-		$url			= $site['link_url'];
-		$site_name		= $site['link_name'];
+		$url = $site['link_url'];
+		$site_name = $site['link_name'];
 		$description	= $description['text'];
 		$guest_email	= $site['link_guest_email'];
-		$rss			= $site['link_rss'];
-		$banner 		= $site['link_banner'];
-		$back			= $site['link_back'];
-		$flag 			= $site['link_flag'];
-		$id				= $site['link_cat'];
+		$rss = $site['link_rss'];
+		$banner = $site['link_banner'];
+		$back = $site['link_back'];
+		$flag = $site['link_flag'];
+		$id = $site['link_cat'];
 	}
 
 	if (!$user->data['is_registered'] && $config['dir_visual_confirm'] && $mode == 'new')
@@ -377,14 +377,14 @@ 
 	}
 
 	// We get config for display options
-	$bbcode_status	= ($config['dir_allow_bbcode'] || $auth->acl_get('a_')) ? true : false;
-	$smilies_status	= ($bbcode_status && $config['dir_allow_smilies'] || $auth->acl_get('a_')) ? true : false;
+	$bbcode_status = ($config['dir_allow_bbcode'] || $auth->acl_get('a_')) ? true : false;
+	$smilies_status = ($bbcode_status && $config['dir_allow_smilies'] || $auth->acl_get('a_')) ? true : false;
 	$img_status		= ($bbcode_status || $auth->acl_get('a_')) ? true : false;
 	$url_status		= ($config['dir_allow_links']) ? true : false;
 
 	$s_guest	= (!$user->data['is_registered'] || !empty($guest_email));
-	$s_rss		= $config['dir_activ_rss'];
-	$s_banner	= $config['dir_activ_banner'];
+	$s_rss = $config['dir_activ_rss'];
+	$s_banner = $config['dir_activ_banner'];
 	$s_back		= $categorie->data['cat_link_back'];
 	$s_flag		= $config['dir_activ_flag'];
 
@@ -392,11 +392,11 @@ 
 	$user->add_lang('posting');
 	display_custom_bbcodes();
 
-	$flag_path	= $phpbb_root_path.'images/directory/flags/';
-	$flag		= isset($flag) ? $flag : '';
+	$flag_path = $phpbb_root_path.'images/directory/flags/';
+	$flag = isset($flag) ? $flag : '';
 
-	$template->assign_vars( array(
-		'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode') . '">', '</a>'),
+	$template->assign_vars(array(
+		'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="'.append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode').'">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="'.append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode').'">', '</a>'),
 		'IMG_STATUS'			=> ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
 		'SMILIES_STATUS'		=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
 		'URL_STATUS'			=> ($bbcode_status && $url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
@@ -411,10 +411,10 @@ 
 		'S_BANNER'				=> $s_banner ? true : false,
 		'S_BACK'				=> $s_back ? true : false,
 		'S_FLAG'				=> $s_flag ? true : false,
-		'S_BBCODE_ALLOWED' 		=> (bool)$bbcode_status,
+		'S_BBCODE_ALLOWED' 		=> (bool) $bbcode_status,
 
 		'DIR_FLAG_PATH'			=> $flag_path,
-		'DIR_FLAG_IMAGE'		=> $flag ? $flag_path . $flag : $phpbb_root_path . 'images/spacer.gif',
+		'DIR_FLAG_IMAGE'		=> $flag ? $flag_path.$flag : $phpbb_root_path.'images/spacer.gif',
 
 		'EDIT_MODE'				=> ($mode == 'edit') ? true : false,
 
@@ -446,17 +446,17 @@ 
 
 	$link_list = array();
 	$sort_days	= request_var('st', 0);
-	$sort_key	= request_var('sk', (string)substr($config['dir_default_order'], 0, 1));
-	$sort_dir	= request_var('sd', (string)substr($config['dir_default_order'], 2));
+	$sort_key	= request_var('sk', (string) substr($config['dir_default_order'], 0, 1));
+	$sort_dir	= request_var('sd', (string) substr($config['dir_default_order'], 2));
 
 	// We gete notification status
 
 	$data = array(
-		'n_user_id' 	=> (int)$user->data['user_id'],
-		'n_cat_id' 	=> (int)$id,
+		'n_user_id' 	=> (int) $user->data['user_id'],
+		'n_cat_id' 	=> (int) $id,
 	);
 
-	$sql = 'SELECT n_user_id FROM ' . DIR_NOTIFICATION_TABLE . ' WHERE ' . $db->sql_build_array('SELECT', $data);
+	$sql = 'SELECT n_user_id FROM '.DIR_NOTIFICATION_TABLE.' WHERE '.$db->sql_build_array('SELECT', $data);
 	$result = $db->sql_query($sql);
 	$cat = $db->sql_fetchrow($result);
 
@@ -468,7 +468,7 @@ 
 	$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
 	gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
 
-	$u_sort_param = ($sort_days === 0 && $sort_key == (string)substr($config['dir_default_order'], 0, 1) && $sort_dir == (string)substr($config['dir_default_order'], 2)) ? '' : '&amp;'.$u_sort_param;
+	$u_sort_param = ($sort_days === 0 && $sort_key == (string) substr($config['dir_default_order'], 0, 1) && $sort_dir == (string) substr($config['dir_default_order'], 2)) ? '' : '&amp;'.$u_sort_param;
 
 	// A deadline has been selected
 	if ($sort_days)
@@ -476,8 +476,8 @@ 
 		$min_post_time = time() - ($sort_days * 86400);
 
 		$sql = 'SELECT COUNT(link_id) AS nb_links
-			FROM ' . DIR_LINK_TABLE . '
-			WHERE link_cat = ' . (int)$id . '
+			FROM ' . DIR_LINK_TABLE.'
+			WHERE link_cat = ' . (int) $id.'
 				AND link_time >= ' . $min_post_time;
 		$result = $db->sql_query($sql);
 		$nb_links = (int) $db->sql_fetchfield('nb_links');
@@ -492,7 +492,7 @@ 
 	else
 	{
 		$sql_limit_time = '';
-		$nb_links		= $categorie->data['cat_links'];
+		$nb_links = $categorie->data['cat_links'];
 	}
 
 	// Make sure $start is set to the last page if it exceeds the amount
@@ -503,13 +503,13 @@ 
 
 	$categorie->display();
 
-	$title .= ' - ' . $categorie->data['cat_name'];
+	$title .= ' - '.$categorie->data['cat_name'];
 
 	// Build navigation links
 	generate_dir_nav($categorie->data);
 
 	$template->assign_vars(array(
-		'L_DIR_CAT_NAME'		=> $user->lang['DIR_CAT_NAME'] . ': ' . $categorie->data['cat_name'],
+		'L_DIR_CAT_NAME'		=> $user->lang['DIR_CAT_NAME'].': '.$categorie->data['cat_name'],
 		'L_DIR_NOTIFICATION'	=> (($cat['n_user_id']) ? $user->lang['DIR_BE_NOT_NOTIFIED'] : $user->lang['DIR_BE_NOTIFIED']),
 
 		'U_PAGE'				=> append_sid("{$directory_root_path}directory.$phpEx", "mode=cat&amp;id=$id{$u_sort_param}", true),
@@ -544,14 +544,14 @@ 
 		}
 
 		// Select the sort order
-		$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		$sql_start		= max(0, $nb_links - $sql_limit - $start);
+		$sql_sort_order = $sort_by_sql[$sort_key].' '.(($sort_dir == 'd') ? 'ASC' : 'DESC');
+		$sql_start = max(0, $nb_links - $sql_limit - $start);
 	}
 	else
 	{
 		// Select the sort order
-		$sql_sort_order	= $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
-		$sql_start		= $start;
+		$sql_sort_order = $sort_by_sql[$sort_key].' '.(($sort_dir == 'd') ? 'DESC' : 'ASC');
+		$sql_start = $start;
 	}
 
 	// Grab just the sorted link ids
@@ -595,10 +595,10 @@ 
 					),
 					array(
 						'FROM'	=> array(DIR_VOTE_TABLE => 'v'),
-						'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = ' . $user->data['user_id']
+						'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$user->data['user_id']
 					)
 			),
-			'WHERE'		=> $db->sql_in_set('l.link_id', $link_list). $sql_limit_time);
+			'WHERE'		=> $db->sql_in_set('l.link_id', $link_list).$sql_limit_time);
 
 		$sql = $db->sql_build_query('SELECT', $sql_array);
 		$result = $db->sql_query($sql);
@@ -611,8 +611,8 @@ 
 
 		$link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
 
-		$votes_status 		= ((int)$categorie->data['cat_allow_votes']) ? true : false;
-		$comments_status 	= ((int)$categorie->data['cat_allow_comments']) ? true : false;
+		$votes_status = ((int) $categorie->data['cat_allow_votes']) ? true : false;
+		$comments_status = ((int) $categorie->data['cat_allow_comments']) ? true : false;
 
 		foreach ($link_list as $link_id)
 		{
@@ -622,12 +622,12 @@ 
 			$s_note		= $link->display_note($site['link_note'], $site['link_vote'], $votes_status);
 			$s_thumb	= $link->display_thumb($site);
 			$s_vote		= $link->display_vote($site, $votes_status);
-			$s_comment	= $link->display_comm($site['link_id'], $site['link_comment'], $comments_status);
-			$s_banner	= $link->display_bann($site);
-			$s_pr		= $link->display_pagerank($site);
-			$s_rss		= $site['link_rss'];
+			$s_comment = $link->display_comm($site['link_id'], $site['link_comment'], $comments_status);
+			$s_banner = $link->display_bann($site);
+			$s_pr = $link->display_pagerank($site);
+			$s_rss = $site['link_rss'];
 
-			$edit_allowed 	= ($user->data['is_registered'] && ($auth->acl_get('m_edit_dir') || ($user->data['user_id'] == $site['link_user_id'] && $auth->acl_get('u_edit_dir'))));
+			$edit_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_edit_dir') || ($user->data['user_id'] == $site['link_user_id'] && $auth->acl_get('u_edit_dir'))));
 			$delete_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_delete_dir') || ($user->data['user_id'] == $site['link_user_id'] && $auth->acl_get('u_delete_dir'))));
 
 			$template->assign_block_vars('site', array(
@@ -636,7 +636,7 @@ 
 				'DESCRIPTION' 	=> generate_text_for_display($site['link_description'], $site['link_uid'], $site['link_bitfield'], $site['link_flags']),
 				'THUMB'			=> '<img src="'.$s_thumb.'" alt="'.$user->lang['DIR_THUMB'].'" title="'.$site['link_name'].'"/>',
 				'NOTE'			=> $s_note,
-				'NB_VOTE'		=> ($site['link_vote'] > 1) ? $user->lang('DIR_NB_VOTES', $site['link_vote'])  : sprintf($user->lang['DIR_NB_VOTE'], $site['link_vote']),
+				'NB_VOTE'		=> ($site['link_vote'] > 1) ? $user->lang('DIR_NB_VOTES', $site['link_vote']) : sprintf($user->lang['DIR_NB_VOTE'], $site['link_vote']),
 				'VOTE'			=> $s_vote,
 				'PAGERANK'		=> $s_pr,
 				'COMMENT'		=> $s_comment,
@@ -653,15 +653,15 @@ 
 				'ON_CLICK' 		=> "onclick=\"window.open('".append_sid($directory_root_path.'directory.'.$phpEx, array('mode' => 'view_url', 'u' => $site['link_id']))."');return false;\"",
 
 				'U_LINK'	=> $site['link_url'],
-				'U_EDIT'	=> ($edit_allowed) ? append_sid("{$directory_root_path}directory.$phpEx", "mode=edit&amp;id=$id&amp;u=" . $site['link_id'], true) : '',
-				'U_DELETE'	=> ($delete_allowed) ? append_sid("{$directory_root_path}directory.$phpEx", "mode=delete&amp;id=$id&amp;u=" . $site['link_id'], true) : '',
+				'U_EDIT'	=> ($edit_allowed) ? append_sid("{$directory_root_path}directory.$phpEx", "mode=edit&amp;id=$id&amp;u=".$site['link_id'], true) : '',
+				'U_DELETE'	=> ($delete_allowed) ? append_sid("{$directory_root_path}directory.$phpEx", "mode=delete&amp;id=$id&amp;u=".$site['link_id'], true) : '',
 			));
 		}
 
 		// Links back verification is on, we do a checkup
 		if ($categorie->data['cat_cron_enable'] && $categorie->data['cat_cron_next'] < time())
 		{
-			$template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=prune_directory&amp;cat=' . $id) . '" alt="cron" width="1" height="1" />');
+			$template->assign_var('RUN_CRON_TASK', '<img src="'.append_sid($phpbb_root_path.'cron.'.$phpEx, 'cron_type=prune_directory&amp;cat='.$id).'" alt="cron" width="1" height="1" />');
 		}
 	}
 	else

root/directory_search.php

Spacing +17 added lines, -17 removed lines

@@ -18,8 +18,8 @@ 
 define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/mods/directory/functions.' . $phpEx);
+include($phpbb_root_path.'common.'.$phpEx);
+include($phpbb_root_path.'includes/mods/directory/functions.'.$phpEx);
 $directory_root_path = $config['dir_root_path'];
 
 // Start session management
@@ -28,11 +28,11 @@ 
 $user->setup('mods/directory');
 
 $keyword	= utf8_normalize_nfc(trim(request_var('keyword', '', true)));
-$cat		= request_var('cat', 0);
+$cat = request_var('cat', 0);
 $method		= request_var('search_method', 'any');
 $fields		= request_var('sf', 'all');
-$categorie	= new categorie();
-$start		= request_var('start', 0);
+$categorie = new categorie();
+$start = request_var('start', 0);
 
 $template->assign_block_vars('navlinks', array(
 	'FORUM_NAME'	=> $user->lang['DIRECTORY'],
@@ -64,16 +64,16 @@ 
 			switch ($fields)
 			{
 				case 'titleonly':
-					$ssql .= ' (LOWER(a.link_name) ' . $db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char . strtolower($db->sql_escape($keytab[$i])) . $db->any_char)) .')';
+					$ssql .= ' (LOWER(a.link_name) '.$db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char.strtolower($db->sql_escape($keytab[$i])).$db->any_char)).')';
 					break;
 
 				case 'desconly':
-					$ssql .= ' (LOWER(a.link_description) ' . $db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char . strtolower($db->sql_escape($keytab[$i])) . $db->any_char)) .')';
+					$ssql .= ' (LOWER(a.link_description) '.$db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char.strtolower($db->sql_escape($keytab[$i])).$db->any_char)).')';
 					break;
 
 				default:
-					$ssql .= ' (LOWER(a.link_name) ' . $db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char . strtolower($db->sql_escape($keytab[$i])) . $db->any_char));
-					$ssql .= ' OR LOWER(a.link_description) ' . $db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char . strtolower($db->sql_escape($keytab[$i])) . $db->any_char)) .')';
+					$ssql .= ' (LOWER(a.link_name) '.$db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char.strtolower($db->sql_escape($keytab[$i])).$db->any_char));
+					$ssql .= ' OR LOWER(a.link_description) '.$db->sql_like_expression(str_replace('*', $db->any_char, $db->any_char.strtolower($db->sql_escape($keytab[$i])).$db->any_char)).')';
 					break;
 			}
 
@@ -82,7 +82,7 @@ 
 
 		if (!empty($cat))
 		{
-			$ssql .= ' AND a.link_cat = ' . (int)$cat;
+			$ssql .= ' AND a.link_cat = '.(int) $cat;
 		}
 
 		$sql_array = array(
@@ -99,7 +99,7 @@ 
 						'ON'	=> 'u.user_id = a.link_user_id'
 					)
 			),
-			'WHERE'		=> $ssql . ' AND a.link_active = 1',
+			'WHERE'		=> $ssql.' AND a.link_active = 1',
 			'ORDER_BY'	=> 'a.link_name ASC');
 
 		$sql = $db->sql_build_query('SELECT', $sql_array);
@@ -123,8 +123,8 @@ 
 	{
 		$have_result = true;
 
-		$s_banner	= $link->display_bann($data);
-		$s_thumb	= $link->display_thumb($data);
+		$s_banner = $link->display_bann($data);
+		$s_thumb = $link->display_thumb($data);
 
 		$template->assign_block_vars('result', array(
 			'S_SITE'		=> $data['link_name'],
@@ -137,11 +137,11 @@ 
 
 			'THUMB'		=> '<img src="'.$s_thumb.'" alt="'.$user->lang['DIR_THUMB'].'" title="'.$data['link_name'].'"/>',
 			'IMG_BANNER'	=> $s_banner,
-			'IMG_FLAG'		=> (($data['link_flag'] == '') ? '' : '&nbsp;<img src="' . $phpbb_root_path . 'images/directory/flags/' . $data['link_flag'] . '" alt="' . $data['link_flag'] . '" title="' . $data['link_flag'] . '" border="0" width="17" height="12" />&nbsp;'),
+			'IMG_FLAG'		=> (($data['link_flag'] == '') ? '' : '&nbsp;<img src="'.$phpbb_root_path.'images/directory/flags/'.$data['link_flag'].'" alt="'.$data['link_flag'].'" title="'.$data['link_flag'].'" border="0" width="17" height="12" />&nbsp;'),
 			'ON_CLICK' 		=> "onclick=\"window.open('".append_sid($directory_root_path.'directory.'.$phpEx, array('mode' => 'view_url', 'u' => $data['link_id']))."');return false;\"",
 
 			'L_DIR_SEARCH_NB_CLIC'	=> ($data['link_view'] > 1) ? $user->lang['DIR_SEARCH_NB_CLICS'] : $user->lang['DIR_SEARCH_NB_CLIC'],
-			'L_DIR_SEARCH_NB_COMM'	=> ($data['link_comment'] > 1) ? $user->lang['L_DIR_SEARCH_NB_COMMS']: $user->lang['L_DIR_SEARCH_NB_COMM'],
+			'L_DIR_SEARCH_NB_COMM'	=> ($data['link_comment'] > 1) ? $user->lang['L_DIR_SEARCH_NB_COMMS'] : $user->lang['L_DIR_SEARCH_NB_COMM'],
 
 			'U_SITE'		=> $data['link_url'],
 			'LINK_ID'		=> $data['link_id'],
@@ -160,7 +160,7 @@ 
 	}
 }
 
-$template->assign_vars( array(
+$template->assign_vars(array(
 	'AND_SELECT'	=> ($method == 'all') ? 'checked="checked"' : '',
 	'OR_SELECT'		=> ($method == 'any') ? 'checked="checked"' : '',
 	'ALL_SELECT'	=> ($fields == 'all') ? 'checked="checked"' : '',
@@ -173,7 +173,7 @@ 
 	'S_HAVE_SEARCH'	=> $have_search,
 	'S_HAVE_RESULT'	=> $have_result,
 
-	'U_SOMMAIRE'	=> append_sid('directory.' . $phpEx)
+	'U_SOMMAIRE'	=> append_sid('directory.'.$phpEx)
 ));
 
 page_header($user->lang['DIR_MAKE_SEARCH'], false);

root/language/sr/mods/info_acp_directory.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 	'DIR_DELETE_ALL_LINKS'					=> 'izbrisati sve vebsajtove',
 	'DIR_DELETE_ORPHANS'					=> 'Izbrisati orphan banere',
 	'DIR_DELETE_ORPHANS_CONFIRM'			=> 'Da li ste sigurni da zelite da izbrisete orphan banere?',
-	'DIR_DELETE_ORPHANS_EXPLAIN'			=> 'Orphan baneri su baneri koji su kopirani na server ali iz nepoznatog razloga nisu vise povezani sa direktorijumom vebsajta.' ,
+	'DIR_DELETE_ORPHANS_EXPLAIN'			=> 'Orphan baneri su baneri koji su kopirani na server ali iz nepoznatog razloga nisu vise povezani sa direktorijumom vebsajta.',
 	'DIR_DELETE_SUBCATS'					=> 'Izbrisati vebsajtove i kategorije',
 	'DIR_DOWNLOAD_LATEST'					=> 'Download poslednju verziju',
 	'DIR_EDIT_CAT'							=> 'Izmeniti kategoriju',

root/includes/acp/info/acp_directory.php

Indentation +18 added lines, -18 removed lines

@@ -14,27 +14,27 @@
 */
 class acp_directory_info
 {
-    function module()
-    {
-        return array(
-            'filename'		=> 'acp_directory',
-            'title'			=> 'ACP_DIRECTORY',
-            'version'		=> '1.0.1',
-            'modes'			=> array(
-            	''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'acl_a_board', 'cat' => array('')),
-            	'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
+	function module()
+	{
+		return array(
+			'filename'		=> 'acp_directory',
+			'title'			=> 'ACP_DIRECTORY',
+			'version'		=> '1.0.1',
+			'modes'			=> array(
+				''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'acl_a_board', 'cat' => array('')),
+				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
 				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS',	'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
 				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
 				'val'			=> array('title' => 'ACP_DIRECTORY_VAL',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
-            ),
-        );
-    }
+			),
+		);
+	}
 
-    function install()
-    {
-    }
+	function install()
+	{
+	}
 
-    function uninstall()
-    {
-    }
+	function uninstall()
+	{
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
             'title'			=> 'ACP_DIRECTORY',
             'version'		=> '1.0.1',
             'modes'			=> array(
-            	''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'acl_a_board', 'cat' => array('')),
-            	'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
-				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS',	'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
-				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
-				'val'			=> array('title' => 'ACP_DIRECTORY_VAL',		'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
+            	''				=> array('title' => 'ACP_DIRECTORY', 'auth'	=> 'acl_a_board', 'cat' => array('')),
+            	'main'			=> array('title' => 'ACP_DIRECTORY_MAIN', 'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
+				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
+				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS', 'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
+				'val'			=> array('title' => 'ACP_DIRECTORY_VAL', 'auth'	=> 'acl_a_board', 'cat' => array('ACP_DIRECTORY')),
             ),
         );
     }

root/directory_comment.php

Spacing +26 added lines, -26 removed lines

@@ -18,10 +18,10 @@ 
 define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/mods/directory/functions.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+include($phpbb_root_path.'common.'.$phpEx);
+include($phpbb_root_path.'includes/mods/directory/functions.'.$phpEx);
+include($phpbb_root_path.'includes/functions_posting.'.$phpEx);
+include($phpbb_root_path.'includes/functions_display.'.$phpEx);
 $directory_root_path = $config['dir_root_path'];
 
 // Start session management
@@ -32,18 +32,18 @@ 
 $mode = request_var('mode', '');
 $u = request_var('u', 0);
 $id = request_var('id', 0);
-$start	= request_var('start', 0);
+$start = request_var('start', 0);
 $view = request_var('view', '');
 $s_hidden_fields = array();
 
-$sql = 'SELECT link_cat FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int)$u;
+$sql = 'SELECT link_cat FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $u;
 $result = $db->sql_query($sql);
 $cat_id = (int) $db->sql_fetchfield('link_cat');
 $db->sql_freeresult($result);
 
-$categorie	= new categorie($cat_id);
+$categorie = new categorie($cat_id);
 
-if(!$categorie->data['cat_allow_comments'])
+if (!$categorie->data['cat_allow_comments'])
 {
 	trigger_error('DIR_ERROR_NOT_AUTH');
 }
@@ -51,16 +51,16 @@ 
 $comm = new comment;
 
 // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-if(!$user->data['is_registered'] && $config['dir_visual_confirm'])
+if (!$user->data['is_registered'] && $config['dir_visual_confirm'])
 {
-	include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
-	$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+	include($phpbb_root_path.'includes/captcha/captcha_factory.'.$phpEx);
+	$captcha = & phpbb_captcha_factory::get_instance($config['captcha_plugin']);
 	$captcha->init(CONFIRM_POST);
 }
 
 // get config for options
-$bbcode_status	= $config['dir_allow_bbcode'] ? true : false;
-$smilies_status	= $config['dir_allow_smilies'] ? true : false;
+$bbcode_status = $config['dir_allow_bbcode'] ? true : false;
+$smilies_status = $config['dir_allow_smilies'] ? true : false;
 $img_status		= $bbcode_status ? true : false;
 $url_status		= $config['dir_allow_links'] ? true : false;
 
@@ -78,7 +78,7 @@ 
 	}
 
 	$reply = utf8_normalize_nfc(request_var('message', '', true));
-	include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+	include($phpbb_root_path.'includes/functions_user.'.$phpEx);
 	$user->add_lang('ucp');
 
 	$error = validate_data(
@@ -109,7 +109,7 @@ 
 
 	if ($error)
 	{
-		$template->assign_vars( array(
+		$template->assign_vars(array(
 	   		'ERROR'	=> (sizeof($error)) ? implode('<br />', $error) : ''
 	   	));
 	}
@@ -129,7 +129,7 @@ 
 		if (isset($_POST['submit_comment']))
 		{
 			$data_add = array(
-				'comment_link_id'	=> (int)$u,
+				'comment_link_id'	=> (int) $u,
 				'comment_date'		=> time(),
 				'comment_user_id'	=> $user->data['user_id'],
 				'comment_user_ip'	=> $user->ip,
@@ -148,12 +148,12 @@ 
 }
 elseif ($mode == 'edit' || $mode == 'delete')
 {
-	$sql = 'SELECT * FROM ' . DIR_COMMENT_TABLE . '
+	$sql = 'SELECT * FROM '.DIR_COMMENT_TABLE.'
 			WHERE comment_id = ' . $id;
 	$result = $db->sql_query($sql);
 	$value = $db->sql_fetchrow($result);
 
-	if($mode == 'edit')
+	if ($mode == 'edit')
 	{
 		if (!$auth->acl_get('m_edit_comment_dir') && (!$auth->acl_get('u_edit_comment_dir') || $user->data['user_id'] != $value['comment_user_id']))
 		{
@@ -163,7 +163,7 @@ 
 		$s_comment = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']);
 
 		$s_hidden_fields = array(
-			'id'	=> (int)$id,
+			'id'	=> (int) $id,
 		);
 	}
 	else
@@ -172,7 +172,7 @@ 
 		{
 			trigger_error('DIR_ERROR_NOT_AUTH');
 		}
-		$template->assign_vars( array(
+		$template->assign_vars(array(
 			'S_DELETE'			=> true,
 		));
 
@@ -183,8 +183,8 @@ 
 //
 // main
 $sql = 'SELECT COUNT(comment_id) AS nb_comments
-			FROM ' . DIR_COMMENT_TABLE . '
-			WHERE comment_link_id = ' . (int)$u;
+			FROM ' . DIR_COMMENT_TABLE.'
+			WHERE comment_link_id = ' . (int) $u;
 $result = $db->sql_query($sql);
 $nb_comments = (int) $db->sql_fetchfield('nb_comments');
 $db->sql_freeresult($result);
@@ -205,10 +205,10 @@ 
 			),
 			array(
 				'FROM'	=> array(ZEBRA_TABLE => 'z'),
-				'ON'	=> 'z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id'
+				'ON'	=> 'z.user_id = '.$user->data['user_id'].' AND z.zebra_id = a.comment_user_id'
 			)
 	),
-	'WHERE'		=> 'a.comment_link_id = ' . $u,
+	'WHERE'		=> 'a.comment_link_id = '.$u,
 	'ORDER_BY'	=> 'a.comment_date DESC');
 
 $sql = $db->sql_build_query('SELECT', $sql_array);
@@ -262,12 +262,12 @@ 
 	));
 }
 
-$template->assign_vars( array(
+$template->assign_vars(array(
 	'S_AUTH_COMM' 		=> $auth->acl_get('u_comment_dir'),
 	'S_DELETE'			=> ($mode == 'delete') ? true : false,
 	'S_DIR_COMMENT'		=> true,
 
-	'BBCODE_STATUS'		=> ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode') . '">', '</a>'),
+	'BBCODE_STATUS'		=> ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="'.append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode').'">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="'.append_sid($phpbb_root_path."faq.$phpEx", 'mode=bbcode').'">', '</a>'),
 	'IMG_STATUS'		=> ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
 	'SMILIES_STATUS'	=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
 	'URL_STATUS'		=> ($bbcode_status && $url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],