OpencachingDeutschland / oc-server3

htdocs/lib2/logic/user.class.php

Braces +4 added lines, -2 removed lines

@@ -1219,7 +1219,8 @@ 
         /*
          * check log or cache
          */
-        if ($object_type == OBJECT_CACHE) {// get filenames of the pictures of $this' caches
+        if ($object_type == OBJECT_CACHE) {
+// get filenames of the pictures of $this' caches
             $rs = sql(
                 "SELECT `pictures`.`url` " .
                 "FROM `pictures`,`caches` " .
@@ -1228,7 +1229,8 @@ 
                 OBJECT_CACHE,
                 $this->getUserId()
             );
-        } elseif ($object_type == OBJECT_CACHELOG) {// get filenames of the pictures of $this' logs
+        } elseif ($object_type == OBJECT_CACHELOG) {
+// get filenames of the pictures of $this' logs
             $rs = sql(
                 "SELECT `pictures`.`url` " .
                 "FROM `pictures`,`cache_logs` " .

htdocs/lib2/logic/coordinate.class.php

Spacing +53 added lines, -53 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 [
@@ -144,8 +144,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) {
@@ -157,8 +157,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
@@ -177,9 +177,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;
@@ -203,9 +203,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
@@ -250,29 +250,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)
         ];
     }
 
@@ -282,7 +282,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)
@@ -313,8 +313,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
@@ -392,8 +392,8 @@ 
                 0
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -411,9 +411,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;
@@ -451,18 +451,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 [
@@ -481,8 +481,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;
             }
@@ -517,8 +517,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))));
             }
@@ -526,7 +526,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
@@ -586,13 +586,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') {
@@ -604,13 +604,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') {
@@ -638,8 +638,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/common.inc.php

Indentation +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     ) {
         return 'https' . strstr($url, '://');
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
-                  == $opt['page']['absolute_https_url']
+                    == $opt['page']['absolute_https_url']
               && !$opt['page']['https']['active']
     ) {
         return 'http' . strstr($url, '://');

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  *  TODO: accept-language des Browser auswerten
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 function __autoload($class_name)
 {
@@ -20,8 +20,8 @@ 
         return;
     }
 
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
     if (file_exists($file1)) {
         require_once $file1;
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@ 
 mb_regex_encoding('UTF-8');
 
 // set options
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
+require_once $opt['rootpath'].'config2/settings.inc.php';
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
 
 foreach ($opt['page']['banned_user_agents'] as $ua) {
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@ 
     }
 }
 
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 configure_php();
 
-require $opt['rootpath'] . 'lib2/cookie.class.php';
+require $opt['rootpath'].'lib2/cookie.class.php';
 normalize_settings();
 set_language();
 set_usercountry();
@@ -85,30 +85,30 @@ 
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 } else {
     $opt['template']['style'] = $opt['template']['default']['style'];
 }
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
 
 check_useragent();
 
 /* setup smarty
  *
  */
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
 $tpl = new OcSmarty();
 
 // include all we need
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/login.class.php';
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
+require_once $opt['rootpath'].'lib2/error.inc.php';
+require_once $opt['rootpath'].'lib2/util.inc.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/login.class.php';
+require_once $opt['rootpath'].'lib2/menu.class.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
 
 // apply post configuration
@@ -123,7 +123,7 @@ 
     $login->userid > 0 &&
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
 ) {
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
     exit;
 }
 
@@ -149,7 +149,7 @@ 
 
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
         $opt['logic']['cachemaps']['wmsurl'] =
-            $opt['page']['protocol'] . strstr($opt['logic']['cachemaps']['wmsurl'], '://');
+            $opt['page']['protocol'].strstr($opt['logic']['cachemaps']['wmsurl'], '://');
     }
 }
 
@@ -234,7 +234,7 @@ 
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
     }
 
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -275,12 +275,12 @@ 
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
         && $opt['page']['https']['active']
     ) {
-        return 'https' . strstr($url, '://');
+        return 'https'.strstr($url, '://');
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
                   == $opt['page']['absolute_https_url']
               && !$opt['page']['https']['active']
     ) {
-        return 'http' . strstr($url, '://');
+        return 'http'.strstr($url, '://');
     } else {
         return $url;
     }

htdocs/lib2/db.inc.php

Spacing +40 added lines, -40 removed lines

@@ -185,10 +185,10 @@ 
         // & escaped?
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 1) {
-            $nextarg ++;
+            $nextarg++;
         } else {
             $nextchar = substr($sql, $nextarg + 1, 1);
             if (is_numeric($nextchar)) {
@@ -199,7 +199,7 @@ 
                 while (preg_match('/^[0-9]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -225,13 +225,13 @@ 
                         // strip apostroph and insert NULL
                         $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1);
                         $filtered_sql .= 'NULL';
-                        $sqlpos ++;
+                        $sqlpos++;
                     } else {
                         $filtered_sql .= 'NULL';
                     }
                 }
 
-                $sqlpos ++;
+                $sqlpos++;
             } else {
                 $arglength = 0;
                 $arg = '';
@@ -241,7 +241,7 @@ 
                 while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) {
                     $arg .= $nextchar;
 
-                    $arglength ++;
+                    $arglength++;
                     $nextchar = substr($sql, $nextarg + $arglength + 1, 1);
                 }
 
@@ -263,7 +263,7 @@ 
                         $filtered_sql .= '`';
                     }
 
-                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']) . '`.`' . sql_escape_backtick($db['temptables'][$arg]);
+                    $filtered_sql .= sql_escape_backtick($opt['db']['placeholder']['tmpdb']).'`.`'.sql_escape_backtick($db['temptables'][$arg]);
 
                     if (substr($sql, $nextarg + $arglength + 1, 1) != '`') {
                         $filtered_sql .= '`';
@@ -288,12 +288,12 @@ 
         $escapesCount = 0;
         while ((($nextarg - $escapesCount - 1) > 0)
             && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) {
-            $escapesCount ++;
+            $escapesCount++;
         }
         if (($escapesCount % 2) == 0) {
             // strip escapes of &
-            $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2);
-            $nextarg --;
+            $filtered_sql = substr($filtered_sql, 0, $nextarg).'&'.substr($filtered_sql, $nextarg + 2);
+            $nextarg--;
         }
 
         $nextarg = strpos($filtered_sql, '\&', $nextarg + 2);
@@ -310,7 +310,7 @@ 
     */
 
     if (isset($db['debug']) && ($db['debug'] == true)) {
-        require_once $opt['rootpath'] . 'lib2/sqldebugger.class.php';
+        require_once $opt['rootpath'].'lib2/sqldebugger.class.php';
         $result = $sqldebugger->execute($filtered_sql, $dblink, ($dblink === $db['dblink_slave']), $db['slave_server']);
         if ($result === false) {
             sql_error($filtered_sql);
@@ -318,7 +318,7 @@ 
     } else {
         // measure time
         if ($opt['db']['warn']['time'] > 0) {
-            require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+            require_once $opt['rootpath'].'lib2/bench.inc.php';
             $cSqlExecution = new Cbench;
             $cSqlExecution->start();
         }
@@ -332,8 +332,8 @@ 
             $cSqlExecution->stop();
 
             if ($cSqlExecution->diff() > $opt['db']['warn']['time']) {
-                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n" . $_SERVER['HTTP_USER_AGENT'] : "";
-                sql_warn("execution took " . $cSqlExecution->diff() . " seconds" . $ua);
+                $ua = isset($_SERVER['HTTP_USER_AGENT']) ? "\r\n".$_SERVER['HTTP_USER_AGENT'] : "";
+                sql_warn("execution took ".$cSqlExecution->diff()." seconds".$ua);
             }
         }
     }
@@ -774,7 +774,7 @@ 
     }
 
     if ($db['dblink'] !== false) {
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink']) . "'", $db['dblink']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink'])."'", $db['dblink']);
 
         //database connection established ... set the used database
         if (@mysql_select_db($opt['db']['placeholder']['db'], $db['dblink']) == false) {
@@ -837,7 +837,7 @@ 
         AND `online`= 1
         AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1')
         ORDER BY `w` DESC LIMIT 1",
-        - 1,
+        -1,
         $nMaxTimeDiff
     );
 
@@ -898,7 +898,7 @@ 
             sql_error();
         }
 
