Changeset 15621 for trunk/xmlrpc/BxDolXMLRPCSearch.php

Timestamp:

10/16/11 21:18:03 (7 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2679

File:

• trunk/xmlrpc/BxDolXMLRPCSearch.php (modified) (1 diff)

trunk/xmlrpc/BxDolXMLRPCSearch.php

@@ -54 +54 @@
         $sLng = (float)$sLng;
 
+        if ((!$sLat || !$sLng) && BxDolRequest::serviceExists('map_profiles', 'get_location')) {
+            $aLocation = BxDolService::call('map_profiles', 'get_location', array($iId, 0, false));
+            if ($aLocation && !empty($aLocation['lat']) && !empty($aLocation['lng'])) {
+                $sLat = $aLocation['lat'];
+                $sLng = $aLocation['lng'];
+            }
+        }
+
+        if (!$sLat || !$sLng)
+            return new xmlrpcval (array(), "array");
+
         $sWhere = '';
         $sJoin = '';
         $sLocation = '';
-        if ($sLat && $sLng)
-        {
-            $sDistance = ", (POW($sLat-`loc`.`lat`, 2)+POW($sLng-`loc`.`lng`, 2)) AS `distance`";
-            $sJoin .= " INNER JOIN `bx_map_profiles` AS `loc` ON  (`loc`.`id` = `Profiles`.`ID` AND `loc`.`failed` = 0) ";
-        }
+
+        $sDistance = ", (POW($sLat-`loc`.`lat`, 2)+POW($sLng-`loc`.`lng`, 2)) AS `distance`";
+        $sJoin .= " INNER JOIN `bx_map_profiles` AS `loc` ON  (`loc`.`id` = `Profiles`.`ID` AND `loc`.`failed` = 0) ";
+        
         if ($isWithPhotosOnly)
             $sWhere .= " AND `Avatar` ";