3WiFi: Improve case sensitive search and API query performance

Use indexes of ESSID and WiFiKey columns along with binary search.
Also improve upload check queries the same way.

Author: binarymaster

3wifi.php

@@ -316,8 +316,10 @@ function GenerateFindQuery($cmtid, $ipaddr, $BSSID, $ESSID, $Auth, $Name, $Key,
 		}
 		if (FilterWildcards($ESSID, $Wildcards, false) != '' || empty($ESSID))
 		{
-			if (HasWildcards($ESSID, $Wildcards)) $where .= ' AND '.$binary.' `ESSID` LIKE \''.UniStrWildcard($ESSID, $Wildcards).'\'';
-			else $where .= ' AND '.$binary.' `ESSID` = \''.$ESSID.'\'';
+			if (HasWildcards($ESSID, $Wildcards)) $idx = '`ESSID` LIKE \''.UniStrWildcard($ESSID, $Wildcards).'\'';
+			else $idx = '`ESSID` = \''.$ESSID.'\'';
+
+			$where .= ' AND '.$idx.($sens ? ' AND '.$binary.' '.$idx : '');
 		}
 		if (FilterWildcards($Auth, $Wildcards, false) != '' || empty($Auth))
 		{
@@ -331,8 +333,10 @@ function GenerateFindQuery($cmtid, $ipaddr, $BSSID, $ESSID, $Auth, $Name, $Key,
 		}
 		if (FilterWildcards($Key, $Wildcards, false) != '' || empty($Key))
 		{
-			if (HasWildcards($Key, $Wildcards)) $where .= ' AND '.$binary.' `WiFiKey` LIKE \''.UniStrWildcard($Key, $Wildcards).'\'';
-			else $where .= ' AND '.$binary.' `WiFiKey` = \''.$Key.'\'';
+			if (HasWildcards($Key, $Wildcards)) $idx = '`WiFiKey` LIKE \''.UniStrWildcard($Key, $Wildcards).'\'';
+			else $idx = '`WiFiKey` = \''.$Key.'\'';
+
+			$where .= ' AND '.$idx.($sens ? ' AND '.$binary.' '.$idx : '');
 		}
 		if (FilterWildcards($WPS, $Wildcards, false) != '' || empty($WPS))
 		{
@@ -1732,7 +1736,7 @@ function highlightWords($text, array $words)
 				$ess = $db->real_escape_string($essid[$i]);
 				if ($sens)
 				{
-					$where .= " AND BINARY ESSID = '$ess'";
+					$where .= " AND ESSID = '$ess' AND BINARY ESSID = '$ess'";
 				}
 				else
 				{
@@ -1780,7 +1784,7 @@ function highlightWords($text, array $words)
 			$ess = $db->real_escape_string($essid[$i]);
 			if ($sens)
 			{
-				$where = "BINARY ESSID = '$ess'";
+				$where = "ESSID = '$ess' AND BINARY ESSID = '$ess'";
 			}
 			else
 			{

db.php

@@ -465,7 +465,7 @@ function db_add_ap($row, $cmtid, $uid, $ipaddr)
 			ON DUPLICATE KEY UPDATE
 			`cmtid`=$cmtid,`IP`=$addr,`Port`=$port,`Authorization`=$auth,`name`=$name,`RadioOff`=$radio,`Hidden`=$hide,`NoBSSID`=$NoBSSID,`BSSID`=$bssid,`ESSID`=$essid,`Security`=$sec,`WiFiKey`=$key,`WPSPIN`=$wps,`LANIP`=$lanip,`LANMask`=$lanmsk,`WANIP`=$wanip,`WANMask`=$wanmsk,`WANGateway`=$gate,`DNS1`=$DNS[0],`DNS2`=$DNS[1],`DNS3`=$DNS[2];");
 	// Берём id точки из таблицы base в любом случае (могут быть расхождения с mem_base)
-	$res = $db->query("SELECT id FROM ".BASE_TABLE." WHERE NoBSSID=$NoBSSID AND BSSID=$bssid AND BINARY ESSID=$essid AND BINARY WiFiKey=$key AND WPSPIN=$wps");
+	$res = $db->query("SELECT id FROM ".BASE_TABLE." WHERE NoBSSID=$NoBSSID AND BSSID=$bssid AND ESSID=$essid AND WiFiKey=$key AND BINARY ESSID=$essid AND BINARY WiFiKey=$key AND WPSPIN=$wps");
 	$row = $res->fetch_row();
 	$res->close();
 	$id = (int)$row[0];
@@ -524,7 +524,7 @@ function db_ap_exist($NoBSSID, $bssid, $essid, $key)
 	$essid = $db->real_escape_string($essid);
 	$key = $db->real_escape_string($key);
 	// Проверяем, есть ли эта точка в базе (по BSSID/ESSID/WiFiKey)
-	if ($res = QuerySql("SELECT `id` FROM BASE_TABLE WHERE `NoBSSID`=$NoBSSID AND `BSSID`=$bssid AND BINARY `ESSID`='$essid' AND BINARY `WiFiKey`='$key' LIMIT 1"))
+	if ($res = QuerySql("SELECT id FROM BASE_TABLE WHERE `NoBSSID`=$NoBSSID AND `BSSID`=$bssid AND `ESSID`='$essid' AND `WiFiKey`='$key' AND BINARY `ESSID`='$essid' AND BINARY `WiFiKey`='$key' LIMIT 1"))
 	{
 		$result = $res->num_rows;
 		$res->close();
@@ -540,7 +540,7 @@ function db_ap_checkempty($NoBSSID, $bssid, $essid, $sec, $wps)
 	$sec = str2sec($sec);
 	$wps = (($wps == '') ? 1 : (int)$wps);
 	// Проверяем, есть ли эта точка в базе (с непустым ключом)
-	if ($res = QuerySql("SELECT `id` FROM BASE_TABLE WHERE `NoBSSID`=$NoBSSID AND `BSSID`=$bssid AND BINARY `ESSID`='$essid' AND `Security`=$sec AND `WiFiKey`!='' AND `WPSPIN`=$wps LIMIT 1"))
+	if ($res = QuerySql("SELECT id FROM BASE_TABLE WHERE `NoBSSID`=$NoBSSID AND `BSSID`=$bssid AND `ESSID`='$essid' AND BINARY `ESSID`='$essid' AND `Security`=$sec AND `WiFiKey`!='' AND `WPSPIN`=$wps LIMIT 1"))
 	{
 		$result = $res->num_rows;
 		$res->close();