-        mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
+        mysql_query("SET NAMES '".mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave'])."'", $db['dblink_slave']);
 
         // initialize temp tables on slave server
         $rs = sqlf_slave("SELECT `threadid`, `name` FROM `sys_temptables` WHERE `threadid`='&1'", mysql_thread_id($db['dblink_slave']));
@@ -1010,7 +1010,7 @@ 
     $errno = mysql_errno();
     $error = mysql_error();
     if ($sqlstatement != "") {
-        $error .= "\n\nSQL statement: " . $sqlstatement;
+        $error .= "\n\nSQL statement: ".$sqlstatement;
     }
 
     if ($db['error'] == true) {
@@ -1019,7 +1019,7 @@ 
         // could not load translations from database)
 
         if ($opt['db']['error']['display'] == true) {
-            $errmsg = 'MySQL error recursion (' . $errno . '): ' . $error;
+            $errmsg = 'MySQL error recursion ('.$errno.'): '.$error;
         } else {
             $errmsg = "";
         }
@@ -1034,13 +1034,13 @@ 
     }
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            str_replace("\n", "\r\n", $error) . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from']
+            str_replace("\n", "\r\n", $error)."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from']
         )) {
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
 
             $mail = new mail();
             $mail->subject = $subject;
@@ -1060,13 +1060,13 @@ 
     if ($opt['gui'] == GUI_HTML) {
         if (isset($tpl)) {
             if ($opt['db']['error']['display'] == true) {
-                $tpl->error('MySQL error (' . $errno . '): ' . $error);
+                $tpl->error('MySQL error ('.$errno.'): '.$error);
             } else {
                 $tpl->error('A database command could not be performed.');
             }
         } else {
             if ($opt['db']['error']['display'] == true) {
-                die('<html><body>' . htmlspecialchars('MySQL error (' . $errno . '): ' . str_replace("\n,", "<br />", $error)) . '</body></html>');
+                die('<html><body>'.htmlspecialchars('MySQL error ('.$errno.'): '.str_replace("\n,", "<br />", $error)).'</body></html>');
             } else {
                 die('<html><body>A database command could not be performed</body></html>');
             }
@@ -1074,7 +1074,7 @@ 
     } else {
         // CLI script, simple text output
         if ($opt['db']['error']['display'] == true) {
-            die('MySQL error (' . $errno . '): ' . $error . "\n");
+            die('MySQL error ('.$errno.'): '.$error."\n");
         } else {
             die("A database command could not be performed.\n");
         }
@@ -1086,13 +1086,13 @@ 
     global $opt;
 
     if ($opt['db']['error']['mail'] != '') {
-        $subject = '[' . $opt['page']['domain'] . '] SQL error';
+        $subject = '['.$opt['page']['domain'].'] SQL error';
         if (admin_errormail($opt['db']['error']['mail'],
             $subject,
-            $warnmessage . "\n" . print_r(debug_backtrace(), true),
-            "From: " . $opt['mail']['from']
+            $warnmessage."\n".print_r(debug_backtrace(), true),
+            "From: ".$opt['mail']['from']
         )) {
-            require_once $opt['rootpath'] . 'lib2/mail.class.php';
+            require_once $opt['rootpath'].'lib2/mail.class.php';
             $mail = new mail();
             $mail->name = 'sql_warn';
             $mail->subject = $subject;
@@ -1112,7 +1112,7 @@ 
     fwrite($f, "SET NAMES 'utf8';\n");
 
     if ($truncate == true) {
-        fwrite($f, "TRUNCATE TABLE `" . sql_escape($table) . "`;\n");
+        fwrite($f, "TRUNCATE TABLE `".sql_escape($table)."`;\n");
     }
 
     while ($r = sql_fetch_assoc($rs)) {
@@ -1120,19 +1120,19 @@ 
         $values = array();
 
         foreach ($r as $k => $v) {
-            $fields[] = '`' . sql_escape($k) . '`';
+            $fields[] = '`'.sql_escape($k).'`';
             if ($v === null) {
                 $values[] = "NULL";
             } else {
-                $values[] = "'" . sql_escape($v) . "'";
+                $values[] = "'".sql_escape($v)."'";
             }
         }
         unset($r);
 
         fwrite(
             $f,
-            "INSERT INTO `" . sql_escape($table) . "` (" . implode(', ', $fields) . ")"
-            . " VALUES (" . implode(', ', $values) . ");\n"
+            "INSERT INTO `".sql_escape($table)."` (".implode(', ', $fields).")"
+            . " VALUES (".implode(', ', $values).");\n"
         );
     }
 }
@@ -1143,14 +1143,14 @@ 
     $rsIndex = sql("SHOW INDEX FROM `&1`", $table);
     while ($r = sql_fetch_assoc($rsIndex)) {
         if ($r['Key_name'] == 'PRIMARY') {
-            $primary[] = '`' . sql_escape($r['Column_name']) . '` ASC';
+            $primary[] = '`'.sql_escape($r['Column_name']).'` ASC';
         }
     }
     sql_free_result($rsIndex);
 
-    $sql = "SELECT * FROM `" . sql_escape($table) . "`";
+    $sql = "SELECT * FROM `".sql_escape($table)."`";
     if (count($primary) > 0) {
-        $sql .= ' ORDER BY ' . implode(', ', $primary);
+        $sql .= ' ORDER BY '.implode(', ', $primary);
     }
 
     $rs = sql($sql);
@@ -1196,8 +1196,8 @@ 
     $sTableSql = preg_replace("/,\n +?(KEY )?`okapi_syncbase`.+?(,)?\n/", "\\2\n", $sTableSql);
 
     fwrite($f, "SET NAMES 'utf8';\n");
-    fwrite($f, "DROP TABLE IF EXISTS `" . sql_escape($table) . "`;\n");
-    fwrite($f, $sTableSql . " ;\n");
+    fwrite($f, "DROP TABLE IF EXISTS `".sql_escape($table)."`;\n");
+    fwrite($f, $sTableSql." ;\n");
 }
 
 function sql_export_structure_to_file($filename, $table)

htdocs/xml/ocxml11.php

Spacing +168 added lines, -168 removed lines

@@ -16,12 +16,12 @@ 
 }
 
 $opt['rootpath'] = '../';
-require_once __DIR__ . '/../lib/common.inc.php';
-require_once __DIR__ . '/../lib2/charset.inc.php';
-require_once __DIR__ . '/../lib2/const.inc.php';
-require_once __DIR__ . '/../lib2/logic/data-license.inc.php';
-require_once __DIR__ . '/../lib2/logic/npas.inc.php';
-require_once __DIR__ .' /../lib2/logic/geomath.class.php';
+require_once __DIR__.'/../lib/common.inc.php';
+require_once __DIR__.'/../lib2/charset.inc.php';
+require_once __DIR__.'/../lib2/const.inc.php';
+require_once __DIR__.'/../lib2/logic/data-license.inc.php';
+require_once __DIR__.'/../lib2/logic/npas.inc.php';
+require_once __DIR__.' /../lib2/logic/geomath.class.php';
 
 if ($error == true) {
     echo 'Unable to connect to database';
@@ -105,7 +105,7 @@ 
     sql('DELETE FROM `xmlsession_data` WHERE `session_id`=&1', $r['id']);
 
     // delete files
-    $path = $zip_basedir . 'ocxml11/' . $r['id'];
+    $path = $zip_basedir.'ocxml11/'.$r['id'];
     if (is_dir($path)) {
         unlinkrecursiv($path);
     }
@@ -191,7 +191,7 @@ 
     if (isset($_REQUEST['country'])) {
         $country = $_REQUEST['country'];
 
-        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\'' . sql_escape($country) . '\'', 0) != 1) {
+        if (sqlValue('SELECT COUNT(*) FROM `countries` WHERE `short`=\''.sql_escape($country).'\'', 0) != 1) {
             die('Unknown country');
         }
 
@@ -236,13 +236,13 @@ 
                 $selection['type'] = 3;
                 if (isset($_REQUEST['wp'])) {
                     $selection['cacheid'] = sqlValue(
-                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='" . sql_escape($_REQUEST['wp']) . "'",
+                        "SELECT `cache_id` FROM `caches` WHERE `wp_oc`='".sql_escape($_REQUEST['wp'])."'",
                         0
                     );
                 } else {
                     if (isset($_REQUEST['uuid'])) {
                         $selection['cacheid'] = sqlValue(
-                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='" . sql_escape($_REQUEST['uuid']) . "'",
+                            "SELECT `cache_id` FROM `caches` WHERE `uuid`='".sql_escape($_REQUEST['uuid'])."'",
                             0
                         );
                     } else {
@@ -301,23 +301,23 @@ 
         $xmloutput = '';
         if ($bXmlDecl == '1') {
             if ($sCharset == 'iso-8859-1') {
-                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>' . "\n";
+                $xmloutput .= '<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>'."\n";
             } else {
                 if ($sCharset == 'utf-8') {
-                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>' . "\n";
+                    $xmloutput .= '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>'."\n";
                 }
             }
         }
         if ($bOcXmlTag == '1') {
-            $xmloutput .= '<ocxmlsession>' . "\n";
+            $xmloutput .= '<ocxmlsession>'."\n";
         }
-        $xmloutput .= '  <sessionid>' . $sessionid . '</sessionid>' . "\n";
-        $xmloutput .= '  <records user="' . $recordcount['users'] .
-            '" cache="' . $recordcount['caches'] .
-            '" cachedesc="' . $recordcount['cachedescs'] .
-            '" cachelog="' . $recordcount['cachelogs'] .
-            '" picture="' . $recordcount['pictures'] .
-            '" removeobject="' . $recordcount['removedobjects'] . '" />' . "\n";
+        $xmloutput .= '  <sessionid>'.$sessionid.'</sessionid>'."\n";
+        $xmloutput .= '  <records user="'.$recordcount['users'].
+            '" cache="'.$recordcount['caches'].
+            '" cachedesc="'.$recordcount['cachedescs'].
+            '" cachelog="'.$recordcount['cachelogs'].
+            '" picture="'.$recordcount['pictures'].
+            '" removeobject="'.$recordcount['removedobjects'].'" />'."\n";
         if ($bOcXmlTag == '1') {
             $xmloutput .= '</ocxmlsession>';
         }
@@ -386,7 +386,7 @@ 
 
     $logtypes = [];
     $rs = sql('SELECT `id`, `de` FROM log_types');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $logtypes[$r['id']] = $r['de'];
     }
@@ -394,7 +394,7 @@ 
 
     $cachetypes = [];
     $rs = sql('SELECT `id`, `short`, `de` FROM cache_type');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachetypes[$r['id']]['de'] = $r['de'];
         $cachetypes[$r['id']]['short'] = $r['short'];
@@ -403,7 +403,7 @@ 
 
     $cachestatus = [];
     $rs = sql('SELECT `id`, `de` FROM cache_status');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachestatus[$r['id']]['de'] = $r['de'];
     }
@@ -411,7 +411,7 @@ 
 
     $counties = [];
     $rs = sql('SELECT `short`, `de` FROM countries');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $counties[$r['short']]['de'] = $r['de'];
     }
@@ -419,7 +419,7 @@ 
 
     $cachesizes = [];
     $rs = sql('SELECT `id`, `de` FROM cache_size');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $cachesizes[$r['id']]['de'] = $r['de'];
     }
@@ -427,7 +427,7 @@ 
 
     $languages = [];
     $rs = sql('SELECT `short`, `de` FROM languages');
-    for ($i = 0; $i < mysql_num_rows($rs); $i ++) {
+    for ($i = 0; $i < mysql_num_rows($rs); $i++) {
         $r = sql_fetch_array($rs);
         $languages[$r['short']]['de'] = $r['de'];
     }
@@ -438,32 +438,32 @@ 
     $objecttypes['3'] = 'cachedesc';
     $objecttypes['1'] = 'cachelog';
     $objecttypes['6'] = 'picture';
-    $objecttypes['8'] = 'cachelist';    // not implemented yet
+    $objecttypes['8'] = 'cachelist'; // not implemented yet
 
     /* end now a few dynamically loaded constants */
 
     // temporäre Datei erstellen
-    if (!is_dir($zip_basedir . 'ocxml11/' . $sessionid)) {
-        mkdir($zip_basedir . 'ocxml11/' . $sessionid);
+    if (!is_dir($zip_basedir.'ocxml11/'.$sessionid)) {
+        mkdir($zip_basedir.'ocxml11/'.$sessionid);
     }
 
     $fileid = 1;
     while (file_exists(
-        $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml'
+        $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml'
     )) {
-        $fileid ++;
+        $fileid++;
     }
 
-    $xmlfilename = $zip_basedir . 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
+    $xmlfilename = $zip_basedir.'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
 
     $f = fopen($xmlfilename, 'w');
 
     if ($bXmlDecl == '1') {
         if ($sCharset == 'iso-8859-1') {
-            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>' . "\n");
+            fwrite($f, '<?xml version="1.0" encoding="iso-8859-1" standalone="no" ?>'."\n");
         } else {
             if ($sCharset == 'utf-8') {
-                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>' . "\n");
+                fwrite($f, '<?xml version="1.0" encoding="UTF-8" standalone="no" ?>'."\n");
             }
         }
     }
@@ -471,7 +471,7 @@ 
     if ($bDocType == '1') {
         fwrite(
             $f,
-            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.' . ($ocxmlversion % 10) . '//EN" "http://www.opencaching.de/xml/ocxml' . $ocxmlversion . '.dtd">' . "\n"
+            '<!DOCTYPE oc11xml PUBLIC "-//Opencaching Network//DTD OCXml V 1.'.($ocxmlversion % 10).'//EN" "http://www.opencaching.de/xml/ocxml'.$ocxmlversion.'.dtd">'."\n"
         );
     }
     if ($bOcXmlTag == '1') {
@@ -479,30 +479,30 @@ 
         $r = sql_fetch_array($rs);
         fwrite(
             $f,
-            '<oc11xml version="1.' . ($ocxmlversion % 10) . '" date="' . date(
+            '<oc11xml version="1.'.($ocxmlversion % 10).'" date="'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '" since="' . date($sDateformat, strtotime($r['modified_since'])) . '">' . "\n"
+            ).'" since="'.date($sDateformat, strtotime($r['modified_since'])).'">'."\n"
         );
         mysql_free_result($rs);
     }
 
     if ($bAttrlist == '1') {
         $rs = sql("SELECT SQL_BUFFER_RESULT `id`, `name`, `icon_large`, `icon_no`, `icon_undef` FROM `cache_attrib`");
-        fwrite($f, $t1 . '<attrlist>' . "\n");
+        fwrite($f, $t1.'<attrlist>'."\n");
         while ($r = sql_fetch_assoc($rs)) {
             fwrite(
                 $f,
-                $t2 . '<attr id="' . $r['id'] . '" icon_large="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_large']
-                ) . '" icon_no="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_no']
-                ) . '" icon_undef="' . xmlentities(
-                    $opt['page']['default_absolute_url'] . $r['icon_undef']
-                ) . '">' . xmlcdata($r['name']) . '</attr>' . "\n"
+                $t2.'<attr id="'.$r['id'].'" icon_large="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_large']
+                ).'" icon_no="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_no']
+                ).'" icon_undef="'.xmlentities(
+                    $opt['page']['default_absolute_url'].$r['icon_undef']
+                ).'">'.xmlcdata($r['name']).'</attr>'."\n"
             );
         }
