OpencachingDeutschland / oc-server3

htdocs/lib2/logic/const.inc.php

Spacing +21 added lines, -21 removed lines

@@ -16,28 +16,28 @@ 
 define('RE_TYPE_FLOAT', 5);
 define('RE_TYPE_DOUBLE', 6);
 
-define('RE_INSERT_NOTHING', 0);       //
-define('RE_INSERT_OVERWRITE', 1);     // ignore given values and use function
-define('RE_INSERT_IGNORE', 2);        // dont use this column on insert
+define('RE_INSERT_NOTHING', 0); //
+define('RE_INSERT_OVERWRITE', 1); // ignore given values and use function
+define('RE_INSERT_IGNORE', 2); // dont use this column on insert
 define('RE_INSERT_AUTOINCREMENT', 4); // column is an auto increment column
-define('RE_INSERT_AUTOUUID', 8);      // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
-define('RE_INSERT_NOW', 16);          // NOW()
+define('RE_INSERT_AUTOUUID', 8); // if empty, UUID is generated by before insert trigger (not supported for primary key fields)
+define('RE_INSERT_NOW', 16); // NOW()
 
 define('EUROPEAN_LETTERS', 'A-Za-zÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ');
 // ASCII + ISO-8859-1 0xC0..0xFF
-define('REGEX_USERNAME', '^[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#][' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{1,58}[' . EUROPEAN_LETTERS . '0-9\.\-_@=)(\/\\\&*+~#]$');
-define('REGEX_PASSWORD', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
-define('REGEX_LAST_NAME', '^[' . EUROPEAN_LETTERS . '][' . EUROPEAN_LETTERS . '0-9\.\- ]{0,58}[' . EUROPEAN_LETTERS . '0-9\.]$');
+define('REGEX_USERNAME', '^['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{1,58}['.EUROPEAN_LETTERS.'0-9\.\-_@=)(\/\\\&*+~#]$');
+define('REGEX_PASSWORD', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*+~#]{3,60}$');
+define('REGEX_LAST_NAME', '^['.EUROPEAN_LETTERS.']['.EUROPEAN_LETTERS.'0-9\.\- ]{0,58}['.EUROPEAN_LETTERS.'0-9\.]$');
 define('REGEX_FIRST_NAME', REGEX_LAST_NAME);
-define('REGEX_STATPIC_TEXT', '^[' . EUROPEAN_LETTERS . '0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
+define('REGEX_STATPIC_TEXT', '^['.EUROPEAN_LETTERS.'0-9\.\-_ @=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°\%]{0,30}$');
 
-define('ADMIN_TRANSLATE', 1);     // edit translation
-define('ADMIN_MAINTAINANCE', 2);  // check table etc.
-define('ADMIN_USER', 4);          // drop users, caches etc.
-define('ADMIN_NEWS', 8);          // obsolete / reserved
-define('ADMIN_RESTORE', 16);      // restore vandalized listings
-define('ADMIN_ROOT', 128 | 127);  // root + all previous rights
-define('ADMIN_LISTING', 1024);    // can edit any cache listings
+define('ADMIN_TRANSLATE', 1); // edit translation
+define('ADMIN_MAINTAINANCE', 2); // check table etc.
+define('ADMIN_USER', 4); // drop users, caches etc.
+define('ADMIN_NEWS', 8); // obsolete / reserved
+define('ADMIN_RESTORE', 16); // restore vandalized listings
+define('ADMIN_ROOT', 128 | 127); // root + all previous rights
+define('ADMIN_LISTING', 1024); // can edit any cache listings
 
 define('ATTRIB_SELECTED', 1);
 define('ATTRIB_UNSELECTED', 2);
@@ -79,11 +79,11 @@ 
 // ID 15 was temporarily used and is reserved, see commit dda7ef0. Continue with 16.
 
 // user.data_license values
-define('OLD_DATA_LICSENSE', 0);                       // before deadline
-define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1);      // declined license
-define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2);      // accepted new license on registration
-define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3);     // did not decline license until deadline
-define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4);     // could not accept/decline because disabled
+define('OLD_DATA_LICSENSE', 0); // before deadline
+define('NEW_DATA_LICENSE_ACTIVELY_DECLINED', 1); // declined license
+define('NEW_DATA_LICENSE_ACTIVELY_ACCEPTED', 2); // accepted new license on registration
+define('NEW_DATA_LICENSE_PASSIVELY_ACCEPTED', 3); // did not decline license until deadline
+define('NEW_DATA_LICENSE_PASSIVELY_DECLINED', 4); // could not accept/decline because disabled
 
 //picture upload/resize parameters
 define('PICTURE_QUALITY', 85);

htdocs/lib2/logic/getNew.class.php

Spacing +4 added lines, -4 removed lines

@@ -51,11 +51,11 @@ 
     public function rsForSmarty($type, $args = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Rs')) {
+        if (method_exists($this, strtolower($type).'Rs')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Rs'
+                    $type.'Rs'
                 ],
                 $args
             );
@@ -78,11 +78,11 @@ 
     public function feedForSmarty($type, $items = null, $url = null, $timeout = null, $includetext = null)
     {
         // check type
-        if (method_exists($this, strtolower($type) . 'Feed')) {
+        if (method_exists($this, strtolower($type).'Feed')) {
             return call_user_func(
                 [
                     $this,
-                    $type . 'Feed'
+                    $type.'Feed'
                 ],
                 $items,
                 $url,

htdocs/lib2/logic/cacheIcon.class.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
 
     public static function get($user_id, $cache_id, $cache_status, $cache_userid, $iconname)
     {
-        $iconname = mb_eregi_replace("cache/", "", $iconname);   // for old cache_type table contents
-        $iconext = "." . mb_eregi_replace("^.*\.", "", $iconname);
+        $iconname = mb_eregi_replace("cache/", "", $iconname); // for old cache_type table contents
+        $iconext = ".".mb_eregi_replace("^.*\.", "", $iconname);
         $iconname = mb_eregi_replace("\..*", "", $iconname);
 
         // add status
@@ -30,7 +30,7 @@ 
                 break;
             case 5:
                 $iconname .= "-s";
-                break;      // fix for RT ticket #3403
+                break; // fix for RT ticket #3403
             case 6:
                 $iconname .= "-a";
                 break;
@@ -65,7 +65,7 @@ 
             }
         }
 
-        return $iconname . $iconext;
+        return $iconname.$iconext;
     }
 
 }

htdocs/lib2/logic/coordinate.class.php

Spacing +61 added lines, -61 removed lines

@@ -31,15 +31,15 @@ 
     public function getDecimal()
     {
         if ($this->nLat < 0) {
-            $sLat = 'S ' . sprintf('%08.5f', - $this->nLat) . '°';
+            $sLat = 'S '.sprintf('%08.5f', - $this->nLat).'°';
         } else {
-            $sLat = 'N ' . sprintf('%08.5f', $this->nLat) . '°';
+            $sLat = 'N '.sprintf('%08.5f', $this->nLat).'°';
         }
 
         if ($this->nLon < 0) {
-            $sLon = 'W ' . sprintf('%09.5f', - $this->nLon) . '°';
+            $sLon = 'W '.sprintf('%09.5f', - $this->nLon).'°';
         } else {
-            $sLon = 'E ' . sprintf('%09.5f', $this->nLon) . '°';
+            $sLon = 'E '.sprintf('%09.5f', $this->nLon).'°';
         }
 
         return [
@@ -62,9 +62,9 @@ 
         $nLatDeg = floor($nLat);
         $nLatMin = ($nLat - $nLatDeg) * 60;
         if ($bLatN) {
-            $sLat = 'N ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'N '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         } else {
-            $sLat = 'S ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf($minute_format, $nLatMin) . '\'';
+            $sLat = 'S '.sprintf("%02d", $nLatDeg).'° '.sprintf($minute_format, $nLatMin).'\'';
         }
 
         // Ocprop: ([E|W].*?)&#039;
@@ -76,9 +76,9 @@ 
         $nLonDeg = floor($nLon);
         $nLonMin = ($nLon - $nLonDeg) * 60;
         if ($bLonE) {
-            $sLon = 'E ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'E '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         } else {
-            $sLon = 'W ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf($minute_format, $nLonMin) . '\'';
+            $sLon = 'W '.sprintf("%03d", $nLonDeg).'° '.sprintf($minute_format, $nLonMin).'\'';
         }
 
         return [
@@ -101,15 +101,15 @@ 
         $nLatMin = ($nLatMin - $nLatSec);
         $nLatSec = $nLatSec * 60;
         if ($bLatN) {
-            $sLat = 'N ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf("%02d", $nLatMin) . '\' ' . sprintf(
+            $sLat = 'N '.sprintf("%02d", $nLatDeg).'° '.sprintf("%02d", $nLatMin).'\' '.sprintf(
                     "%02d",
                     $nLatSec
-                ) . '\'\'';
+                ).'\'\'';
         } else {
-            $sLat = 'S ' . sprintf("%02d", $nLatDeg) . '° ' . sprintf("%02d", $nLatMin) . '\' ' . sprintf(
+            $sLat = 'S '.sprintf("%02d", $nLatDeg).'° '.sprintf("%02d", $nLatMin).'\' '.sprintf(
                     "%02d",
                     $nLatSec
-                ) . '\'\'';
+                ).'\'\'';
         }
 
         $nLon = $this->nLon;
@@ -123,15 +123,15 @@ 
         $nLonMin = ($nLonMin - $nLonSec);
         $nLonSec = $nLonSec * 60;
         if ($bLonE) {
-            $sLon = 'E ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf("%02d", $nLonMin) . '\' ' . sprintf(
+            $sLon = 'E '.sprintf("%03d", $nLonDeg).'° '.sprintf("%02d", $nLonMin).'\' '.sprintf(
                     "%02d",
                     $nLonSec
-                ) . '\'\'';
+                ).'\'\'';
         } else {
-            $sLon = 'W ' . sprintf("%03d", $nLonDeg) . '° ' . sprintf("%02d", $nLonMin) . '\' ' . sprintf(
+            $sLon = 'W '.sprintf("%03d", $nLonDeg).'° '.sprintf("%02d", $nLonMin).'\' '.sprintf(
                     "%02d",
                     $nLonSec
-                ) . '\'\'';
+                ).'\'\'';
         }
 
         return [
@@ -162,8 +162,8 @@ 
             return [
                 'zone' => "",
                 'letter' => "",
-                'north' => 'N ' . 0,
-                'east' => 'E ' . 0
+                'north' => 'N '.0,
+                'east' => 'E '.0
             ];
         }
         if ($this->nLon <= - 180 || $this->nLon > 180 || $this->nLat <= - 80 || $this->nLat >= 84) {
@@ -175,8 +175,8 @@ 
                 0
             ];
         }
-        $lw = (float) $this->nLon;
-        $bw = (float) $this->nLat;
+        $lw = (float)$this->nLon;
+        $bw = (float)$this->nLat;
 
         //WGS84 Datum
         //Große Halbachse a und Abplattung f
@@ -195,9 +195,9 @@ 
 
         //Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         //Längenzone lz und Breitenzone (Band) bz
         $lzn = intval(($lw + 180) / 6) + 1;
@@ -221,9 +221,9 @@ 
 
         $lz = "$lzn";
         if ($lzn < 10) {
-            $lz = "0" . $lzn;
+            $lz = "0".$lzn;
         }
-        $bd = (int) (1 + ($bw + 80) / 8);
+        $bd = (int)(1 + ($bw + 80) / 8);
         $bz = substr($b_sel, $bd - 1, 1);
 
         //Geographische Breite in Radianten br
@@ -268,29 +268,29 @@ 
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
 
-        $nk = $nw - (int) $nw;
+        $nk = $nw - (int)$nw;
         if ($nk < 0.5) {
-            $nw = '' . (int) $nw;
+            $nw = ''.(int)$nw;
         } else {
-            $nw = '' . ((int) $nw + 1);
+            $nw = ''.((int)$nw + 1);
         }
 
         while (strlen($nw) < 7) {
-            $nw = '0' . $nw;
+            $nw = '0'.$nw;
         }
 
-        $nk = $ew - (int) $ew;
+        $nk = $ew - (int)$ew;
         if ($nk < 0.5) {
-            $ew = '0' . (int) $ew;
+            $ew = '0'.(int)$ew;
         } else {
-            $ew = '0' . intval($ew + 1);
+            $ew = '0'.intval($ew + 1);
         }
 
         return [
             'zone' => $lz,
             'letter' => $bz,
-            'north' => 'N ' . floor($nw),
-            'east' => 'E ' . floor($ew)
+            'north' => 'N '.floor($nw),
+            'east' => 'E '.floor($ew)
         ];
     }
 
@@ -300,7 +300,7 @@ 
         $pdResult = $this->wgs2pot($this->nLat, $this->nLon);
         $result = $this->geo2gk($pdResult[1], $pdResult[0]);
 
-        return 'R ' . floor($result[0]) . ' H ' . floor($result[1]);
+        return 'R '.floor($result[0]).' H '.floor($result[1]);
     }
 
     public function wgs2pot($bw, $lw)
@@ -331,8 +331,8 @@ 
                 0
             ];
         }
-        $lw = (float) $lw;
-        $bw = (float) $bw;
+        $lw = (float)$lw;
+        $bw = (float)$bw;
 
         // Quellsystem WGS 84 Datum
         // Große Halbachse a und Abplattung fq
@@ -410,8 +410,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -429,9 +429,9 @@ 
 
         // Koeffizienten zur Berechnung der Meridianbogenlänge
         $e0 = $c * (pi() / 180) * (1 - 3 * $ex2 / 4 + 45 * $ex4 / 64 - 175 * $ex6 / 256 + 11025 * $ex8 / 16384);
-        $e2 = $c * (- 3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
+        $e2 = $c * (-3 * $ex2 / 8 + 15 * $ex4 / 32 - 525 * $ex6 / 1024 + 2205 * $ex8 / 4096);
         $e4 = $c * (15 * $ex4 / 256 - 105 * $ex6 / 1024 + 2205 * $ex8 / 16384);
-        $e6 = $c * (- 35 * $ex6 / 3072 + 315 * $ex8 / 12288);
+        $e6 = $c * (-35 * $ex6 / 3072 + 315 * $ex8 / 12288);
 
         // Breite in Radianten
         $br = $bp * pi() / 180;
@@ -469,18 +469,18 @@ 
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
 
-        $nk = $hw - (int) $hw;
+        $nk = $hw - (int)$hw;
         if ($nk < 0.5) {
-            $hw = (int) $hw;
+            $hw = (int)$hw;
         } else {
-            $hw = ((int) $hw) + 1;
+            $hw = ((int)$hw) + 1;
         }
 
-        $nk = $rw - (int) $rw;
+        $nk = $rw - (int)$rw;
         if ($nk < 0.5) {
-            $rw = (int) $rw;
+            $rw = (int)$rw;
         } else {
-            $rw = (int) ($rw + 1);
+            $rw = (int)($rw + 1);
         }
 
         return [
@@ -499,8 +499,8 @@ 
         $lat_base = 52.15517440;
         $lon_base = 5.38720621;
 
-        for ($i = 0; $i <= 6; $i ++) {
-            for ($j = 0; $j <= 5; $j ++) {
+        for ($i = 0; $i <= 6; $i++) {
+            for ($j = 0; $j <= 5; $j++) {
                 $rpq[$i][$j] = 0;
                 $spq[$i][$j] = 0;
             }
@@ -535,8 +535,8 @@ 
         $xOrigin = 0;
         $yOrigin = 0;
 
-        for ($q = 0; $q <= 5; $q ++) {
-            for ($p = 0; $p <= 6; $p ++) {
+        for ($q = 0; $q <= 5; $q++) {
+            for ($p = 0; $p <= 6; $p++) {
                 $xOrigin = $xOrigin + ($rpq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
                 $yOrigin = $yOrigin + ($spq[$p][$q] * ((pow($dlat, $p)) * (pow($dlon, $q))));
             }
@@ -544,7 +544,7 @@ 
         $xOrigin = $xOrigin + $rdx_base;
         $yOrigin = $yOrigin + $rdy_base;
 
-        return 'X ' . floor($xOrigin) . ' Y ' . floor($yOrigin);
+        return 'X '.floor($xOrigin).' Y '.floor($yOrigin);
     }
 
     // returns string
@@ -604,13 +604,13 @@ 
 
     public static function parseRequestLat($name)
     {
-        if (!isset($_REQUEST[$name . 'NS']) || !isset($_REQUEST[$name . 'Lat']) || !isset($_REQUEST[$name . 'LatMin'])) {
+        if (!isset($_REQUEST[$name.'NS']) || !isset($_REQUEST[$name.'Lat']) || !isset($_REQUEST[$name.'LatMin'])) {
             return false;
         }
 
-        $coordNS = $_REQUEST[$name . 'NS'];
-        $coordLat = $_REQUEST[$name . 'Lat'] + 0;
-        $coordLatMin = str_replace(',', '.', $_REQUEST[$name . 'LatMin']) + 0;
+        $coordNS = $_REQUEST[$name.'NS'];
+        $coordLat = $_REQUEST[$name.'Lat'] + 0;
+        $coordLatMin = str_replace(',', '.', $_REQUEST[$name.'LatMin']) + 0;
 
         $lat = $coordLat + $coordLatMin / 60;
         if ($coordNS == 'S') {
@@ -622,13 +622,13 @@ 
 
     public static function parseRequestLon($name)
     {
-        if (!isset($_REQUEST[$name . 'EW']) || !isset($_REQUEST[$name . 'Lon']) || !isset($_REQUEST[$name . 'LonMin'])) {
+        if (!isset($_REQUEST[$name.'EW']) || !isset($_REQUEST[$name.'Lon']) || !isset($_REQUEST[$name.'LonMin'])) {
             return false;
         }
 
-        $coordEW = $_REQUEST[$name . 'EW'];
-        $coordLon = $_REQUEST[$name . 'Lon'] + 0;
-        $coordLonMin = str_replace(',', '.', $_REQUEST[$name . 'LonMin']) + 0;
+        $coordEW = $_REQUEST[$name.'EW'];
+        $coordLon = $_REQUEST[$name.'Lon'] + 0;
+        $coordLonMin = str_replace(',', '.', $_REQUEST[$name.'LonMin']) + 0;
 
         $lon = $coordLon + $coordLonMin / 60;
         if ($coordEW == 'W') {
@@ -656,8 +656,8 @@ 
             [
                 'http' => [
                     'method' => 'POST',
-                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n" .
-                        "Content-Length: " . strlen($params_str) . "\r\n",
+                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n".
+                        "Content-Length: ".strlen($params_str)."\r\n",
                     'content' => $params_str,
                 ],
             ]

htdocs/lib2/logic/data-license.inc.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 
             $ltext = "© ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewprofile.php?userid=" . $userid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewprofile.php?userid=".$userid."' target='_blank'>";
             }
             $ltext .= $username;
             if ($html) {
@@ -62,7 +62,7 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewcache.php?cacheid=" . $cacheid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewcache.php?cacheid=".$cacheid."' target='_blank'>";
             }
             $ltext .= $opt['page']['sitename'];
             if ($html) {
@@ -70,14 +70,14 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $lurl . "' target='_blank'>";
+                $ltext .= "<a href='".$lurl."' target='_blank'>";
             }
             $ltext .= "CC BY-NC-ND";
             if ($html) {
                 $ltext .= "</a>";
             }
             if ($for_cachedesc) {
-                $ltext .= ", " . $asof . " " . date($df);
+                $ltext .= ", ".$asof." ".date($df);
             }
         }
 

htdocs/lib2/logic/geomath.class.php

Spacing +3 added lines, -3 removed lines

@@ -179,12 +179,12 @@
         $b1_rad = (90 - $latFrom) * 3.14159 / 180;
         $l1_deg = $lonFrom;
 
-        $lonField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($lonField) . '`';
-        $latField = '`' . sql_escape_backtick($tableName) . '`.`' . sql_escape_backtick($latField) . '`';
+        $lonField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($lonField).'`';
+        $latField = '`'.sql_escape_backtick($tableName).'`.`'.sql_escape_backtick($latField).'`';
 
         $r = 6370 * $distanceMultiplier;
 
-        $retval = 'acos(cos(' . $b1_rad . ') * cos((90-' . $latField . ') * 3.14159 / 180) + sin(' . $b1_rad . ') * sin((90-' . $latField . ') * 3.14159 / 180) * cos((' . $l1_deg . '-' . $lonField . ') * 3.14159 / 180)) * ' . $r;
+        $retval = 'acos(cos('.$b1_rad.') * cos((90-'.$latField.') * 3.14159 / 180) + sin('.$b1_rad.') * sin((90-'.$latField.') * 3.14159 / 180) * cos(('.$l1_deg.'-'.$lonField.') * 3.14159 / 180)) * '.$r;
 
         return $retval;
     }

htdocs/lib2/logic/labels.inc.php

Spacing +9 added lines, -9 removed lines

@@ -6,11 +6,11 @@ 
  ***************************************************************************/
 
 // try to include cache file
-if (!file_exists($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php')) {
+if (!file_exists($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php')) {
     labels::CreateCacheFile();
 }
 
-require $opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php';
+require $opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php';
 
 class labels
 {
@@ -20,7 +20,7 @@ 
     {
         global $opt;
 
-        $f = fopen($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php', 'w');
+        $f = fopen($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php', 'w');
         fwrite($f, "<?php\n");
 
         $a = array();
@@ -42,7 +42,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_attrib", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_attrib", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -63,7 +63,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_size", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_size", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -84,7 +84,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_status", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_status", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -105,7 +105,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_type", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_type", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -126,7 +126,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("log_types", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("log_types", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $nLastGroup = 1;
         $a = array();
@@ -155,7 +155,7 @@ 
             $a[] = $r;
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("usercountrieslist", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("usercountrieslist", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         fwrite($f, "?>");
         fclose($f);

htdocs/lib2/logic/cachelog.class.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  *   add/remove etc. is executed instantly
  ***************************************************************************/
 
-require_once __DIR__ . '/logtypes.inc.php';
+require_once __DIR__.'/logtypes.inc.php';
 
 class cachelog
 {
@@ -355,7 +355,7 @@ 
         //     return array();
         // Logic Error - log types are still valid when no NEW logs are allowed for the cache.
         // (Would e.g. block admin logs and log-type restoring for locked caches.)
-        return get_cache_log_types($this->getCacheId(), $this->getType());  // depends on userid
+        return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid
     }
 
     public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText)

htdocs/lib2/logic/statpic.class.php

Spacing +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
         global $opt;
 
         // if data changed - delete statpic of user, if exists - will be recreated on next request
-        if (file_exists($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg')) {
-            unlink($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg');
+        if (file_exists($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg')) {
+            unlink($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg');
         }
     }
 }