satanasov / pmsearch

event/main_listener.php

Braces +1 added lines, -2 removed lines

@@ -105,8 +105,7 @@
 		if ($event['folder_id'] == PRIVMSGS_OUTBOX)
 		{
 			$this->fulltext_search->index_remove($event['msg_ids']);
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT COUNT(msg_id) as count, msg_id
 				FROM ' . PRIVMSGS_TO_TABLE . '

acp/acp_pmsearch_module.php

Indentation +4 added lines, -4 removed lines

@@ -277,10 +277,10 @@
 		return $max_post_id;
 	}
 	/**
-	* Initialises a search backend object
-	*
-	* @return false if no error occurred else an error message
-	*/
+	 * Initialises a search backend object
+	 *
+	 * @return false if no error occurred else an error message
+	 */
 	function init_search($type, &$search, &$error)
 	{
 		global $phpbb_root_path, $phpEx, $user, $auth, $config, $db, $table_prefix;

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 
 		$this->search_helper = $phpbb_container->get('anavaro.pmsearch.search.helper');
 
-		switch($mode)
+		switch ($mode)
 		{
 			default:
 				//Let's see indexing
@@ -55,14 +55,14 @@ 
 				{
 					$config->set('pmsearch_search', 1);
 				}
-				$this->tpl_name		= 'acp_pmsearch';
-				$this->page_title	= 'PMSEARCH_ADMIN';
+				$this->tpl_name = 'acp_pmsearch';
+				$this->page_title = 'PMSEARCH_ADMIN';
 
 				$template->assign_var('PM_INDEX', $config['pmsearch_pm_index']);
 				$template->assign_var('PM_SEARCH', $config['pmsearch_search']);
-				$template->assign_var('U_ACTION', append_sid("index.php?i=".$id."&mode=".$mode));
+				$template->assign_var('U_ACTION', append_sid("index.php?i=" . $id . "&mode=" . $mode));
 
-				if($config['pmsearch_pm_index'])
+				if ($config['pmsearch_pm_index'])
 				{
 					$action_index = $request->variable('action_index', '');
 					$this->state = explode(',', $config['search_pm_indexing_state']);

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 				if ($pm_index == '1')
 				{
 					$config->set('pmsearch_pm_index', 0);
-				}
-				else if ($pm_index == '2')
+				} else if ($pm_index == '2')
 				{
 					$config->set('pmsearch_pm_index', 1);
 				}
@@ -50,8 +49,7 @@ 
 				if ($pm_search == '1')
 				{
 					$config->set('pmsearch_search', 0);
-				}
-				else if ($pm_index == '2')
+				} else if ($pm_index == '2')
 				{
 					$config->set('pmsearch_search', 1);
 				}
@@ -177,8 +175,7 @@ 
 										$this->save_state();
 										meta_refresh(1, append_sid($this->u_action . '&action_index=create&skip_rows=' . $post_counter));
 										trigger_error($user->lang('SEARCH_INDEX_CREATE_REDIRECT', (int) $row_count, $post_counter) . $user->lang('SEARCH_INDEX_CREATE_REDIRECT_RATE', $rows_per_second));
-									}
-									else
+									} else
 									{
 										$this->state = array('');
 										add_log('admin', 'LOG_PMSEARCH_INDEX_CREATED', $name);
@@ -214,8 +211,7 @@ 
 						if ($n && sizeof($statistics[$n - 1]) < 3)
 						{
 							$statistics[$n - 1] += array('statistic_2' => $statistic, 'value_2' => $value);
-						}
-						else
+						} else
 						{
 							$statistics[] = array('statistic_1' => $statistic, 'value_1' => $value);
 						}

search/pm_search_fulltext_native.php

Indentation +52 added lines, -52 removed lines