-        fwrite($f, $t1 . '</attrlist>' . "\n");
+        fwrite($f, $t1.'</attrlist>'."\n");
         sql_free_result($rs);
     }
 
@@ -510,18 +510,18 @@ 
         'SELECT SQL_BUFFER_RESULT `user`.`user_id` `id`, `user`.`node` `node`, `user`.`uuid` `uuid`, `user`.`username` `username`, `user`.`pmr_flag` `pmr_flag`, `user`.`date_created` `date_created`, `user`.`last_modified` `last_modified` FROM `tmpxml_users`, `user` WHERE `tmpxml_users`.`id`=`user`.`user_id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<user>' . "\n");
+        fwrite($f, $t1.'<user>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<username>' . xmlcdata($r['username']) . '</username>' . "\n");
-        fwrite($f, $t2 . '<pmr>' . (($r['pmr_flag'] == 0) ? '0' : '1') . '</pmr>' . "\n");
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<username>'.xmlcdata($r['username']).'</username>'."\n");
+        fwrite($f, $t2.'<pmr>'.(($r['pmr_flag'] == 0) ? '0' : '1').'</pmr>'."\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</user>' . "\n");
+        fwrite($f, $t1.'</user>'."\n");
     }
     mysql_free_result($rs);
 
@@ -550,8 +550,8 @@ 
         }   // return as micro in old interface version
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
-            $gccom2 = ' gccom2="' . xmlentities($r['wp_gc_maintained']) . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
+            $gccom2 = ' gccom2="'.xmlentities($r['wp_gc_maintained']).'"';
             $nccom = '';
         } else {
             $statusflags = '';
@@ -559,74 +559,74 @@ 
             $nccom = ' nccom=""';
         }
 
