OpencachingDeutschland / oc-server3

htdocs/api/coord.ch/newest.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $bFirstRow = true;
 
@@ -52,5 +52,5 @@ 
 // renamed function from "str_getcsv" to avoid collision with PHP 5.3 str_getcsv()
 function strGetCsv($str)
 {
-    return '"' . mb_ereg_replace('"', '\"', $str) . '"';
+    return '"'.mb_ereg_replace('"', '\"', $str).'"';
 }

htdocs/removedesc.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/common.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -32,7 +32,7 @@ 
         tpl_set_var(
             'target',
             htmlspecialchars(
-                'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang),
+                'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang),
                 ENT_COMPAT,
                 'UTF-8'
             )
@@ -56,7 +56,7 @@ 
                 if (mysql_num_rows($desc_rs) == 1) {
                     $desc_record = sql_fetch_array($desc_rs);
                     mysql_free_result($desc_rs);
-                    require $stylepath . '/removedesc.inc.php';
+                    require $stylepath.'/removedesc.inc.php';
 
                     if ($desc_record['node'] != $oc_nodeid) {
                         tpl_errorMsg('removedesc', $error_wrong_node);
@@ -70,7 +70,7 @@ 
                         // do not use slave server for the next time ...
                         db_slave_exclude();
 
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                         exit;
                     } else {
                         //commit the removement

htdocs/translate.php

Spacing +48 added lines, -48 removed lines

@@ -5,9 +5,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/translate.class.php';
-require_once __DIR__ . '/lib2/translationHandler.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/translate.class.php';
+require_once __DIR__.'/lib2/translationHandler.class.php';
 
 /* config section
  */
@@ -249,11 +249,11 @@ 
 {
     global $opt;
 
-    if (!file_exists($opt['rootpath'] . '../sql/static-data/data.sql')) {
+    if (!file_exists($opt['rootpath'].'../sql/static-data/data.sql')) {
         return '';
     }
 
-    $content = file_get_contents($opt['rootpath'] . '../sql/static-data/data.sql');
+    $content = file_get_contents($opt['rootpath'].'../sql/static-data/data.sql');
 
     // at the end is an INSERT of the current checksum
     // to calculate this checksum, we have to trim the end before that statement and the linefeed before
@@ -282,7 +282,7 @@ 
     sql("DELETE FROM `sys_trans_text` WHERE `trans_id`='&1'", $id);
     sql("DELETE FROM `sys_trans_ref` WHERE `trans_id`='&1'", $id);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function edit()
@@ -311,7 +311,7 @@ 
             );
         }
         sql_free_result($rs);
-        $tpl->redirect('translate.php?translang=' . $translang . '&action=edit&id=' . $id);
+        $tpl->redirect('translate.php?translang='.$translang.'&action=edit&id='.$id);
     } else {
         if (isset($_REQUEST['submit'])) {
             $transText = isset($_REQUEST['transText']) ? $_REQUEST['transText'] : '';
@@ -347,14 +347,14 @@ 
 
     // built sql string to search for texts with little difference (levensthein() would be better, but not available in MYSQL)
     $sWhereSql =
-        "SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans`.`text`)
-         OR SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans_text`.`text`)";
+        "SOUNDEX('".sql_escape($r['text'])."')=SOUNDEX(`sys_trans`.`text`)
+         OR SOUNDEX('" . sql_escape($r['text'])."')=SOUNDEX(`sys_trans_text`.`text`)";
 
     $trans = sql(
         "SELECT DISTINCT `sys_trans`.`id`, `sys_trans`.`text`
          FROM `sys_trans`
          INNER JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
-         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql . ")",
+         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql.")",
         $id
     );
     $tpl->assign_rs('trans', $trans);
@@ -387,7 +387,7 @@ 
 
     $translationHandler->createMessageFiles();
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function unlinkFiles($relbasedir, $ext)
@@ -398,12 +398,12 @@ 
         $relbasedir .= '/';
     }
 
-    if ($opt['rootpath'] . $relbasedir) {
-        if ($dh = opendir($opt['rootpath'] . $relbasedir)) {
+    if ($opt['rootpath'].$relbasedir) {
+        if ($dh = opendir($opt['rootpath'].$relbasedir)) {
             while (($file = readdir($dh)) !== false) {
-                if ($file != '.' && $file != '..' && is_file($opt['rootpath'] . $relbasedir . $file)) {
-                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.' . $ext) {
-                        unlink($opt['rootpath'] . $relbasedir . $file);
+                if ($file != '.' && $file != '..' && is_file($opt['rootpath'].$relbasedir.$file)) {
+                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.'.$ext) {
+                        unlink($opt['rootpath'].$relbasedir.$file);
                     }
                 }
             }
@@ -478,7 +478,7 @@ 
     $lastId = sql_value("SELECT MAX(`id`) FROM `sys_trans`", 0);
     sql("ALTER TABLE `sys_trans` AUTO_INCREMENT = &1", $lastId + 1);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function useId($freeId)
@@ -500,9 +500,9 @@ 
 
     foreach ($transIdCols as $col) {
         sql(
-            "UPDATE `" . $col['table'] . "`
-             SET `" . $col['trans_id'] . "`='&1'
-             WHERE `" . $col['trans_id'] . "`='&2'",
+            "UPDATE `".$col['table']."`
+             SET `" . $col['trans_id']."`='&1'
+             WHERE `" . $col['trans_id']."`='&2'",
             $newId,
             $oldId
         );
@@ -513,9 +513,9 @@ 
 {
     global $opt, $tpl, $translang;
 
-    $structure = enumSqlFiles($opt['rootpath'] . '../sql/tables');
+    $structure = enumSqlFiles($opt['rootpath'].'../sql/tables');
     foreach ($structure AS $sTable) {
-        sql_export_structure_to_file($opt['rootpath'] . '../sql/tables/' . $sTable . '.sql', $sTable);
+        sql_export_structure_to_file($opt['rootpath'].'../sql/tables/'.$sTable.'.sql', $sTable);
     }
 
     // static data tables
@@ -551,21 +551,21 @@ 
     $stab[] = 'towns';
     $stab[] = 'watches_waitingtypes';
 
-    sql_export_tables_to_file($opt['rootpath'] . '../sql/static-data/data.sql', $stab);
+    sql_export_tables_to_file($opt['rootpath'].'../sql/static-data/data.sql', $stab);
 
     $checksum = calcDataSqlChecksum(false);
-    $f = fopen($opt['rootpath'] . '../sql/static-data/data.sql', 'a');
+    $f = fopen($opt['rootpath'].'../sql/static-data/data.sql', 'a');
     fwrite(
         $f,
         "INSERT INTO `sysconfig` (`name`, `value`)"
-        . " VALUES ('datasql_checksum', '" . sql_escape($checksum) . "')"
-        . " ON DUPLICATE KEY UPDATE `value`='" . sql_escape($checksum) . "';\n"
+        . " VALUES ('datasql_checksum', '".sql_escape($checksum)."')"
+        . " ON DUPLICATE KEY UPDATE `value`='".sql_escape($checksum)."';\n"
     );
     fclose($f);
 
     setSysConfig('datasql_checksum', $checksum);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function enumSqlFiles($dir)
@@ -594,9 +594,9 @@ 
         $hDir = opendir($dir);
         if ($hDir !== false) {
             while (($file = readdir($hDir)) !== false) {
-                if (is_file($dir . '/' . $file)) {
+                if (is_file($dir.'/'.$file)) {
                     if ((substr($file, - 4) == '.tpl') || (substr($file, - 4) == '.php')) {
-                        $files[] = $dir . '/' . $file;
+                        $files[] = $dir.'/'.$file;
                     }
                 }
             }
@@ -690,7 +690,7 @@ 
         $writer->writeAttribute('id', $r['id']);
 
         $writer->writeElement('code', $r['text']);
-        for ($n = 0; $n < count($lang); $n ++) {
+        for ($n = 0; $n < count($lang); $n++) {
             $writer->writeElement(
                 $lang[$n],
                 sql_value(
@@ -712,9 +712,9 @@ 
         while ($rUsage = sql_fetch_assoc($rsUsage)) {
             $line = '';
             if ($rUsage['line'] != 0) {
-                $line = ' (' . $rUsage['line'] . ')';
+                $line = ' ('.$rUsage['line'].')';
             }
-            $writer->writeElement('usage', $rUsage['resource_name'] . $line);
+            $writer->writeElement('usage', $rUsage['resource_name'].$line);
         }
         sql_free_result($rsUsage);
 
@@ -738,7 +738,7 @@ 
 
     $scanlang = [];
     foreach ($opt['locale'] AS $k => $v) {
-        if (isset($_REQUEST['lang' . $k]) && ($_REQUEST['lang' . $k] == '1')) {
+        if (isset($_REQUEST['lang'.$k]) && ($_REQUEST['lang'.$k] == '1')) {
             $scanlang[] = $k;
         }
     }
@@ -818,15 +818,15 @@ 
 
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
 
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
-        if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
-            $sCode = base64_decode($_REQUEST['code' . $nIndex]);
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
+        if (isset($_REQUEST['useitem'.$nIndex]) && ($_REQUEST['useitem'.$nIndex] == '1')) {
+            $sCode = base64_decode($_REQUEST['code'.$nIndex]);
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
 
             if ($transId != 0) {
                 foreach ($opt['locale'] AS $k => $v) {
-                    if (isset($_REQUEST[$k . $nIndex . 'new'])) {
-                        $sText = base64_decode($_REQUEST[$k . $nIndex . 'new']);
+                    if (isset($_REQUEST[$k.$nIndex.'new'])) {
+                        $sText = base64_decode($_REQUEST[$k.$nIndex.'new']);
 
                         sql(
                             "INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`)
@@ -842,7 +842,7 @@ 
         }
     }
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function textexport($translang, $all)
@@ -872,9 +872,9 @@ 
             $translang
         );
         if (($all) || (mb_strlen($translated) == 0)) {
-            $thisline = $r['id'] . "\r\n";
-            $thisline .= $r['text'] . "\r\n";
-            $thisline .= $translated . "\r\n";
+            $thisline = $r['id']."\r\n";
+            $thisline .= $r['text']."\r\n";
+            $thisline .= $translated."\r\n";
             $thisline .= "\r\n";
             echo($thisline);
         }