@@ -20,10 +20,10 @@ 
 	protected $target;
 
 	/**
-	* Returns the name of this search backend to be displayed to administrators
-	*
-	* @return string Name
-	*/
+	 * Returns the name of this search backend to be displayed to administrators
+	 *
+	 * @return string Name
+	 */
 	public function get_name($type = 'normal')
 	{
 		switch ($type)
@@ -50,20 +50,20 @@ 
 	}
 
 	/**
-	* This function fills $this->search_query with the cleaned user search query
-	*
-	* If $terms is 'any' then the words will be extracted from the search query
-	* and combined with | inside brackets. They will afterwards be treated like
-	* an standard search query.
-	*
-	* Then it analyses the query and fills the internal arrays $must_not_contain_ids,
-	* $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search()
-	*
-	* @param	string	$keywords	contains the search query string as entered by the user
-	* @param	string	$terms		is either 'all' (use search query as entered, default words to 'must be contained in post')
-	* 	or 'any' (find all posts containing at least one of the given words)
-	* @return	boolean				false if no valid keywords were found and otherwise true
-	*/
+	 * This function fills $this->search_query with the cleaned user search query
+	 *
+	 * If $terms is 'any' then the words will be extracted from the search query
+	 * and combined with | inside brackets. They will afterwards be treated like
+	 * an standard search query.
+	 *
+	 * Then it analyses the query and fills the internal arrays $must_not_contain_ids,
+	 * $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search()
+	 *
+	 * @param	string	$keywords	contains the search query string as entered by the user
+	 * @param	string	$terms		is either 'all' (use search query as entered, default words to 'must be contained in post')
+	 * 	or 'any' (find all posts containing at least one of the given words)
+	 * @return	boolean				false if no valid keywords were found and otherwise true
+	 */
 	public function split_keywords($keywords, $terms)
 	{
 		$swl_table = PRIVMSGS_TABLE . '_swl';
@@ -367,22 +367,22 @@ 
 	}
 
 	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	string		$type				wchich type of table to be searched defaults to norma
-	* @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
+	 * Performs a search on keywords depending on display specific params. You have to run split_keywords() first
+	 *
+	 * @param	string		$type				wchich type of table to be searched defaults to norma
+	 * @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
+	 * @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
+	 * @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
+	 * @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
+	 * @param	string		$sort_dir			is either a or d representing ASC and DESC
+	 * @param	string		$sort_days			specifies the maximum amount of days a post may be old
+	 * @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
+	 * @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
+	 * @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
+	 * @param	int			$start				indicates the first index of the page
+	 * @param	int			$per_page			number of ids each page is supposed to contain
+	 * @return	boolean|int						total number of results
+	 */
 	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts.
@@ -718,15 +718,15 @@ 
 	}
 
 	/**
-	* Updates wordlist and wordmatch tables when a message is posted or changed
-	*
-	* @param	string	$mode		Contains the post mode: edit, post, reply, quote
-	* @param	int		$post_id	The id of the post which is modified/created
-	* @param	string	&$message	New or updated post content
-	* @param	string	&$subject	New or updated post subject
-	* @param	int		$poster_id	Post author's user id
-	* @param	int		$forum_id	The id of the forum in which the post is located
-	*/
+	 * Updates wordlist and wordmatch tables when a message is posted or changed
+	 *
+	 * @param	string	$mode		Contains the post mode: edit, post, reply, quote
+	 * @param	int		$post_id	The id of the post which is modified/created
+	 * @param	string	&$message	New or updated post content
+	 * @param	string	&$subject	New or updated post subject
+	 * @param	int		$poster_id	Post author's user id
+	 * @param	int		$forum_id	The id of the forum in which the post is located
+	 */
 	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id = '')
 	{
 		$wordlist = PRIVMSGS_TABLE . '_swl';
@@ -941,9 +941,9 @@ 
 	}
 
 	/**
-	* Tidy up indexes: Tag 'common words' and remove
-	* words no longer referenced in the match table
-	*/
+	 * Tidy up indexes: Tag 'common words' and remove
+	 * words no longer referenced in the match table
+	 */
 	public function tidy()
 	{
 		$swl_table = PRIVMSGS_TABLE . '_swl';
@@ -1008,8 +1008,8 @@ 
 	}
 
 	/**
-	* Deletes all words from the index
-	*/
+	 * Deletes all words from the index
+	 */
 	public function delete_index($acp_module, $u_action, $type = 'normal')
 	{
 		$swl_table = PRIVMSGS_TABLE . '_swl';
@@ -1033,8 +1033,8 @@ 
 	}
 
 	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
+	 * Returns true if both FULLTEXT indexes exist
+	 */
 	public function index_created($type = 'normal')
 	{
 		if (!sizeof($this->stats))
@@ -1050,8 +1050,8 @@ 
 	}
 
 	/**
-	* Returns an associative array containing information about the indexes
-	*/
+	 * Returns an associative array containing information about the indexes
+	 */
 	public function index_stats($type = 'normal')
 	{
 		if (!sizeof($this->stats))

Spacing +6 added lines, -6 removed lines

@@ -219,8 +219,8 @@ 
 		}
 
 		// Handle +, - without preceeding whitespace character