-        fwrite($f, $t1 . '<cache>' . "\n");
+        fwrite($f, $t1.'<cache>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
-        fwrite($f, $t2 . '<name>' . xmlcdata(($bAllowView ? $r['name'] : '')) . '</name>' . "\n");
+        fwrite($f, $t2.'<name>'.xmlcdata(($bAllowView ? $r['name'] : '')).'</name>'."\n");
         fwrite(
             $f,
-            $t2 . '<longitude>' . sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)) . '</longitude>' . "\n"
+            $t2.'<longitude>'.sprintf('%01.5f', ($bAllowView ? $r['longitude'] : 0)).'</longitude>'."\n"
         );
-        fwrite($f, $t2 . '<latitude>' . sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)) . '</latitude>' . "\n");
+        fwrite($f, $t2.'<latitude>'.sprintf('%01.5f', ($bAllowView ? $r['latitude'] : 0)).'</latitude>'."\n");
         fwrite(
             $f,
-            $t2 . '<type id="' . $r['type'] . '" short="' . xmlentities(
+            $t2.'<type id="'.$r['type'].'" short="'.xmlentities(
                 $cachetypes[$r['type']]['short']
-            ) . '">' . xmlcdata($cachetypes[$r['type']]['de']) . '</type>' . "\n"
+            ).'">'.xmlcdata($cachetypes[$r['type']]['de']).'</type>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<status id="' . $r['status'] . '"' . $statusflags . '>' . xmlcdata(
+            $t2.'<status id="'.$r['status'].'"'.$statusflags.'>'.xmlcdata(
                 $cachestatus[$r['status']]['de']
-            ) . '</status>' . "\n"
+            ).'</status>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<country id="' . $r['country'] . '">' . xmlcdata(
+            $t2.'<country id="'.$r['country'].'">'.xmlcdata(
                 $counties[$r['country']]['de']
-            ) . '</country>' . "\n"
+            ).'</country>'."\n"
         );
-        fwrite($f, $t2 . '<size id="' . $r['size'] . '">' . xmlcdata($cachesizes[$r['size']]['de']) . '</size>' . "\n");
-        fwrite($f, $t2 . '<desclanguages>' . $r['desclanguages'] . '</desclanguages>' . "\n");
-        fwrite($f, $t2 . '<difficulty>' . sprintf('%01.1f', $r['difficulty'] / 2) . '</difficulty>' . "\n");
-        fwrite($f, $t2 . '<terrain>' . sprintf('%01.1f', $r['terrain'] / 2) . '</terrain>' . "\n");
-        fwrite($f, $t2 . '<rating waylength="' . $r['way_length'] . '" needtime="' . $r['search_time'] . '" />' . "\n");
+        fwrite($f, $t2.'<size id="'.$r['size'].'">'.xmlcdata($cachesizes[$r['size']]['de']).'</size>'."\n");
+        fwrite($f, $t2.'<desclanguages>'.$r['desclanguages'].'</desclanguages>'."\n");
+        fwrite($f, $t2.'<difficulty>'.sprintf('%01.1f', $r['difficulty'] / 2).'</difficulty>'."\n");
+        fwrite($f, $t2.'<terrain>'.sprintf('%01.1f', $r['terrain'] / 2).'</terrain>'."\n");
+        fwrite($f, $t2.'<rating waylength="'.$r['way_length'].'" needtime="'.$r['search_time'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<waypoints oc="' . xmlentities($r['wp_oc']) . '" gccom="' . xmlentities(
+            $t2.'<waypoints oc="'.xmlentities($r['wp_oc']).'" gccom="'.xmlentities(
                 $r['wp_gc']
-            ) . '"' . $gccom2 . $nccom . ' />' . "\n"
+            ).'"'.$gccom2.$nccom.' />'."\n"
         );
-        fwrite($f, $t2 . '<datehidden>' . date($sDateformat, strtotime($r['date_hidden'])) . '</datehidden>' . "\n");
+        fwrite($f, $t2.'<datehidden>'.date($sDateformat, strtotime($r['date_hidden'])).'</datehidden>'."\n");
         if ($ocxmlversion >= 12) {
-            $pd = ' ispublishdate="' . $r['is_publishdate'] . '"';
+            $pd = ' ispublishdate="'.$r['is_publishdate'].'"';
         } else {
             $pd = "";
         }
         fwrite(
             $f,
-            $t2 . '<datecreated' . $pd . '>' . date(
+            $t2.'<datecreated'.$pd.'>'.date(
                 $sDateformat,
                 strtotime($r['date_created'])
-            ) . '</datecreated>' . "\n"
+            ).'</datecreated>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<listing_lastmodified>' . date(
+                $t2.'<listing_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['listing_last_modified'])
-                ) . '</listing_lastmodified>' . "\n"
+                ).'</listing_lastmodified>'."\n"
             );
         }
 
@@ -637,16 +637,16 @@ 
                               WHERE `caches_attributes`.`cache_id`='&1'",
             $r['id']
         );
-        fwrite($f, $t2 . '<attributes>' . "\n");
+        fwrite($f, $t2.'<attributes>'."\n");
         while ($rAttribute = sql_fetch_assoc($rsAttributes)) {
             fwrite(
                 $f,
-                $t3 . '<attribute id="' . ($rAttribute['id'] + 0) . '">' . xmlcdata(
+                $t3.'<attribute id="'.($rAttribute['id'] + 0).'">'.xmlcdata(
                     $rAttribute['name']
-                ) . '</attribute>' . "\n"
+                ).'</attribute>'."\n"
             );
         }
-        fwrite($f, $t2 . '</attributes>' . "\n");
+        fwrite($f, $t2.'</attributes>'."\n");
         sql_free_result($rsAttributes);
 
         if ($ocxmlversion >= 13) {
@@ -661,23 +661,23 @@ 
                               ORDER BY `coordinates`.`id` ASC",
                 $r['id']
             );
-            fwrite($f, $t2 . '<wpts>' . "\n");
+            fwrite($f, $t2.'<wpts>'."\n");
             while ($rWaypoint = sql_fetch_assoc($rsWaypoints)) {
                 fwrite(
                     $f,
-                    $t3 . '<wpt id="' . ($rWaypoint['id'] + 0) . '" type="' . ($rWaypoint['type'] + 0) . '" typename="' . xmlentities(
+                    $t3.'<wpt id="'.($rWaypoint['id'] + 0).'" type="'.($rWaypoint['type'] + 0).'" typename="'.xmlentities(
                         $rWaypoint['type_name']
-                    ) . '" longitude="' . sprintf('%01.5f', $rWaypoint['longitude']) . '" latitude="' . sprintf(
+                    ).'" longitude="'.sprintf('%01.5f', $rWaypoint['longitude']).'" latitude="'.sprintf(
                         '%01.5f',
                         $rWaypoint['latitude']
-                    ) . '">' . xmlcdata($rWaypoint['description']) . '</wpt>' . "\n"
+                    ).'">'.xmlcdata($rWaypoint['description']).'</wpt>'."\n"
                 );
             }
-            fwrite($f, $t2 . '</wpts>' . "\n");
+            fwrite($f, $t2.'</wpts>'."\n");
             sql_free_result($rsWaypoints);
         }
 
-        fwrite($f, $t1 . '</cache>' . "\n");
+        fwrite($f, $t1.'</cache>'."\n");
     }
     mysql_free_result($rs);
 
@@ -697,18 +697,18 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['allow_user_view'] == 1);
 
-        fwrite($f, $t1 . '<cachedesc>' . "\n");
+        fwrite($f, $t1.'<cachedesc>'."\n");
 
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
 
         fwrite(
             $f,
-            $t2 . '<language id="' . $r['language'] . '">' . xmlcdata(
+            $t2.'<language id="'.$r['language'].'">'.xmlcdata(
                 $languages[$r['language']]['de']
-            ) . '</language>' . "\n"
+            ).'</language>'."\n"
         );
-        fwrite($f, $t2 . '<shortdesc>' . xmlcdata(($bAllowView ? $r['short_desc'] : '')) . '</shortdesc>' . "\n");
+        fwrite($f, $t2.'<shortdesc>'.xmlcdata(($bAllowView ? $r['short_desc'] : '')).'</shortdesc>'."\n");
 
         $desc = $r['desc'];
         if ($r['desc_html'] == 0) {
@@ -727,10 +727,10 @@ 
             true
         );
         if ($bLicense) {
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         } else {
             if ($disclaimer != "") {
-                $desc .= "<p><em>" . $disclaimer . "</em></p>";
+                $desc .= "<p><em>".$disclaimer."</em></p>";
             }
         }
 