@@ -1010,8 +1010,8 @@ 
     }
 
     while (($file = readdir($hDir)) !== false) {
-        if ($file != '.' && $file != '..' && is_dir($basedir . $file)) {
-            addClassesDirectoriesToDirlist($basedir . $file);
+        if ($file != '.' && $file != '..' && is_dir($basedir.$file)) {
+            addClassesDirectoriesToDirlist($basedir.$file);
         }
     }
     closedir($hDir);
@@ -1026,9 +1026,9 @@ 
         if (!isset($col['verify']) || $col['verify']) {
             $rs = sql(
                 "SELECT
-                    `" . $col['text'] . "` `text`,
-                    `" . $col['trans_id'] . "` `trans_id`
-                 FROM `" . $col['table'] . "`"
+                    `" . $col['text']."` `text`,
+                    `" . $col['trans_id']."` `trans_id`
+                 FROM `" . $col['table']."`"
             );
             while ($r = sql_fetch_assoc($rs)) {
                 $st = sql_value(
@@ -1048,7 +1048,7 @@ 
                 if ($en != $r['text'] || $st != $r['text']) {
                     $inconsistencies[] = [
                         'id' => $r['trans_id'],
-                        'col' => $col['table'] . '.' . $col['text'],
+                        'col' => $col['table'].'.'.$col['text'],
                         'org_text' => $r['text'],
                         'sys_trans' => $st,
                         'en_text' => $en,

htdocs/util2/stats/rank.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $n = 1;
 $rs = sql('SELECT `user`.`username`, `stat_user`.`found`
@@ -18,7 +18,7 @@ 
            ORDER BY `stat_user`.`found` DESC
               LIMIT 100');
 while ($r = sql_fetch_assoc($rs)) {
-    echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
-    $n ++;
+    echo $n.' '.$r['username'].': '.$r['found']."\n";
+    $n++;
 }
 sql_free_result($rs);

htdocs/util2/stats/owner.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 echo "<h2>Top-Owner</h2>\n";
 
@@ -28,7 +28,7 @@ 
         FROM `caches`
         LEFT JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
         LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
-        WHERE status=1 AND " . $condition . "
+        WHERE status=1 AND " . $condition."
         GROUP BY `caches`.`user_id`
         HAVING COUNT(*) >= $limit
         ORDER BY COUNT(*) DESC"
@@ -36,7 +36,7 @@ 
 
     $n = 1;
     while ($r = sql_fetch_assoc($rs)) {
-        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;" . ($n ++) . ".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>" . $r['count'] . "</td><td>&nbsp;&nbsp;" . $r['name'] . "</td></tr>\n";
+        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;".($n++).".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>".$r['count']."</td><td>&nbsp;&nbsp;".$r['name']."</td></tr>\n";
     }
     sql_free_result($rs);
 

htdocs/util2/license/process-old-disabled-users.php

Spacing +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/user.class.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/logic/user.class.php';
 
 $login->admin = ADMIN_USER;
 
@@ -24,7 +24,7 @@ 
 
 $n = 0;
 while ($r = sql_fetch_assoc($rs)) {
-    echo "purging content of user '" . $r['username'] . "'\n";
+    echo "purging content of user '".$r['username']."'\n";
 
     $user = new user($r['user_id']);
     $result = $user->disduelicense(true);
@@ -32,7 +32,7 @@ 
         die($result);
     }
 
-    ++ $n;
+    ++$n;
 }
 sql_free_result($rs);
 

htdocs/util2/gns/gns_import.php

Spacing +26 added lines, -26 removed lines

@@ -44,7 +44,7 @@ 
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt++ == 0) {// skip first line
             continue;
         }
 
@@ -52,31 +52,31 @@ 
 
         sql(
             "INSERT IGNORE INTO gns_locations SET
-                    rc = '" . sql_escape($gns[0]) . "',
-                    ufi = '" . sql_escape($gns[1]) . "',
-                    uni = '" . sql_escape($gns[2]) . "',
-                    lat = '" . sql_escape($gns[3]) . "',
-                    lon = '" . sql_escape($gns[4]) . "',
-                    dms_lat = '" . sql_escape($gns[5]) . "',
-                    dms_lon = '" . sql_escape($gns[6]) . "',
-                    utm = '" . sql_escape($gns[7]) . "',
-                    jog = '" . sql_escape($gns[8]) . "',
-                    fc = '" . sql_escape($gns[9]) . "',
-                    dsg = '" . sql_escape($gns[10]) . "',
-                    pc = '" . sql_escape($gns[11]) . "',
-                    cc1 = '" . sql_escape($gns[12]) . "',
-                    adm1 = '" . sql_escape($gns[13]) . "',
-                    adm2 = _utf8'" . sql_escape($gns[14]) . "',
-                    dim = '" . sql_escape($gns[15]) . "',
-                    cc2 = '" . sql_escape($gns[16]) . "',
-                    nt = '" . sql_escape($gns[17]) . "',
-                    lc = '" . sql_escape($gns[18]) . "',
-                    SHORT_FORM = _utf8'" . sql_escape($gns[19]) . "',
-                    GENERIC = _utf8'" . sql_escape($gns[20]) . "',
-                    SORT_NAME = _utf8'" . sql_escape($gns[21]) . "',
-                    FULL_NAME = _utf8'" . sql_escape($gns[22]) . "',
-                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23]) . "',
-                    MOD_DATE = '" . sql_escape($gns[24]) . "'"
+                    rc = '" . sql_escape($gns[0])."',
+                    ufi = '" . sql_escape($gns[1])."',
+                    uni = '" . sql_escape($gns[2])."',
+                    lat = '" . sql_escape($gns[3])."',
+                    lon = '" . sql_escape($gns[4])."',
+                    dms_lat = '" . sql_escape($gns[5])."',
+                    dms_lon = '" . sql_escape($gns[6])."',
+                    utm = '" . sql_escape($gns[7])."',
+                    jog = '" . sql_escape($gns[8])."',
+                    fc = '" . sql_escape($gns[9])."',
+                    dsg = '" . sql_escape($gns[10])."',
+                    pc = '" . sql_escape($gns[11])."',
+                    cc1 = '" . sql_escape($gns[12])."',
+                    adm1 = '" . sql_escape($gns[13])."',
+                    adm2 = _utf8'" . sql_escape($gns[14])."',
+                    dim = '" . sql_escape($gns[15])."',
+                    cc2 = '" . sql_escape($gns[16])."',
+                    nt = '" . sql_escape($gns[17])."',
+                    lc = '" . sql_escape($gns[18])."',
+                    SHORT_FORM = _utf8'" . sql_escape($gns[19])."',
+                    GENERIC = _utf8'" . sql_escape($gns[20])."',
+                    SORT_NAME = _utf8'" . sql_escape($gns[21])."',
+                    FULL_NAME = _utf8'" . sql_escape($gns[22])."',
+                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23])."',
+                    MOD_DATE = '" . sql_escape($gns[24])."'"
         );
     }
     fclose($file);