-		$match		= array('#(\S)\+#', '#(\S)-#');
-		$replace	= array('$1 +', '$1 +');
+		$match = array('#(\S)\+#', '#(\S)-#');
+		$replace = array('$1 +', '$1 +');
 
 		$keywords = preg_replace($match, $replace, $keywords);
 
@@ -913,7 +913,7 @@ 
 
 			if (sizeof($title_word_ids))
 			{
-				$sql = 'UPDATE ' .  PRIVMSGS_TABLE . '_swl' . '
+				$sql = 'UPDATE ' . PRIVMSGS_TABLE . '_swl' . '
 					SET word_count = word_count - 1
 					WHERE ' . $this->db->sql_in_set('word_id', $title_word_ids) . '
 						AND word_count > 0';
@@ -1070,8 +1070,8 @@ 
 
 	protected function get_stats()
 	{
-		$this->stats['total_words']		= $this->db->get_estimated_row_count(PRIVMSGS_TABLE . '_swl');
-		$this->stats['total_matches']	= $this->db->get_estimated_row_count(PRIVMSGS_TABLE . '_swm');
+		$this->stats['total_words'] = $this->db->get_estimated_row_count(PRIVMSGS_TABLE . '_swl');
+		$this->stats['total_matches'] = $this->db->get_estimated_row_count(PRIVMSGS_TABLE . '_swm');
 	}
 
 	/**
@@ -1103,7 +1103,7 @@ 
 				$messages_to_table => 'mt',
 			),
 
-			'WHERE'	=> 'msg.msg_id = mt.msg_id AND (((msg.author_id = ' . $this->user->data['user_id'] . ' AND msg.to_address LIKE \'u_' . $target_id .'\') OR (msg.author_id = ' . $target_id . ' AND msg.to_address LIKE \'u_' . $this->user->data['user_id'] .'\')) AND mt.user_id = ' . $this->user->data['user_id'] . ')',
+			'WHERE'	=> 'msg.msg_id = mt.msg_id AND (((msg.author_id = ' . $this->user->data['user_id'] . ' AND msg.to_address LIKE \'u_' . $target_id . '\') OR (msg.author_id = ' . $target_id . ' AND msg.to_address LIKE \'u_' . $this->user->data['user_id'] . '\')) AND mt.user_id = ' . $this->user->data['user_id'] . ')',
 
 		);
 

Braces +13 added lines, -26 removed lines

@@ -112,8 +112,7 @@ 
 						}
 					break;
 				}
-			}
-			else
+			} else
 			{
 				switch ($keywords[$i])
 				{
@@ -290,13 +289,11 @@ 
 					{
 						$id_words[] = '\'' . $this->db->sql_escape(str_replace('*', '%', $word_part)) . '\'';
 						$non_common_words[] = $word_part;
-					}
-					else if (isset($words[$word_part]))
+					} else if (isset($words[$word_part]))
 					{
 						$id_words[] = $words[$word_part];
 						$non_common_words[] = $word_part;
-					}
-					else
+					} else
 					{
 						$len = utf8_strlen($word_part);
 						if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
@@ -311,8 +308,7 @@ 
 					if (sizeof($id_words) > 1)
 					{
 						$this->{$mode . '_ids'}[] = $id_words;
-					}
-					else
+					} else
 					{
 						$mode = ($mode == 'must_exclude_one') ? 'must_not_contain' : $mode;
 						$this->{$mode . '_ids'}[] = $id_words[0];
@@ -334,18 +330,15 @@ 
 					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
 					{
 						$this->{$mode . '_ids'}[] = '\'' . $this->db->sql_escape(str_replace('*', '%', $word)) . '\'';
-					}
-					else
+					} else
 					{
 						$this->common_words[] = $word;
 					}
-				}
-				else
+				} else
 				{
 					$this->{$mode . '_ids'}[] = $words[$word];
 				}
-			}
-			else
+			} else
 			{
 				if (!isset($common_ids[$word]))
 				{
@@ -496,8 +489,7 @@ 
 						$word_ids[] = "w$w_num.word_id";
 
 						$w_num++;
-					}
-					else
+					} else
 					{
 						$word_ids[] = $id;
 					}
@@ -507,8 +499,7 @@ 
 
 				unset($word_id_sql);
 				unset($word_ids);
-			}
-			else if (is_string($subquery))
+			} else if (is_string($subquery))
 			{
 				$sql_array['FROM'][$swl_table][] = 'w' . $w_num;
 
@@ -517,8 +508,7 @@ 
 
 				$group_by = true;
 				$w_num++;
-			}
-			else
+			} else
 			{
 				$sql_where[] = "m$m_num.word_id = $subquery";
 			}
@@ -771,8 +761,7 @@ 
 			$words['add']['title'] = array_diff($split_title, array_keys($cur_words['title']));
 			$words['del']['post'] = array_diff(array_keys($cur_words['post']), $split_text);
 			$words['del']['title'] = array_diff(array_keys($cur_words['title']), $split_title);
-		}
-		else
+		} else
 		{
 			$words['add']['post'] = $split_text;
 			$words['add']['title'] = $split_title;
@@ -818,8 +807,7 @@ 
 				$this->db->sql_return_on_error(false);
 			}
 			unset($new_words, $sql_ary);
-		}
-		else
+		} else
 		{
 			$this->db->sql_transaction('begin');
 		}
@@ -902,8 +890,7 @@ 
 				if ($row['title_match'])
 				{
 					$title_word_ids[] = $row['word_id'];
-				}
-				else
+				} else
 				{
 					$message_word_ids[] = $row['word_id'];
 				}

ucp/ucp_pmsearch_module.php

Spacing +5 added lines, -5 removed lines

@@ -35,9 +35,9 @@ 
 		switch ($mode)
 		{
 			case 'search':
-				$this->tpl_name	= 'ucp_pmsearch';
+				$this->tpl_name = 'ucp_pmsearch';
 				$template->assign_vars(array(
-					'S_UCP_ACTION'	=>	append_sid("ucp.php?i=".$id."&mode=".$mode)
+					'S_UCP_ACTION'	=>	append_sid("ucp.php?i=" . $id . "&mode=" . $mode)
 				));
 
 				$terms = $request->variable('terms', 'any');
@@ -81,7 +81,7 @@ 
 						$search_count = $this->search->user_search($keywords, $id_ary, $startFrom, $this->config['search_block_size']);
 					}
 
-					if ($search_count > 0 )
+					if ($search_count > 0)
 					{
 						// Let's get additional info
 						$page_array = array();
@@ -120,7 +120,7 @@ 
 						$db->sql_freeresult($result);
 						// ... one for the authors on this page
 						$authors_array = array();
-						$sql = 'SELECT user_id, username, user_colour FROM ' . USERS_TABLE . ' WHERE ' .  $db->sql_in_set('user_id', $author_uid_arrray);
+						$sql = 'SELECT user_id, username, user_colour FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $author_uid_arrray);
 						$result = $db->sql_query($sql);
 						while ($row = $db->sql_fetchrow($result))
 						{
@@ -140,7 +140,7 @@ 
 								'SENT_TIME'	=>	$user->format_date($VAR['msg_time']),
 								'MESSAGE_AUTHOR_FULL'	=> ($authors_array[$VAR['msg_author']]['user_colour'] ? '<a href="./memberlist.php?mode=viewprofile&u=' . $VAR['msg_author'] . '" class="username-coloured" style="color: #' . $authors_array[$VAR['msg_author']]['user_colour'] . ';">' . $authors_array[$VAR['msg_author']]['username'] . '</a>' : '<a href="./memberlist.php?mode=viewprofile&u=' . $VAR['msg_author'] . '" class="username">' . $authors_array[$VAR['msg_author']]['username'] . '</a>'),
 							));
-							$count ++;
+							$count++;
 						}
 
 						$pagination = $phpbb_container->get('pagination');

Braces +3 added lines, -7 removed lines

@@ -65,8 +65,7 @@ 
 						//$search_count = $this->search->keyword_search('norma', 'all', 'all', array('msg_id' => 'a'), 'msg_id', 'd', 0, array($user_id), '', $id_ary, $startFrom, 25);
 						$search_count = $this->search->keyword_search('norma', 'all', 'all', array('msg_id' => 'a'), 'msg_id', 'd', 0, array(), '', '', $user_id, '', $id_ary, $startFrom, $this->config['search_block_size']);
 
-					}
-					else
+					} else
 					{
 						// So do we have user_id or username?
 						if (!is_numeric($keywords))
@@ -152,8 +151,7 @@ 
 							$template->assign_vars(array(
 								'S_KEYWORDS'	=> $authors_array[$keywords]['username']
 							));
-						}
-						else
+						} else
 						{
 							$template->assign_vars(array(
 								'S_KEYWORDS'	=>	$keywords
@@ -164,9 +162,7 @@ 
 							'TOTAL_MESSAGES'	=> $search_count,
 							'HAS_RESULTS'	=> 1,
 						));
-					}
-
-					else
+					} else
 					{
 						trigger_error('NO_RESULTS_FOUND');
 					}