@@ -738,21 +738,21 @@ 
 
         fwrite(
             $f,
-            $t2 . '<desc html="' . (($r['desc_html'] == 1) ? '1' : '0') . '">' . xmlcdata(
+            $t2.'<desc html="'.(($r['desc_html'] == 1) ? '1' : '0').'">'.xmlcdata(
                 ($bAllowView ? $desc : '')
-            ) . '</desc>' . "\n"
+            ).'</desc>'."\n"
         );
 
         $r['hint'] = mb_ereg_replace('<br />', '', $r['hint']);
         $r['hint'] = html_entity_decode($r['hint'], ENT_COMPAT, 'UTF-8');
 
-        fwrite($f, $t2 . '<hint>' . xmlcdata(($bAllowView ? $r['hint'] : '')) . '</hint>' . "\n");
+        fwrite($f, $t2.'<hint>'.xmlcdata(($bAllowView ? $r['hint'] : '')).'</hint>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
 
-        fwrite($f, $t1 . '</cachedesc>' . "\n");
+        fwrite($f, $t1.'</cachedesc>'."\n");
     }
     mysql_free_result($rs);
 
@@ -793,7 +793,7 @@ 
         }
 
         if ($ocxmlversion >= 13) {
-            $teamcomment = ' teamcomment="' . $r['oc_team_comment'] . '"';
+            $teamcomment = ' teamcomment="'.$r['oc_team_comment'].'"';
         } else {
             $teamcomment = '';
             if ($r['type'] > 8) {
@@ -802,51 +802,51 @@ 
         }
 
         if ($ocxmlversion >= 15) {
-            $statusflags = ' needs_maintenance="' . $r['needs_maintenance'] . '" listing_outdated="' . $r['listing_outdated'] . '"';
+            $statusflags = ' needs_maintenance="'.$r['needs_maintenance'].'" listing_outdated="'.$r['listing_outdated'].'"';
         } else {
             $statusflags = '';
         }
 
-        fwrite($f, $t1 . '<cachelog>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<cacheid id="' . $r['cache_id'] . '">' . $r['cacheuuid'] . '</cacheid>' . "\n");
+        fwrite($f, $t1.'<cachelog>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<cacheid id="'.$r['cache_id'].'">'.$r['cacheuuid'].'</cacheid>'."\n");
         fwrite(
             $f,
-            $t2 . '<userid id="' . $r['user_id'] . '" uuid="' . $r['useruuid'] . '">' . xmlcdata(
+            $t2.'<userid id="'.$r['user_id'].'" uuid="'.$r['useruuid'].'">'.xmlcdata(
                 $r['username']
-            ) . '</userid>' . "\n"
+            ).'</userid>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<logtype id="' . $r['type'] . '" recommended="' . $r['recommended'] . '"' . $teamcomment . $statusflags . '>' . xmlcdata(
+            $t2.'<logtype id="'.$r['type'].'" recommended="'.$r['recommended'].'"'.$teamcomment.$statusflags.'>'.xmlcdata(
                 $logtypes[$r['type']]
-            ) . '</logtype>' . "\n"
+            ).'</logtype>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<date>' . date(
+            $t2.'<date>'.date(
                 $ocxmlversion >= 13 ? $sDateformat : $sDateshort,
                 strtotime($r['date'])
-            ) . '</date>' . "\n"
+            ).'</date>'."\n"
         );
         fwrite(
             $f,
-            $t2 . '<text html="' . $r['text_html'] . '">' . xmlcdata(
+            $t2.'<text html="'.$r['text_html'].'">'.xmlcdata(
                 ($bAllowView ? $r['text'] : '')
-            ) . '</text>' . "\n"
+            ).'</text>'."\n"
         );
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
         if ($ocxmlversion >= 14) {
             fwrite(
                 $f,
-                $t2 . '<log_lastmodified>' . date(
+                $t2.'<log_lastmodified>'.date(
                     $sDateformat,
                     strtotime($r['log_last_modified'])
-                ) . '</log_lastmodified>' . "\n"
+                ).'</log_lastmodified>'."\n"
             );
         }
 
@@ -861,10 +861,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</cachelog>' . "\n");
+        fwrite($f, $t1.'</cachelog>'."\n");
     }
     mysql_free_result($rs);
 
@@ -894,30 +894,30 @@ 
     while ($r = sql_fetch_array($rs)) {
         $bAllowView = ($r['auv'] == 1);
 
-        fwrite($f, $t1 . '<picture>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '">' . $r['uuid'] . '</id>' . "\n");
-        fwrite($f, $t2 . '<url>' . xmlcdata(($bAllowView ? $r['url'] : '')) . '</url>' . "\n");
-        fwrite($f, $t2 . '<title>' . xmlcdata(($bAllowView ? $r['title'] : '')) . '</title>' . "\n");
+        fwrite($f, $t1.'<picture>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'">'.$r['uuid'].'</id>'."\n");
+        fwrite($f, $t2.'<url>'.xmlcdata(($bAllowView ? $r['url'] : '')).'</url>'."\n");
+        fwrite($f, $t2.'<title>'.xmlcdata(($bAllowView ? $r['title'] : '')).'</title>'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['object_id'] . '" type="' . $r['object_type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['object_id'].'" type="'.$r['object_type'].'" typename="'.xmlentities(
                 $objecttypes[$r['object_type']]
-            ) . '">' . object_id2uuid($r['object_id'], $r['object_type']) . '</object>' . "\n"
+            ).'">'.object_id2uuid($r['object_id'], $r['object_type']).'</object>'."\n"
         );
         if ($ocxmlversion >= 13) {
             fwrite(
                 $f,
-                $t2 . '<picattr spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" preview="' . $r['mappreview'] . '" />' . "\n"
+                $t2.'<picattr spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" preview="'.$r['mappreview'].'" />'."\n"
             );
         } else {
-            fwrite($f, $t2 . '<attributes spoiler="' . $r['spoiler'] . '" display="' . $r['display'] . '" />' . "\n");
+            fwrite($f, $t2.'<attributes spoiler="'.$r['spoiler'].'" display="'.$r['display'].'" />'."\n");
         }
-        fwrite($f, $t2 . '<datecreated>' . date($sDateformat, strtotime($r['date_created'])) . '</datecreated>' . "\n");
+        fwrite($f, $t2.'<datecreated>'.date($sDateformat, strtotime($r['date_created'])).'</datecreated>'."\n");
         fwrite(
             $f,
-            $t2 . '<lastmodified>' . date($sDateformat, strtotime($r['last_modified'])) . '</lastmodified>' . "\n"
+            $t2.'<lastmodified>'.date($sDateformat, strtotime($r['last_modified'])).'</lastmodified>'."\n"
         );
-        fwrite($f, $t2 . '<position>' . $r['seq'] . '</position>' . "\n");
+        fwrite($f, $t2.'<position>'.$r['seq'].'</position>'."\n");
 
         if ($bLicense) {
             $lang = ($sLanguage != "" ? $sLanguage : $r['language']);
@@ -930,10 +930,10 @@ 
                 false,
                 true
             );
-            fwrite($f, $t2 . '<license>' . xmlcdata($disclaimer) . '</license>' . "\n");
+            fwrite($f, $t2.'<license>'.xmlcdata($disclaimer).'</license>'."\n");
         }
 
-        fwrite($f, $t1 . '</picture>' . "\n");
+        fwrite($f, $t1.'</picture>'."\n");
     }
     mysql_free_result($rs);
 
@@ -943,31 +943,31 @@ 
                                    FROM `tmpxml_removedobjects`, `removed_objects` WHERE `removed_objects`.`id`=`tmpxml_removedobjects`.`id`'
     );
     while ($r = sql_fetch_array($rs)) {
-        fwrite($f, $t1 . '<removedobject>' . "\n");
-        fwrite($f, $t2 . '<id id="' . $r['id'] . '" node="' . $r['node'] . '" />' . "\n");
+        fwrite($f, $t1.'<removedobject>'."\n");
+        fwrite($f, $t2.'<id id="'.$r['id'].'" node="'.$r['node'].'" />'."\n");
         fwrite(
             $f,
-            $t2 . '<object id="' . $r['localid'] . '" type="' . $r['type'] . '" typename="' . xmlentities(
+            $t2.'<object id="'.$r['localid'].'" type="'.$r['type'].'" typename="'.xmlentities(
                 $objecttypes[$r['type']]
-            ) . '">' . $r['uuid'] . '</object>' . "\n"
+            ).'">'.$r['uuid'].'</object>'."\n"
         );
-        fwrite($f, $t2 . '<removeddate>' . date($sDateformat, strtotime($r['removed_date'])) . '</removeddate>' . "\n");
-        fwrite($f, $t1 . '</removedobject>' . "\n");
+        fwrite($f, $t2.'<removeddate>'.date($sDateformat, strtotime($r['removed_date'])).'</removeddate>'."\n");
+        fwrite($f, $t1.'</removedobject>'."\n");
     }
     mysql_free_result($rs);
 
     if ($bOcXmlTag == '1') {
-        fwrite($f, '</oc11xml>' . "\n");
+        fwrite($f, '</oc11xml>'."\n");
     }
 
     fclose($f);
 
