From ab5e78fbcc96cb15b9159eef1a66c25cad0606bf Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Thu, 21 Jan 2021 16:17:00 -0500
Subject: generalize searchString matching

---
 bit_setup_inc.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 8daddf2..5aa9e68 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -70,18 +70,15 @@ if( $gBitSystem->isPackageActive( 'stats' )) {
 		$ret = '';
 		if( $urlHash = parse_url( $pRefererUrl ) ) {
 			$ret = $urlHash['host'];
-			if( !empty( $urlHash['query'] ) && strpos( $urlHash['query'], 'q=' ) !== FALSE ) {
-				// google and bing search param
-				$result = array();
-				parse_str( $urlHash['query'], $result );
-				if( !empty( $result['q'] ) ) {
-					$ret .= '/...q='.$result['q'];
-				}
-			} elseif( !empty( $urlHash['query'] ) && strpos( $urlHash['query'], 'p=' ) !== FALSE ) {
-				// yahoo search param
-				parse_str( $urlHash['query'] );
-				if( !empty( $p ) ) {
-					$ret .= '/...p='.$p;
+			// q= google and bing search param, p= yahoo search param
+			$searchStrings = array( 'q', 'p' );
+			foreach( $searchStrings as $param ) {
+				if( !empty( $urlHash['query'] ) && strpos( $urlHash['query'], $param.'=' ) !== FALSE ) {
+					$result = array();
+					parse_str( $urlHash['query'], $result );
+					if( !empty( $result[$param] ) ) {
+						$ret .= '/...'.$param.'='.$result[$param];
+					}
 				}
 			}
 		} else {
-- 
cgit v1.3