htdocs/util2/gns/mksearchindex.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
 
 
 $doubleindex['sankt'] = 'st';
@@ -27,7 +27,7 @@ 
     foreach ($simpletextsarray as $text) {
         if ($text != '') {
             if (nonalpha($text)) {
-                die($r['uni'] . ' ' . $text . "\n");// obsolete for the same reason as above
+                die($r['uni'].' '.$text."\n"); // obsolete for the same reason as above
             }
 
             $simpletext = search_text2simple($text);
@@ -59,7 +59,7 @@ 
 
 function nonalpha($str)
 {
-    for ($i = 0; $i < mb_strlen($str); $i ++) {
+    for ($i = 0; $i < mb_strlen($str); $i++) {
         if (!((ord(mb_substr($str, $i, 1)) >= ord('a')) && (ord(mb_substr($str, $i, 1)) <= ord('z')))) {
             return true;
         }

htdocs/util2/gns/mkadmtxt.php

Spacing +8 added lines, -8 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
 
 
 $rsLocations = sql("SELECT `uni`, `lat`, `lon`, `rc`, `cc1`, `adm1` FROM `gns_locations` WHERE `dsg` LIKE 'PPL%'");
@@ -22,7 +22,7 @@ 
     $maxlon = geomath::getMaxLon($rLocations['lon'], $rLocations['lat'], 10, 1);
 
     // den nächsgelegenen Ort in den geodb ermitteln
-    $sql = 'SELECT ' . geomath::getSqlDistanceFormula(
+    $sql = 'SELECT '.geomath::getSqlDistanceFormula(
             $rLocations['lon'],
             $rLocations['lat'],
             10,
@@ -30,13 +30,13 @@ 
             'lon',
             'lat',
             'geodb_coordinates'
-        ) . ' `distance`,
+        ).' `distance`,
                             `geodb_coordinates`.`loc_id` `loc_id`
                       FROM `geodb_coordinates`
-                      WHERE `lon` > ' . $minlon . ' AND
-                            `lon` < ' . $maxlon . ' AND
-                            `lat` > ' . $minlat . ' AND
-                            `lat` < ' . $maxlat . '
+                      WHERE `lon` > ' . $minlon.' AND
+                            `lon` < ' . $maxlon.' AND
+                            `lat` > ' . $minlat.' AND
+                            `lat` < ' . $maxlat.'
                       HAVING `distance` < 10
                       ORDER BY `distance` ASC
                       LIMIT 1';