-    $rel_xmlfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid . '.xml';
-    $rel_zipfile = 'ocxml11/' . $sessionid . '/' . $sessionid . '-' . $filenr . '-' . $fileid;
+    $rel_xmlfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid.'.xml';
+    $rel_zipfile = 'ocxml11/'.$sessionid.'/'.$sessionid.'-'.$filenr.'-'.$fileid;
 
     // zippen und url-redirect
     if ($ziptype == '0') {
-        tpl_redirect($zip_wwwdir . $rel_xmlfile);
+        tpl_redirect($zip_wwwdir.$rel_xmlfile);
         exit;
     } else {
         if ($ziptype == 'zip') {
@@ -987,17 +987,17 @@ 
 
     $call =
         $safemode_zip
-        . ' --type=' . escapeshellcmd($ziptype)
-        . ' --src=' . escapeshellcmd($rel_xmlfile)
-        . ' --dst=' . escapeshellcmd($rel_zipfile);
+        . ' --type='.escapeshellcmd($ziptype)
+        . ' --src='.escapeshellcmd($rel_xmlfile)
+        . ' --dst='.escapeshellcmd($rel_zipfile);
     system($call);
 
     // datei vorhanden?
-    if (!file_exists($zip_basedir . $rel_zipfile)) {
+    if (!file_exists($zip_basedir.$rel_zipfile)) {
         die('all ok, but zip failed - internal server error');
     }
 
-    tpl_redirect($zip_wwwdir . $rel_zipfile);
+    tpl_redirect($zip_wwwdir.$rel_zipfile);
 
     exit;
 }
@@ -1049,7 +1049,7 @@ 
             }
             sql(
                 "INSERT INTO xmlsession_data (`session_id`, `object_type`, `object_id`)
-                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield . " >= '&2' AND `status`!=5",
+                 SELECT &1, 2, `cache_id` FROM `caches` WHERE " . $wherefield." >= '&2' AND `status`!=5",
                 $sessionid,
                 $sModifiedSince
             );
@@ -1139,35 +1139,35 @@ 
                         'longitude',
                         'latitude',
                         'cache_coordinates'
-                    ) . ' `distance` ';
+                    ).' `distance` ';
                 $sql .= 'FROM `caches`, `cache_coordinates` WHERE ';
                 $sql .= '`cache_coordinates`.`cache_id`=`caches`.`cache_id`';
                 $sql .= ' AND `caches`.`status`!=5';
-                $sql .= ' AND `cache_coordinates`.`latitude` > ' .
+                $sql .= ' AND `cache_coordinates`.`latitude` > '.
                     geomath::getMinLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`latitude` < ' .
+                $sql .= ' AND `cache_coordinates`.`latitude` < '.
                     geomath::getMaxLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` >' .
+                $sql .= ' AND `cache_coordinates`.`longitude` >'.
                     geomath::getMinLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` < ' .
+                $sql .= ' AND `cache_coordinates`.`longitude` < '.
                     geomath::getMaxLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' HAVING `distance` < ' . ($selection['distance'] + 0);
+                $sql .= ' HAVING `distance` < '.($selection['distance'] + 0);
 
                 sql($sql);
             } else {
@@ -1309,7 +1309,7 @@ 
 //    echo $startat . ' ' . $endat . '<br><br>';
 //    echo '<table>';
 //    echo '<tr><td>sql-start</td><td>sql-count</td><td>count</td><td>begin</td><td>end</td></tr>';
-    for ($i = 0; $i < 6; $i ++) {
+    for ($i = 0; $i < 6; $i++) {
         if (($startat >= $recordnr[$i]) && ($startat + 500 < $recordnr[$i + 1])) {
             if ($recordnr[$i + 1] - $startat > 500) {
                 $limits[$i] = ['start' => $startat - $recordnr[$i], 'count' => 500];
@@ -1412,7 +1412,7 @@ 
         $str = output_convert($str);
         $str = mb_ereg_replace(']]>', ']] >', $str);
 
-        return '<![CDATA[' . filterevilchars($str) . ']]>';
+        return '<![CDATA['.filterevilchars($str).']]>';
     } else {
         return xmlentities($str);
     }
@@ -1431,7 +1431,7 @@ 
     $from[4] = '\'';
     $to[4] = '&apos;';
 
-    for ($i = 0; $i <= 4; $i ++) {
+    for ($i = 0; $i <= 4; $i++) {
         $str = mb_ereg_replace($from[$i], $to[$i], $str);
     }
 
@@ -1510,13 +1510,13 @@ 
 
     $hDir = opendir($path);
     if ($hDir === false) {
-        ++ $notunlinked;
+        ++$notunlinked;
     } else {
         while (false !== ($file = readdir($hDir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($path . $file)) {
-                    if (unlinkrecursiv($path . $file . '/') == false) {
-                        $notunlinked ++;
+                if (is_dir($path.$file)) {
+                    if (unlinkrecursiv($path.$file.'/') == false) {
+                        $notunlinked++;
                     }
                 } else {
                     if ((mb_substr($file, - 4) == '.zip') ||
@@ -1524,9 +1524,9 @@ 
                         (mb_substr($file, - 4) == '.bz2') ||
                         (mb_substr($file, - 4) == '.xml')
                     ) {
-                        @unlink($path . $file);
+                        @unlink($path.$file);
                     } else {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 }
             }

htdocs/newdesc.php

Spacing +22 added lines, -23 removed lines

@@ -9,10 +9,10 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -26,7 +26,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid=' . urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid='.urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message', $login_required);
         tpl_set_var('helplink', helppagelink('login'));
     } else {
@@ -40,15 +40,15 @@ 
             if ($cache_record['user_id'] == $usr['userid']) {
                 $tplname = 'newdesc';
 
-                require $stylepath . '/newdesc.inc.php';
+                require $stylepath.'/newdesc.inc.php';
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -65,7 +65,7 @@ 
                         $oldDescMode = $descMode;
                     }
                 } else {
-                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='" . sql_escape($usr['userid']) . "'", 1) == 1) {
+                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='".sql_escape($usr['userid'])."'", 1) == 1) {
                         $descMode = 1;
                     } else {
                         $descMode = 3;
@@ -131,7 +131,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;
                     }
                 } elseif (isset($_POST['show_all_langs_submit'])) {
@@ -145,11 +145,11 @@ 
                          FROM `languages_list_default`
                          LEFT JOIN `cache_desc`
                             ON `languages_list_default`.`show`=`cache_desc`.`language`
-                            AND `cache_desc`.`cache_id`='" . sql_escape($cache_id) . "'
-                         WHERE `languages_list_default`.`lang`='" . sql_escape($locale) . "'
+                            AND `cache_desc`.`cache_id`='" . sql_escape($cache_id)."'
+                         WHERE `languages_list_default`.`lang`='" . sql_escape($locale)."'
                          AND ISNULL(`cache_desc`.`cache_id`)",
                         0
-                    ) == 0 ) {
+                    ) == 0) {
                         $show_all_langs = 1;
                     }
                 }
@@ -183,13 +183,13 @@ 
                     if ($sSelected != '') {
                         $selected = true;
                     }
-                    $langoptions .= '<option value="' . htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $langoptions .= '<option value="'.htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
                 if ($langoptions == '') {
                     // We get here if someone has added descriptions for all avaiable languages, which
                     // is very unlikely to happen ever. Just for completeness (see issue #108):
-                    tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                    tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                 }
 
                 tpl_set_var('langoptions', $langoptions);
@@ -199,8 +199,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -213,16 +212,16 @@ 
                 tpl_set_var('descMode', $descMode);
                 tpl_set_var('htmlnotice', $descMode == 2 ? $htmlnotice : '');
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if ($descMode == 3) {
                     // TinyMCE
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=' . ($cache_id + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid='.($cache_id + 0).'&lang='.strtolower($locale).'"></script>'."\n";
                 }
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
                 tpl_set_var('htmlheaders', $headers);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

htdocs/util/watchlist/runwatch.php

Spacing +32 added lines, -32 removed lines

@@ -12,13 +12,13 @@ 
  ***************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/clicompatbase.inc.php';
-require_once $rootpath . 'lib2/translate.class.php';
-require_once __DIR__ . '/settings.inc.php';
-require_once $rootpath . 'lib/consts.inc.php';
-require_once $rootpath . 'lib/logic.inc.php';
-require_once $rootpath . 'lib2/edithelper.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib2/translate.class.php';
+require_once __DIR__.'/settings.inc.php';
+require_once $rootpath.'lib/consts.inc.php';
+require_once $rootpath.'lib/logic.inc.php';
+require_once $rootpath.'lib2/edithelper.inc.php';
 
 if (!cronjobs_enabled()) {
     exit;
@@ -51,7 +51,7 @@ 
     WHERE cache_logs.cache_id=caches.cache_id
     AND cache_logs.owner_notified=0"
 );
-for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsNewLogs); $i++) {
     $rNewLog = sql_fetch_array($rsNewLogs);
 
     $rsNotified = sql(
@@ -102,7 +102,7 @@ 
     // See http://forum.opencaching.de/index.php?topic=3123.0 on AOL.
     if (sqlValue(
         "SELECT `email_problems` = 0 OR DATEDIFF(NOW(),`last_email_problem`) > 1+DATEDIFF(`last_email_problem`,`first_email_problem`)
-                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id']) . "'",
+                        FROM `user` WHERE `user_id`='" . sql_escape($rcw['user_id'])."'",
         1
     )) {
         process_log_watch($rcw['user_id'], $rcw['log_id']);
@@ -115,7 +115,7 @@ 
 
 /* begin send out everything that has to be sent */
 
-$email_headers = 'From: "' . $mailfrom . '" <' . $mailfrom . '>';
+$email_headers = 'From: "'.$mailfrom.'" <'.$mailfrom.'>';
 
 $rsUsers = sql(
     "SELECT
@@ -134,7 +134,7 @@ 
     WHERE `user`.`watchmail_nextmail`<NOW()",
     $opt['template']['default']['locale']
 );
-for ($i = 0; $i < mysql_num_rows($rsUsers); $i ++) {
+for ($i = 0; $i < mysql_num_rows($rsUsers); $i++) {
     $rUser = sql_fetch_array($rsUsers);
 
     if ($rUser['watchmail_nextmail'] != '0000-00-00 00:00:00') {
@@ -158,7 +158,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesOwner) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesOwner); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesOwner);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -183,7 +183,7 @@ 
                 );
                 if (mysql_num_rows($rsWatchesLog) > 0) {
                     $logtexts = '';
-                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j ++) {
+                    for ($j = 0; $j < mysql_num_rows($rsWatchesLog); $j++) {
                         $rWatch = sql_fetch_array($rsWatchesLog);
                         $logtexts .= $rWatch['watchtext'];
                     }
@@ -209,7 +209,7 @@ 
                     if (is_existent_maildomain(getToMailDomain($mailadr))) {
                         $language = $rUser['language'] ? $rUser['language'] : $opt['template']['default']['locale'];
                         $mailsubject =
-                            '[' . $maildomain . '] ' . $translate->t(
+                            '['.$maildomain.'] '.$translate->t(
                                 'Your watchlist of',
                                 '',
                                 basename(__FILE__),
@@ -217,11 +217,11 @@ 
                                 '',
                                 1,
                                 $language
-                            ) . ' ' . date($opt['locale'][$language]['format']['phpdate']);
+                            ).' '.date($opt['locale'][$language]['format']['phpdate']);
                         mb_send_mail($mailadr, $mailsubject, $mailbody, $email_headers);
 
                         // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to ' . $mailadr, []);
+                        logentry('watchlist', 2, $rUser['user_id'], 0, 0, 'Sending mail to '.$mailadr, []);
                     }
                 }
 
@@ -320,7 +320,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -331,7 +331,7 @@ 
     }
 
     $watchtext =
-        '{date} ' . $translate->t(
+        '{date} '.$translate->t(
             '{user} has logged your cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -339,7 +339,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -349,7 +349,7 @@ 
     $watchtext = mb_ereg_replace('{action}', get_logtype_name($rLog['type'], $language), $watchtext);
     $watchtext = insert_maintenance_flags($rLog, $language, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -403,7 +403,7 @@ 
 
     $logtext = html2plaintext($rLog['text'], $rLog['text_html'] == 0, EMAIL_LINEWRAP);
 
-    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $language = sqlValue("SELECT `language` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     if (!$language) {
         $language = $opt['template']['default']['locale'];
     }
@@ -414,7 +414,7 @@ 
     }
 
     $watchtext =
-        '{date} ' . $translate->t(
+        '{date} '.$translate->t(
             '{user} has logged the cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -422,7 +422,7 @@ 
             '',
             1,
             $language
-        ) . ' {action}{maintenance_flags}' . "\n" . '{shortlink_url}{wp_oc}' . "\n{cachelists}\n" . '{text}' . "\n\n\n\n";
+        ).' {action}{maintenance_flags}'."\n".'{shortlink_url}{wp_oc}'."\n{cachelists}\n".'{text}'."\n\n\n\n";
 
     $watchtext = mb_ereg_replace('{date}', date($dateformat, strtotime($rLog['logdate'])), $watchtext);
     $watchtext = mb_ereg_replace('{wp_oc}', $rLog['wp_oc'], $watchtext);
@@ -455,7 +455,7 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . $cachelist_names[0] . "\n";
+                ).' '.$cachelist_names[0]."\n";
             break;
         default:
             $cachelists =
@@ -467,11 +467,11 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . implode(', ', $cachelist_names) . "\n";
+                ).' '.implode(', ', $cachelist_names)."\n";
     }
     $watchtext = mb_ereg_replace('{cachelists}', $cachelists, $watchtext);
 
-    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='" . sql_escape($user_id) . "'", null);
+    $domain = sqlValue("SELECT `domain` FROM `user` WHERE `user_id`='".sql_escape($user_id)."'", null);
     $urls = get_site_urls($domain);
     if ($urls['shortlink_url']) {
         $watchtext = mb_ereg_replace("{shortlink_url}", $urls['shortlink_url'], $watchtext);
@@ -562,7 +562,7 @@ 
     }
 
     if (file_exists($PidFile)) {
-        echo "Error: Pidfile (" . $PidFile . ") already present at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: Pidfile (".$PidFile.") already present at ".__FILE__.":".__LINE__."!\n";
 
         return false;
     } else {
@@ -572,7 +572,7 @@ 
 
             return true;
         } else {
-            echo "can't create Pidfile $PidFile at " . __FILE__ . ":" . __LINE__ . "!\n";
+            echo "can't create Pidfile $PidFile at ".__FILE__.":".__LINE__."!\n";
 
             return false;
         }
@@ -588,7 +588,7 @@ 
         $pid_daemon = fgets($pidfile, 20);
         fclose($pidfile);
 
-        $pid_daemon = (int) $pid_daemon;
+        $pid_daemon = (int)$pid_daemon;
 
         // process running?
         if (posix_kill($pid_daemon, 0)) {
@@ -597,7 +597,7 @@ 
             false;
         } else {
             // no, remove pid_file
-            echo "process not running, removing old pid_file (" . $PidFile . ")\n";
+            echo "process not running, removing old pid_file (".$PidFile.")\n";
             unlink($PidFile);
 
             return true;
@@ -619,10 +619,10 @@ 
             unlink($PidFile);
         }
     } else {
-        echo "Error: can't delete own pidfile (" . $PidFile . ") at " . __FILE__ . ":" . __LINE__ . "!\n";
+        echo "Error: can't delete own pidfile (".$PidFile.") at ".__FILE__.":".__LINE__."!\n";
     }
 
     if ($message) {
-        echo $message . "\n";
+        echo $message."\n";
     }
 }

htdocs/lang/de/ocstyle/varset.inc.php

Spacing +6 added lines, -6 removed lines

@@ -22,13 +22,13 @@ 
 tpl_set_var('loginbox', ' ');
 tpl_set_var(
     'functionsbox',
-    '<a href="index.php?page=suche">' . t('Search') . '</a> | <a href="index.php?page=sitemap">' . t('Sitemap') . '</a>'
+    '<a href="index.php?page=suche">'.t('Search').'</a> | <a href="index.php?page=sitemap">'.t('Sitemap').'</a>'
 );
 tpl_set_var('runtime', '');
 
 //set up main template specific string
 $sLoggedOut =
-    '<form action="' . ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'
+    '<form action="'.($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'
     . t('User:')
     . '</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>'
     . t('Password:')
@@ -43,14 +43,14 @@ 
     . '</a></b>';
 
 // target in Loginbox setzen
-$target = basename($_SERVER['PHP_SELF']) . '?';
+$target = basename($_SERVER['PHP_SELF']).'?';
 
 // REQUEST-Variablen durchlaufen und an target anhaengen
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
 reset($_REQUEST);
 while (list ($varname, $varvalue) = each($_REQUEST)) {
     if (in_array($varname, $allowed)) {
-        $target .= $varname . '=' . $varvalue . '&';
+        $target .= $varname.'='.$varvalue.'&';
     }
 }
 if (mb_substr($target, - 1) == '?' || mb_substr($target, - 1) == '&') {
@@ -76,10 +76,10 @@ 
  '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
-            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />
+            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice').'" title="'.t('Notice').'" />
             ' . t('Your HTML code will be changed again by a special filter. This is necessary to avoid dangerous HTML-tags,
                  such as &lt;script&gt;. A list of allowed HTML tags, you can find
-                 <a href="articles.php?page=htmltags">here</a>') . '
+                 <a href="articles.php?page=htmltags">here</a>').'
         </td>
     </tr>
     ';

htdocs/thumbs.php

Spacing +40 added lines, -40 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $login->verify();
 
@@ -39,7 +39,7 @@ 
             $login->hasAdminPriv(ADMIN_USER) ? 1 : 0
         ) == 0) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('extern', 1));
             }
@@ -57,14 +57,14 @@ 
             $login->hasAdminPriv(ADMIN_USER) ? 1 : 0
         ) == 0) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('extern', 2));
             }
         }
     } else {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('intern', $default_object_type));
         }
@@ -72,7 +72,7 @@ 
 
     if ($r['local'] == 0) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('extern', $r['object_type']));
         }
@@ -80,7 +80,7 @@ 
 
     if (($r['spoiler'] == 1) && ($showspoiler != 1)) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('spoiler', $r['object_type']));
         }
@@ -89,9 +89,9 @@ 
     $imgurl = $r['url'];
     $urlparts = mb_split('/', $imgurl);
 
-    if (!file_exists($opt['logic']['pictures']['dir'] . '/' . $urlparts[count($urlparts) - 1])) {
+    if (!file_exists($opt['logic']['pictures']['dir'].'/'.$urlparts[count($urlparts) - 1])) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $tpl->redirect(thumbpath('intern', $r['object_type']));
         }
@@ -104,11 +104,11 @@ 
     }
 
     if (!file_exists(
-        $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr(
+        $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr(
             $urlparts[count($urlparts) - 1],
             0,
             1
-        ) . '/' . mb_substr($urlparts[count($urlparts) - 1], 1, 1) . '/' . $urlparts[count($urlparts) - 1]
+        ).'/'.mb_substr($urlparts[count($urlparts) - 1], 1, 1).'/'.$urlparts[count($urlparts) - 1]
     )
     ) {
         $bGenerate = true;
@@ -117,7 +117,7 @@ 
     if ($bGenerate) {
         if ($r['unknown_format'] == 1) {
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -128,11 +128,11 @@ 
         $filenameparts = mb_split('\\.', $filename);
         $extension = mb_strtolower($filenameparts[count($filenameparts) - 1]);
 
-        if (mb_strpos(';' . $opt['logic']['pictures']['extensions'] . ';', ';' . $extension . ';') === false) {
+        if (mb_strpos(';'.$opt['logic']['pictures']['extensions'].';', ';'.$extension.';') === false) {
             sql("UPDATE `pictures` SET `unknown_format`=1 WHERE `uuid`='&1'", $r['uuid']);
 
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -143,20 +143,20 @@ 
         }
         switch ($extension) {
             case 'jpg':
-                $im = imagecreatefromjpeg($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefromjpeg($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'gif':
-                $im = imagecreatefromgif($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefromgif($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'png':
-                $im = imagecreatefrompng($opt['logic']['pictures']['dir'] . '/' . $filename);
+                $im = imagecreatefrompng($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
 
             case 'bmp':
-                require $opt['rootpath'] . 'lib2/imagebmp.inc.php';
-                $im = imagecreatefrombmp($opt['logic']['pictures']['dir'] . '/' . $filename);
+                require $opt['rootpath'].'lib2/imagebmp.inc.php';
+                $im = imagecreatefrombmp($opt['logic']['pictures']['dir'].'/'.$filename);
                 break;
         }
 
@@ -164,7 +164,7 @@ 
             sql("UPDATE `pictures` SET `unknown_format`=1 WHERE `uuid`='&1'", $r['uuid']);
 
             if ($debug == 1) {
-                die('Debug: line ' . __LINE__);
+                die('Debug: line '.__LINE__);
             } else {
                 $tpl->redirect(thumbpath('format', $r['object_type']));
             }
@@ -201,15 +201,15 @@ 
         imagecopyresampled($thumbimage, $im, 0, 0, 0, 0, $thumbwidth, $thumbheight, $imwidth, $imheight);
 
         // Create directory
-        if (!file_exists($opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1))) {
-            mkdir($opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1));
+        if (!file_exists($opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1))) {
+            mkdir($opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1));
         }
         if (!file_exists(
-            $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr($filename, 1, 1)
+            $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr($filename, 1, 1)
         )
         ) {
             mkdir(
-                $opt['logic']['pictures']['thumb_dir'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+                $opt['logic']['pictures']['thumb_dir'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                     $filename,
                     1,
                     1
@@ -218,48 +218,48 @@ 
         }
 
         $savedir =
-            $opt['logic']['pictures']['thumb_dir'] . '/'
-            . mb_substr($filename, 0, 1) . '/'
+            $opt['logic']['pictures']['thumb_dir'].'/'
+            . mb_substr($filename, 0, 1).'/'
             . mb_substr($filename, 1, 1);
 
         switch ($extension) {
             case 'jpg':
-                imagejpeg($thumbimage, $savedir . '/' . $filename);
+                imagejpeg($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'gif':
-                imagegif($thumbimage, $savedir . '/' . $filename);
+                imagegif($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'png':
-                imagepng($thumbimage, $savedir . '/' . $filename);
+                imagepng($thumbimage, $savedir.'/'.$filename);
                 break;
 
             case 'bmp':
-                imagebmp($thumbimage, $savedir . '/' . $filename);
+                imagebmp($thumbimage, $savedir.'/'.$filename);
                 break;
         }
 
         sql(
             "UPDATE `pictures` SET `thumb_last_generated`=NOW(), `thumb_url`='&1' WHERE `uuid`='&2'",
-            $opt['logic']['pictures']['thumb_url'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+            $opt['logic']['pictures']['thumb_url'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                 $filename,
                 1,
                 1
-            ) . '/' . $filename,
+            ).'/'.$filename,
             $r['uuid']
         );
 
         if ($debug == 1) {
-            die($opt['logic']['pictures']['thumb_url'] . '/' . $filename);
+            die($opt['logic']['pictures']['thumb_url'].'/'.$filename);
         } else {
             $tpl->redirect(
                 use_current_protocol(
-                    $opt['logic']['pictures']['thumb_url'] . '/' . mb_substr($filename, 0, 1) . '/' . mb_substr(
+                    $opt['logic']['pictures']['thumb_url'].'/'.mb_substr($filename, 0, 1).'/'.mb_substr(
                         $filename,
                         1,
                         1
-                    ) . '/' . $filename
+                    ).'/'.$filename
                 )
             );
         }
@@ -272,7 +272,7 @@ 
     }
 } else {
     if ($debug == 1) {
-        die('Debug: line ' . __LINE__);
+        die('Debug: line '.__LINE__);
     } else {
         $tpl->redirect(thumbpath('404', $default_object_type));
     }
@@ -287,18 +287,18 @@ 
         || ($object_type != 1 && $object_type != 2)
     ) {
         if ($debug == 1) {
-            die('Debug: line ' . __LINE__);
+            die('Debug: line '.__LINE__);
         } else {
             $name = 'intern';
             $object_type = $default_object_type;
         }
     }
 
-    $imgdir = 'resource2/' . $opt['template']['style'] . '/images/thumb/';
-    $filename = 'thumb' . $name . '_' . $object_type . '.gif';
-    $thumbpath = $imgdir . strtolower($opt['template']['locale']) . '/' . $filename;
+    $imgdir = 'resource2/'.$opt['template']['style'].'/images/thumb/';
+    $filename = 'thumb'.$name.'_'.$object_type.'.gif';
+    $thumbpath = $imgdir.strtolower($opt['template']['locale']).'/'.$filename;
     if (!file_exists($thumbpath)) {
-        $thumbpath = $imgdir . 'en/' . $filename;
+        $thumbpath = $imgdir.'en/'.$filename;
     }
 
     return $thumbpath;