OpencachingDeutschland / oc-server3

htdocs/util/watchlist/settings-dist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
     $maildomain = 'opencaching.de';
 }
 
-$mailfrom = 'noreply@' . $maildomain;
+$mailfrom = 'noreply@'.$maildomain;
 
 $debug = false;
 $debug_mailto = 'abc@xyz.de';
 
-$watchpid = $rootpath . 'cache/watch.pid';
+$watchpid = $rootpath.'cache/watch.pid';

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'];
                     }
@@ -208,7 +208,7 @@ 
                 if ($mailadr != '') {
                     if (is_existent_maildomain(getToMailDomain($mailadr))) {
                         $language = $rUser['language'] ? $rUser['language'] : $opt['template']['default']['locale'];
-                        $mailsubject = '[' . $maildomain . '] ' . $translate->t(
+                        $mailsubject = '['.$maildomain.'] '.$translate->t(
                                 'Your watchlist of',
                                 '',
                                 basename(__FILE__),
@@ -216,11 +216,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, []);
                     }
                 }
 
@@ -319,7 +319,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'];
     }
@@ -329,7 +329,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged your cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -337,7 +337,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);
@@ -347,7 +347,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);
@@ -401,7 +401,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'];
     }
@@ -411,7 +411,7 @@ 
         $dateformat = $opt['locale'][$language]['format']['phpdatetime'];
     }
 
-    $watchtext = '{date} ' . $translate->t(
+    $watchtext = '{date} '.$translate->t(
             '{user} has logged the cache "{cachename}":',
             '',
             basename(__FILE__),
@@ -419,7 +419,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);
@@ -451,7 +451,7 @@ 
                     '',
                     1,
                     $language
-                ) . ' ' . $cachelist_names[0] . "\n";
+                ).' '.$cachelist_names[0]."\n";
             break;
         default:
             $cachelists = $translate->t(
@@ -462,11 +462,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);
@@ -557,7 +557,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 {
@@ -567,7 +567,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;
         }
@@ -583,7 +583,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)) {
@@ -592,7 +592,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;
@@ -614,10 +614,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/util/change_owner/cache.php

Spacing +6 added lines, -6 removed lines

@@ -10,9 +10,9 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$rootpath = __DIR__ . '/../../';
-require_once $rootpath . 'lib/common.inc.php';
-require_once $rootpath . 'lib/eventhandler.inc.php';
+$rootpath = __DIR__.'/../../';
+require_once $rootpath.'lib/common.inc.php';
+require_once $rootpath.'lib/eventhandler.inc.php';
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
@@ -54,15 +54,15 @@ 
     echo 'Besitzer geändert';
 
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
-    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed ' . $cacheid, '');
+    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed '.$cacheid, '');
 
     exit;
 } elseif ($action == 'showcache') {
     $wp = isset($_REQUEST['waypoint']) ? $_REQUEST['waypoint'] : 0;
     $newusername = isset($_REQUEST['newusername']) ? $_REQUEST['newusername'] : 0;
 
-    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='" . sql_escape($wp) . "'", 0);
-    $userid = sqlValue("SELECT user_id FROM user WHERE username='" . sql_escape($newusername) . "'", '');
+    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='".sql_escape($wp)."'", 0);
+    $userid = sqlValue("SELECT user_id FROM user WHERE username='".sql_escape($newusername)."'", '');
 
     if ($cacheid == 0) {
         die('Cache nicht gefunden!');

htdocs/oconly81.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require __DIR__ . '/lib2/logic/oconly81.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require __DIR__.'/lib2/logic/oconly81.inc.php';
 
 $showall = (@$_REQUEST['showall'] == 1);
 
@@ -46,7 +46,7 @@ 
     INNER JOIN &oconly81 ON &oconly81.`user_id`=`user`.`user_id`
     GROUP BY `user`.`user_id`
     ORDER BY `count` DESC, `username` ASC " .
-    ($showall ? "" : "LIMIT " . sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
+    ($showall ? "" : "LIMIT ".sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
 );
 
 $tpl->assign_rs('users', $rs);

htdocs/search.php

Spacing +123 added lines, -123 removed lines

@@ -55,10 +55,10 @@ 
  * - wtf is "expert mode"?
  ****************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require __DIR__ . '/lib2/logic/data-license.inc.php';
-require __DIR__ . '/lib2/search/search.inc.php';
-require __DIR__ . '/templates2/' . $opt['template']['style'] . '/search.tpl.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require __DIR__.'/lib2/logic/data-license.inc.php';
+require __DIR__.'/lib2/search/search.inc.php';
+require __DIR__.'/templates2/'.$opt['template']['style'].'/search.tpl.inc.php';
 
 
 //=========================================================
@@ -128,7 +128,7 @@ 
     }
 }
 
-$queryid += 0;  // safety measure: force $queryid to be numeric
+$queryid += 0; // safety measure: force $queryid to be numeric
 
 
 //=========================================================
@@ -149,7 +149,7 @@ 
     if (sql_num_rows($query_rs) == 0) {
         // can happen if logged out after query was created (fix for RT #3915)
         $queryid = 0;
-        goto newquery;  // goto needs PHP 5.3
+        goto newquery; // goto needs PHP 5.3
         /*
         $tpl->error($error_query_not_found);
         */
@@ -185,7 +185,7 @@ 
         }
 
         // get findername from finderid
-        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0;  // Ocprop
+        $options['finderid'] = isset($options['finderid']) ? $options['finderid'] + 0 : 0; // Ocprop
         if (isset($options['finder']) && $options['finderid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['finderid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -197,7 +197,7 @@ 
         }
 
         // get ownername from ownerid
-        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0;  // Ocprop
+        $options['ownerid'] = isset($options['ownerid']) ? $options['ownerid'] + 0 : 0; // Ocprop
         if (isset($options['owner']) && $options['ownerid'] > 0) {
             $rs_name = sql("SELECT `username` FROM `user` WHERE `user_id`='&1'", $options['ownerid']);
             if (sql_num_rows($rs_name) == 1) {
@@ -226,10 +226,10 @@ 
     }
 
     // get the search options parameters and store them in the queries table (to view "the next page")
-    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0;  // Ocprop
-    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0;  // Ocprop
+    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? $_REQUEST['f_userowner'] : 0; // Ocprop
+    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? $_REQUEST['f_userfound'] : 0; // Ocprop
     $options['f_disabled'] = isset($_REQUEST['f_disabled']) ? $_REQUEST['f_disabled'] : 0;
-    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1;  // Ocprop
+    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? $_REQUEST['f_inactive'] : 1; // Ocprop
     // f_inactive formerly was used for both, archived and disabled caches.
     // After adding the separate f_disabled option, it is used only for archived
     // caches, but keeps its name for compatibility with existing stored or
@@ -237,15 +237,15 @@ 
     $options['f_ignored'] = isset($_REQUEST['f_ignored']) ? $_REQUEST['f_ignored'] : 1;
     $options['f_otherPlatforms'] = isset($_REQUEST['f_otherPlatforms']) ? $_REQUEST['f_otherPlatforms'] : 0;
     $options['f_geokrets'] = isset($_REQUEST['f_geokrets']) ? $_REQUEST['f_geokrets'] : 0;
-    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0;  // Ocprop: 0
+    $options['expert'] = isset($_REQUEST['expert']) ? $_REQUEST['expert'] : 0; // Ocprop: 0
     $options['showresult'] = isset($_REQUEST['showresult']) ? $_REQUEST['showresult'] : 0;
-    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML';  // Ocprop: HTML
+    $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML'; // Ocprop: HTML
     $options['bbox'] = isset($_REQUEST['bbox']) ? $_REQUEST['bbox'] : false;
 
     if (isset($_REQUEST['cache_attribs'])) {
         if ($_REQUEST['cache_attribs'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -259,7 +259,7 @@ 
     if (isset($_REQUEST['cache_attribs_not'])) {
         if ($_REQUEST['cache_attribs_not'] != '') {
             $aAttribs = mb_split(';', $_REQUEST['cache_attribs_not']);
-            for ($i = 0; $i < count($aAttribs); $i ++) {
+            for ($i = 0; $i < count($aAttribs); $i++) {
                 $options['cache_attribs_not'][$aAttribs[$i] + 0] = $aAttribs[$i] + 0;
             }
             unset($aAttribs);
@@ -297,7 +297,7 @@ 
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
         $options['finder'] = isset($_REQUEST['finder']) ? stripslashes($_REQUEST['finder']) : '';
-        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7';  // Ocprop
+        $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7'; // Ocprop
     } elseif (isset($_REQUEST['searchbyortplz'])) {
         $onlydigits = is_numeric($_REQUEST['ortplz']);
         if ($onlydigits == true) {
@@ -363,7 +363,7 @@ 
         if (!$list->allowView($password)) {
             $tpl->redirect("cachelists.php");
         }
-        $options['cachelist'] = cachelist::getListById($options['listid']);  // null for invalid ID
+        $options['cachelist'] = cachelist::getListById($options['listid']); // null for invalid ID
         $options['cachelist_pw'] = $password;
     } elseif (isset($_REQUEST['searchall'])) {
         if (!$login->logged_in() &&
@@ -538,17 +538,17 @@ 
         if ($options['searchtype'] == 'byname') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`name` LIKE \'%' . sql_escape($options['cachename']) . '%\'';
+            $sql_where[] = '`caches`.`name` LIKE \'%'.sql_escape($options['cachename']).'%\'';
         } elseif ($options['searchtype'] == 'byowner') {
             if ($options['ownerid'] != 0) {
                 $sql_select[] = '`caches`.`cache_id` `cache_id`';
                 $sql_from = '`caches`';
-                $sql_where[] = '`user_id`=\'' . sql_escape($options['ownerid']) . '\'';
+                $sql_where[] = '`user_id`=\''.sql_escape($options['ownerid']).'\'';
             } else {
                 $sql_select[] = '`caches`.`cache_id` `cache_id`';
                 $sql_from = '`caches`';
                 $sql_innerjoin[] = '`user` ON `caches`.`user_id`=`user`.`user_id`';
-                $sql_where[] = '`user`.`username`=\'' . sql_escape($options['owner']) . '\'';
+                $sql_where[] = '`user`.`username`=\''.sql_escape($options['owner']).'\'';
             }
         } elseif (($options['searchtype'] == 'byplz') || ($options['searchtype'] == 'byort')) {
             $locid = $options['locid'];
@@ -563,7 +563,7 @@ 
                     $sql =
                         "SELECT `loc_id`
                          FROM `geodb_textdata`
-                         WHERE `text_type`=500300000 AND `text_val`='" . sql_escape($plz) . "'";
+                         WHERE `text_type`=500300000 AND `text_val`='" . sql_escape($plz)."'";
                     $rs = sql($sql);
                     if (sql_num_rows($rs) == 0) {
                         sql_free_result($rs);
@@ -638,9 +638,9 @@ 
                                 if ($sqlhashes != '') {
                                     $sqlhashes .= ' OR ';
                                 }
-                                $sqlhashes .= '`gns_search`.`simplehash`=' . sprintf("%u", crc32($searchstring));
+                                $sqlhashes .= '`gns_search`.`simplehash`='.sprintf("%u", crc32($searchstring));
 
-                                $wordscount ++;
+                                $wordscount++;
                             }
                         }
 
@@ -922,7 +922,7 @@ 
             // needs distinct because there can be multiple matching logs per cache
             $sql_from = '`caches`';
             $sql_innerjoin[] = '`cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
-            $sql_where[] = '`cache_logs`.`user_id`=\'' . sql_escape($finder_id) . '\'';
+            $sql_where[] = '`cache_logs`.`user_id`=\''.sql_escape($finder_id).'\'';
 
             if ($options['logtype'] != '0') { // 0 = all types
                 $ids = explode(',', $options['logtype']);
@@ -933,18 +933,18 @@ 
                     }
                     $idNumbers .= ($id + 0);
                 }
-                $sql_where[] = '`cache_logs`.`type` IN (' . $idNumbers . ')';
+                $sql_where[] = '`cache_logs`.`type` IN ('.$idNumbers.')';
             }
         } elseif ($options['searchtype'] == 'bycacheid') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`cache_id`=\'' . sql_escape($options['cacheid']) . '\'';
+            $sql_where[] = '`caches`.`cache_id`=\''.sql_escape($options['cacheid']).'\'';
         } elseif ($options['searchtype'] == 'bywp') {
             $sql_select[] = '`caches`.`cache_id` `cache_id`';
             $sql_from = '`caches`';
-            $sql_where[] = '`caches`.`wp_oc`=\'' . sql_escape($options['wp']) . '\'';
+            $sql_where[] = '`caches`.`wp_oc`=\''.sql_escape($options['wp']).'\'';
         } elseif ($options['searchtype'] == 'byfulltext') {
-            require_once $opt['rootpath'] . 'lib2/search/ftsearch.inc.php';
+            require_once $opt['rootpath'].'lib2/search/ftsearch.inc.php';
 
             $fulltext = $options['fulltext'];
             $hashes = ftsearch_hash($fulltext);
@@ -982,27 +982,27 @@ 
             $n = 1;
             foreach ($hashes as $k => $h) {
                 if ($n > 1) {
-                    $sql_innerjoin[] = '`search_index` AS `s' . $n . '` ON `s' . ($n - 1) . '`.`cache_id`=`s' . $n . '`.`cache_id`';
+                    $sql_innerjoin[] = '`search_index` AS `s'.$n.'` ON `s'.($n - 1).'`.`cache_id`=`s'.$n.'`.`cache_id`';
                 } else {
                     $sql_innerjoin[] = '`search_index` AS `s1` ON `s1`.`cache_id`=`caches`.`cache_id`';
                 }
 
-                $sql_where[] = '`s' . $n . '`.`hash`=\'' . sql_escape($h) . '\'';
-                $sql_where[] = '`s' . $n . '`.`object_type` IN (' . implode(',', $ft_types) . ')';
+                $sql_where[] = '`s'.$n.'`.`hash`=\''.sql_escape($h).'\'';
+                $sql_where[] = '`s'.$n.'`.`object_type` IN ('.implode(',', $ft_types).')';
 
-                $n ++;
+                $n++;
             }
 
             $sqlFilter =
-                'SELECT DISTINCT ' . implode(',', $sql_select) .
-                ' FROM ' . $sql_from .
-                ' INNER JOIN ' . implode(' INNER JOIN ', $sql_innerjoin) .
-                ' WHERE ' . implode(' AND ', $sql_where);
+                'SELECT DISTINCT '.implode(',', $sql_select).
+                ' FROM '.$sql_from.
+                ' INNER JOIN '.implode(' INNER JOIN ', $sql_innerjoin).
+                ' WHERE '.implode(' AND ', $sql_where);
 
             sql_drop_temp_table_slave('tmpFTCaches');
             sql_temp_table_slave('tmpFTCaches');
             sql_slave(
-                "CREATE TEMPORARY TABLE &tmpFTCaches (`cache_id` int (11) PRIMARY KEY) " . $sqlFilter
+                "CREATE TEMPORARY TABLE &tmpFTCaches (`cache_id` int (11) PRIMARY KEY) ".$sqlFilter
             );
 
             $sql_select = [];
@@ -1026,7 +1026,7 @@ 
                         SELECT `cache_id`
                         FROM `cache_list_items`
                         LEFT JOIN `cache_lists` ON `cache_lists`.`id`=`cache_list_items`.`cache_list_id`
-                        WHERE `cache_list_id`='" . sql_escape($options['listid']) . "'";
+                        WHERE `cache_list_id`='" . sql_escape($options['listid'])."'";
                 sql_slave($cachesFilter);
                 sql_slave('ALTER TABLE &result_caches ADD PRIMARY KEY (`cache_id`)');
 
@@ -1054,7 +1054,7 @@ 
             $options['f_userowner'] = '0';
         }   // Ocprop
         if ($options['f_userowner'] != 0) {
-            $sql_where[] = '`caches`.`user_id`!=\'' . $login->userid . '\'';
+            $sql_where[] = '`caches`.`user_id`!=\''.$login->userid.'\'';
         }
 
         if (!isset($options['f_userfound'])) {
@@ -1066,7 +1066,7 @@ 
                     (SELECT `cache_logs`.`cache_id`
                      FROM `cache_logs`
                      WHERE
-                        `cache_logs`.`user_id`='" . sql_escape($login->userid) . "'
+                        `cache_logs`.`user_id`='" . sql_escape($login->userid)."'
                         AND `cache_logs`.`type` IN (1, 7))";
         }
         if (!isset($options['f_inactive'])) {
@@ -1093,14 +1093,14 @@ 
             if ($options['f_ignored'] != 0) {
                 // only use this filter, if it is realy needed - this enables better caching in map2.php with ignored-filter
                 if (sql_value_slave(
-                    "SELECT COUNT(*) FROM `cache_ignore` WHERE `user_id`='" . sql_escape($login->userid) . "'",
+                    "SELECT COUNT(*) FROM `cache_ignore` WHERE `user_id`='".sql_escape($login->userid)."'",
                     0
                 ) > 0) {
                     $sql_where[] =
                         "`caches`.`cache_id` NOT IN
                             (SELECT `cache_ignore`.`cache_id`
                              FROM `cache_ignore`
-                             WHERE `cache_ignore`.`user_id`='" . sql_escape($login->userid) . "')";
+                             WHERE `cache_ignore`.`user_id`='" . sql_escape($login->userid)."')";
                 }
             }
         }
@@ -1122,7 +1122,7 @@ 
             $options['country'] = '';
         }
         if ($options['country'] != '') {
-            $sql_where[] = '`caches`.`country`=\'' . sql_escape($options['country']) . '\'';
+            $sql_where[] = '`caches`.`country`=\''.sql_escape($options['country']).'\'';
         }
 
         if (!isset($options['language'])) {
@@ -1134,7 +1134,7 @@ 
             $sql_where[] = '`cache_desc`.`language`=\'' . sql_escape($options['language']) . '\'';
             */
             // optimized query:
-            $sql_where[] = 'INSTR(`caches`.`desc_languages`,\'' . sql_escape($options['language']) . '\')';
+            $sql_where[] = 'INSTR(`caches`.`desc_languages`,\''.sql_escape($options['language']).'\')';
         }
 
         if (!isset($options['adm2'])) {
@@ -1142,50 +1142,50 @@ 
         }
         if ($options['adm2'] != '') {
             $sql_innerjoin[] = '`cache_location` ON `cache_location`.`cache_id`=`caches`.`cache_id`';
-            $sql_where[] = '`cache_location`.`code2`=\'' . sql_escape($options['adm2']) . '\'';
+            $sql_where[] = '`cache_location`.`code2`=\''.sql_escape($options['adm2']).'\'';
         }
 
         if ($options['cachetype'] != '') {
             $types = explode(';', $options['cachetype']);
             if (count($types) < sql_value_slave("SELECT COUNT(*) FROM `cache_type`", 0)) {
-                for ($i = 0; $i < count($types); $i ++) {
-                    $types[$i] = "'" . sql_escape($types[$i]) . "'";
+                for ($i = 0; $i < count($types); $i++) {
+                    $types[$i] = "'".sql_escape($types[$i])."'";
                 }
-                $sql_where[] = '`caches`.`type` IN (' . implode(',', $types) . ')';
+                $sql_where[] = '`caches`.`type` IN ('.implode(',', $types).')';
             }
         }
 
         if ($options['cachesize'] != '') {
             $sizes = explode(';', $options['cachesize']);
             if (count($sizes) < sql_value_slave("SELECT COUNT(*) FROM `cache_size`", 0)) {
-                for ($i = 0; $i < count($sizes); $i ++) {
-                    $sizes[$i] = "'" . sql_escape($sizes[$i]) . "'";
+                for ($i = 0; $i < count($sizes); $i++) {
+                    $sizes[$i] = "'".sql_escape($sizes[$i])."'";
                 }
-                $sql_where[] = '`caches`.`size` IN (' . implode(',', $sizes) . ')';
+                $sql_where[] = '`caches`.`size` IN ('.implode(',', $sizes).')';
             }
         }
 
         if ($options['difficultymin'] != 0) {
-            $sql_where[] = '`caches`.`difficulty`>=\'' . sql_escape($options['difficultymin']) . '\'';
+            $sql_where[] = '`caches`.`difficulty`>=\''.sql_escape($options['difficultymin']).'\'';
         }
         if ($options['difficultymax'] != 0) {
-            $sql_where[] = '`caches`.`difficulty`<=\'' . sql_escape($options['difficultymax']) . '\'';
+            $sql_where[] = '`caches`.`difficulty`<=\''.sql_escape($options['difficultymax']).'\'';
         }
         if ($options['terrainmin'] != 0) {
-            $sql_where[] = '`caches`.`terrain`>=\'' . sql_escape($options['terrainmin']) . '\'';
+            $sql_where[] = '`caches`.`terrain`>=\''.sql_escape($options['terrainmin']).'\'';
         }
         if ($options['terrainmax'] != 0) {
-            $sql_where[] = '`caches`.`terrain`<=\'' . sql_escape($options['terrainmax']) . '\'';
+            $sql_where[] = '`caches`.`terrain`<=\''.sql_escape($options['terrainmax']).'\'';
         }
         if ($options['recommendationmin'] > 0) {
             $sql_innerjoin[] = '`stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id`';
-            $sql_where[] = '`stat_caches`.`toprating`>=\'' . sql_escape($options['recommendationmin']) . '\'';
+            $sql_where[] = '`stat_caches`.`toprating`>=\''.sql_escape($options['recommendationmin']).'\'';
         }
 
         if (isset($options['cache_attribs']) && count($options['cache_attribs']) > 0) {
             foreach ($options['cache_attribs'] as $attr) {
-                $sql_innerjoin[] = '`caches_attributes` AS `a' . ($attr + 0) . '` ON `a' . ($attr + 0) . '`.`cache_id`=`caches`.`cache_id`';
-                $sql_where[] = '`a' . ($attr + 0) . '`.`attrib_id`=' . ($attr + 0);
+                $sql_innerjoin[] = '`caches_attributes` AS `a'.($attr + 0).'` ON `a'.($attr + 0).'`.`cache_id`=`caches`.`cache_id`';
+                $sql_where[] = '`a'.($attr + 0).'`.`attrib_id`='.($attr + 0);
             }
         }
 
@@ -1197,7 +1197,7 @@ 
                          FROM `caches_attributes`
                          WHERE
                             `caches_attributes`.`cache_id`=`caches`.`cache_id`
-                            AND `caches_attributes`.`attrib_id`='" . sql_escape($attr + 0) . "'
+                            AND `caches_attributes`.`attrib_id`='" . sql_escape($attr + 0)."'
                         )";
             }
         }
@@ -1206,7 +1206,7 @@ 
             // bbox=<lon_from>,<lat_from>,<lon_to>,<lat_to>
             $coords = explode(',', $options['bbox']);
             if (count($coords) == 4) {
-                $sql_where[] = '`caches`.`longitude`>=' . ($coords[0] + 0) . ' AND `caches`.`latitude`>=' . ($coords[1] + 0) . ' AND `caches`.`longitude`<=' . ($coords[2] + 0) . ' AND `caches`.`latitude`<=' . ($coords[3] + 0);
+                $sql_where[] = '`caches`.`longitude`>='.($coords[0] + 0).' AND `caches`.`latitude`>='.($coords[1] + 0).' AND `caches`.`longitude`<='.($coords[2] + 0).' AND `caches`.`latitude`<='.($coords[3] + 0);
             }
         }
 
@@ -1215,23 +1215,23 @@ 
             $sql_where[] =
                 '(`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='
                 . sql_escape($login->userid)
-                . ' OR (`caches`.`status`<>5 AND ' . ($login->hasAdminPriv(ADMIN_USER) ? '1' : '0') . '))';
+                . ' OR (`caches`.`status`<>5 AND '.($login->hasAdminPriv(ADMIN_USER) ? '1' : '0').'))';
         } else {
             $sql_where[] = '`cache_status`.`allow_user_view`=1';
         }
 
         //do the search
-        $innerjoin = sizeof($sql_innerjoin) ? ' INNER JOIN ' . implode(' INNER JOIN ', $sql_innerjoin) : '';
-        $leftjoin = sizeof($sql_leftjoin) ? ' LEFT JOIN ' . implode(' LEFT JOIN ', $sql_leftjoin) : '';
-        $group = sizeof($sql_group) ? ' GROUP BY ' . implode(', ', $sql_group) : '';
-        $having = sizeof($sql_having) ? ' HAVING ' . implode(' AND ', $sql_having) : '';
-
-        $sqlFilter = 'SELECT ' . implode(',', $sql_select) .
-            ' FROM ' . $sql_from .
-            $innerjoin .
-            $leftjoin .
-            ' WHERE ' . implode(' AND ', $sql_where) .
-            $group .
+        $innerjoin = sizeof($sql_innerjoin) ? ' INNER JOIN '.implode(' INNER JOIN ', $sql_innerjoin) : '';
+        $leftjoin = sizeof($sql_leftjoin) ? ' LEFT JOIN '.implode(' LEFT JOIN ', $sql_leftjoin) : '';
+        $group = sizeof($sql_group) ? ' GROUP BY '.implode(', ', $sql_group) : '';
+        $having = sizeof($sql_having) ? ' HAVING '.implode(' AND ', $sql_having) : '';
+
+        $sqlFilter = 'SELECT '.implode(',', $sql_select).
+            ' FROM '.$sql_from.
+            $innerjoin.
+            $leftjoin.
+            ' WHERE '.implode(' AND ', $sql_where).
+            $group.
             $having;
 
         // echo "DEBUG ".$sqlFilter." DEBUG<br>";
@@ -1243,7 +1243,7 @@ 
     //  X6. load output module and output-dependent options
     //=================================================================
 
-    $output_module = mb_strtolower($options['output']);  // Ocprop: HTML, gpx
+    $output_module = mb_strtolower($options['output']); // Ocprop: HTML, gpx
 
     $map2_bounds = ($output_module == 'map2bounds');
     if ($map2_bounds) {
@@ -1252,7 +1252,7 @@ 
 
     if ($map2_bounds && $options['queryid'] == 0) {
         $tpl->error('map2bounds requires queryid');
-    } elseif (!file_exists($opt['rootpath'] . 'lib2/search/search.' . $output_module . '.inc.php')) {
+    } elseif (!file_exists($opt['rootpath'].'lib2/search/search.'.$output_module.'.inc.php')) {
         $tpl->error($outputformat_notexist);
     }
 
@@ -1278,7 +1278,7 @@ 
     // (map2 module will execute and exit; it will use the variables
     // $cachesFilter, $sqlFilter and $map2_bounds and $options['queryid'].)
 
-    require $opt['rootpath'] . 'lib2/search/search.' . $output_module . '.inc.php';
+    require $opt['rootpath'].'lib2/search/search.'.$output_module.'.inc.php';
 
     if (!isset($search_output_file_download)) {
         die("search_output_file_download flag not set for '$output_module' search");
@@ -1303,7 +1303,7 @@ 
             $lat_rad * 180 / 3.14159,
             0,
             $multiplier[$distance_unit]
-        ) . ' `distance`, ';
+        ).' `distance`, ';
     } else {
         if (!$login->logged_in()) {
             $sql .= 'NULL distance, ';
@@ -1326,7 +1326,7 @@ 
                     $record_coords['latitude'],
                     0,
                     $multiplier[$distance_unit]
-                ) . ' `distance`, ';
+                ).' `distance`, ';
             }
             sql_free_result($rs_coords);
         }
@@ -1336,7 +1336,7 @@ 
         $sAddFields .= ', MAX(`cache_logs`.`date`) AS `lastLog`';
         $sAddJoin .= ' LEFT JOIN `cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
         if ($options['sort'] == 'bymylastlog') {
-            $sAddJoin .= ' AND `cache_logs`.`user_id`=' . sql_escape($login->userid);
+            $sAddJoin .= ' AND `cache_logs`.`user_id`='.sql_escape($login->userid);
         }
         $sGroupBy .= ' GROUP BY `caches`.`cache_id`';
     }
@@ -1352,8 +1352,8 @@ 
         . ' FROM `caches`
           LEFT JOIN `stat_caches` ON `caches`.`cache_id`=`stat_caches`.`cache_id`' .
         $sAddJoin
-        . ' WHERE `caches`.`cache_id` IN (' . $sqlFilter . ')' .
-        $sAddWhere . ' ' .
+        . ' WHERE `caches`.`cache_id` IN ('.$sqlFilter.')'.
+        $sAddWhere.' '.
         $sGroupBy;
     $sortby = $options['sort'];
 
@@ -1418,7 +1418,7 @@ 
         $count = 500;
     }
 
-    $sqlLimit = ' LIMIT ' . $startat . ', ' . $count;
+    $sqlLimit = ' LIMIT '.$startat.', '.$count;
 
     if ($search_output_file_download) {
         //===================================================================
@@ -1429,7 +1429,7 @@ 
         // for the case something went wrong and it was not propery cleaned up
 
         sql_temp_table_slave('searchtmp');
-        sql_slave("CREATE TEMPORARY TABLE &searchtmp SELECT " . $sql . $sqlLimit);
+        sql_slave("CREATE TEMPORARY TABLE &searchtmp SELECT ".$sql.$sqlLimit);
 
         $count = sql_value_slave("SELECT COUNT(*) FROM &searchtmp", 0);
         if ($count == 1) {
@@ -1441,7 +1441,7 @@ 
                 '?'
             );
         } else {
-            $sFilebasename = 'ocde' . $options['queryid'];
+            $sFilebasename = 'ocde'.$options['queryid'];
         }
 
         $bUseZip = ($count > $zip_threshold) ||
@@ -1452,11 +1452,11 @@ 
 
         if (!$db['debug']) {
             if ($bUseZip) {
-                header('Content-type: ' . $content_type_zipped);
-                header('Content-disposition: attachment; filename="' . $sFilebasename . '.zip"');
+                header('Content-type: '.$content_type_zipped);
+                header('Content-disposition: attachment; filename="'.$sFilebasename.'.zip"');
             } else {
-                header('Content-type: ' . $content_type_plain);
-                header('Content-disposition: attachment; filename="' . $sFilebasename . '.' . $output_module . '"');
+                header('Content-type: '.$content_type_plain);
+                header('Content-disposition: attachment; filename="'.$sFilebasename.'.'.$output_module.'"');
             }
         }
 
@@ -1489,9 +1489,9 @@ 
         // output zip file
         if ($bUseZip && !$db['debug']) {
             if ($add_to_zipfile) {
-                $phpzip->add_data($sFilebasename . '.' . $output_module, $content);
+                $phpzip->add_data($sFilebasename.'.'.$output_module, $content);
             }
-            echo $phpzip->save($sFilebasename . '.zip', 'r');
+            echo $phpzip->save($sFilebasename.'.zip', 'r');
         }
     } else {
         //===================================================================
@@ -1565,14 +1565,14 @@ 
     $cachesFilter =
         "CREATE TEMPORARY TABLE &result_caches ENGINE=MEMORY
             SELECT
-                (" . geomath::getSqlDistanceFormula($lon, $lat, $distance, $multiplier[$distance_unit]) . ") `distance`,
+                (" . geomath::getSqlDistanceFormula($lon, $lat, $distance, $multiplier[$distance_unit]).") `distance`,
                 `caches`.`cache_id` `cache_id`
             FROM `caches` FORCE INDEX (`latitude`)
             WHERE
-                `longitude` > " . ($lon - $max_lon_diff) . "
-                AND `longitude` < " . ($lon + $max_lon_diff) . "
-                AND `latitude` > " . ($lat - $max_lat_diff) . "
-                AND `latitude` < " . ($lat + $max_lat_diff) . "
+                `longitude` > " . ($lon - $max_lon_diff)."
+                AND `longitude` < " . ($lon + $max_lon_diff)."
+                AND `latitude` > " . ($lat - $max_lat_diff)."
+                AND `latitude` < " . ($lat + $max_lat_diff)."
             HAVING `distance` < " . ($distance + 0);
     sql_slave($cachesFilter);
     sql_slave("ALTER TABLE &result_caches ADD PRIMARY KEY ( `cache_id` )");
@@ -1687,7 +1687,7 @@ 
             $rs = sql(
                 "SELECT `latitude`, `longitude`
                  FROM `user`
-                 WHERE `user_id`='" . sql_escape($login->userid) . "'"
+                 WHERE `user_id`='" . sql_escape($login->userid)."'"
             );
             $record = sql_fetch_array($rs);
             $lon = $record['longitude'];
@@ -1785,9 +1785,9 @@ 
     }
     $tpl->assign('ortplz', $ortplz);
     if ($options['searchtype'] == 'byplz') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byplz'); // Ocprop
     } elseif ($options['searchtype'] == 'byort') {
-        $dByOrtPlzChecked = ($options['searchtype'] == 'byort');  // Ocprop
+        $dByOrtPlzChecked = ($options['searchtype'] == 'byort'); // Ocprop
     } else {
         $dByOrtPlzChecked = false;
     }
@@ -1856,8 +1856,8 @@ 
         $rCachetype['checked'] =
             ($options['cachetype'] == '')
             || (strpos(
-                ';' . $options['cachetype'] . ';',
-                ';' . $rCachetype['id'] . ';'
+                ';'.$options['cachetype'].';',
+                ';'.$rCachetype['id'].';'
             ) !== false);
         $rCachetype['unchecked'] = !$rCachetype['checked'];
     }
@@ -1870,8 +1870,8 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $cachesizes[$r['id']]['checked'] =
             (strpos(
-                ';' . $options['cachesize'] . ';',
-                ';' . $r['id'] . ';'
+                ';'.$options['cachesize'].';',
+                ';'.$r['id'].';'
             ) !== false)
             || ($options['cachesize'] == '');
     }
@@ -2022,7 +2022,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount2 ++;
+            $nLineAttrCount2++;
         }
         sql_free_result($rs);
 
@@ -2133,7 +2133,7 @@ 
             $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
 
             $group_line .= $line;
-            $nLineAttrCount1 ++;
+            $nLineAttrCount1++;
         }
         sql_free_result($rs);
 
@@ -2255,7 +2255,7 @@ 
             $pnew = '';
             foreach ($param as $p) {
                 if ($pnew != '') {
-                    $pnew .= ';' . $p;
+                    $pnew .= ';'.$p;
                 } else {
                     $pnew .= $p;
                 }
@@ -2265,9 +2265,9 @@ 
         }
 
         if ($urlparamString != '') {
-            $urlparamString .= '&' . $name . '=' . urlencode($param);
+            $urlparamString .= '&'.$name.'='.urlencode($param);
         } else {
-            $urlparamString = $name . '=' . urlencode($param);
+            $urlparamString = $name.'='.urlencode($param);
         }
     }
     $urlparamString .= '';
@@ -2278,13 +2278,13 @@ 
 
 function outputUniidSelectionForm($uniSql, $options)
 {
-    global $tpl;  // settings
+    global $tpl; // settings
     global $locline, $secondlocationname;
 
     $urlparamString = prepareLocSelectionForm($options);
 
     sql_temp_table_slave('uniids');
-    sql_slave("CREATE TEMPORARY TABLE &uniids ENGINE=MEMORY " . $uniSql);
+    sql_slave("CREATE TEMPORARY TABLE &uniids ENGINE=MEMORY ".$uniSql);
     sql_slave("ALTER TABLE &uniids ADD PRIMARY KEY (`uni_id`)");
 
     // locidsite
@@ -2297,7 +2297,7 @@ 
     $tpl->assign('resultscount', $count);
 
     // create page browser
-    $pager = new pager('search.php?' . $urlparamString . '&locidsite={offset}');
+    $pager = new pager('search.php?'.$urlparamString.'&locidsite={offset}');
     $pager->make_from_offset($locidsite, ceil($count / 20), 1);
 
     // create locations list
@@ -2317,7 +2317,7 @@ 
          FROM `gns_locations`, &uniids
          WHERE &uniids.`uni_id`=`gns_locations`.`uni`
          ORDER BY `gns_locations`.`full_name` ASC
-         LIMIT " . ($locidsite * 20) . ", 20"
+         LIMIT " . ($locidsite * 20).", 20"
     );
 
     $nr = $locidsite * 20 + 1;
@@ -2354,7 +2354,7 @@ 
         $thislocation = mb_ereg_replace('{parentlocations}', $locString, $thislocation);
 
         // koordinaten ermitteln
-        $coordString = help_latToDegreeStr($r['lat']) . ' ' . help_lonToDegreeStr($r['lon']);
+        $coordString = help_latToDegreeStr($r['lat']).' '.help_lonToDegreeStr($r['lon']);
         $thislocation = mb_ereg_replace('{coords}', htmlspecialchars($coordString, ENT_COMPAT, 'UTF-8'), $thislocation);
 
         if ($r['olduni'] != 0) {
@@ -2384,12 +2384,12 @@ 
             htmlspecialchars($r['full_name'], ENT_COMPAT, 'UTF-8'),
             $thislocation
         );
-        $thislocation = mb_ereg_replace('{urlparams}', $urlparamString . '&locid={locid}', $thislocation);
+        $thislocation = mb_ereg_replace('{urlparams}', $urlparamString.'&locid={locid}', $thislocation);
         $thislocation = mb_ereg_replace('{locid}', urlencode($r['uni_id']), $thislocation);
         $thislocation = mb_ereg_replace('{nr}', $nr, $thislocation);
 
-        $nr ++;
-        $locations .= $thislocation . "\n";
+        $nr++;
+        $locations .= $thislocation."\n";
     }
     sql_free_result($rs);
     sql_drop_temp_table_slave('uniids');
@@ -2406,12 +2406,12 @@ 
     global $tpl;
     global $locline, $bgcolor1, $bgcolor2;
 
-    require_once __DIR__ . '/lib2/logic/geodb.inc.php';
+    require_once __DIR__.'/lib2/logic/geodb.inc.php';
 
-    $urlparamString = prepareLocSelectionForm($options) . '&locid={locid}';
+    $urlparamString = prepareLocSelectionForm($options).'&locid={locid}';
 
     sql_temp_table_slave('locids');
-    sql_slave("CREATE TEMPORARY TABLE &locids ENGINE=MEMORY " . $locSql);
+    sql_slave("CREATE TEMPORARY TABLE &locids ENGINE=MEMORY ".$locSql);
     sql_slave("ALTER TABLE &locids ADD PRIMARY KEY (`loc_id`)");
 
     $rs = sql_slave(
@@ -2439,12 +2439,12 @@ 
 
         $rb = GeoDb::regierungsbezirkFromLocid($r['loc_id']);
         if ($rb != '') {
-            $locString .= ' &gt; ' . htmlspecialchars($rb, ENT_COMPAT, 'UTF-8');
+            $locString .= ' &gt; '.htmlspecialchars($rb, ENT_COMPAT, 'UTF-8');
         }
 
         $lk = GeoDb::landkreisFromLocid($r['loc_id']);
         if ($lk != '') {
-            $locString .= ' &gt; ' . htmlspecialchars($lk, ENT_COMPAT, 'UTF-8');
+            $locString .= ' &gt; '.htmlspecialchars($lk, ENT_COMPAT, 'UTF-8');
         }
 
         $thislocation = mb_ereg_replace('{parentlocations}', $locString, $thislocation);
@@ -2459,9 +2459,9 @@ 
             $r['loc_id']
         );
         if ($rCoords = sql_fetch_array($rsCoords)) {
-            $coordString = help_latToDegreeStr($rCoords['lat']) . ' ' . help_lonToDegreeStr($rCoords['lon']);
+            $coordString = help_latToDegreeStr($rCoords['lat']).' '.help_lonToDegreeStr($rCoords['lon']);
         } else {
-            $coordString = '[' . $no_location_coords . ']';
+            $coordString = '['.$no_location_coords.']';
         }
 
         $thislocation = mb_ereg_replace('{coords}', htmlspecialchars($coordString, ENT_COMPAT, 'UTF-8'), $thislocation);
@@ -2481,8 +2481,8 @@ 
             $thislocation = mb_ereg_replace('{bgcolor}', $bgcolor2, $thislocation);
         }
 
-        $nr ++;
-        $locations .= $thislocation . "\n";
+        $nr++;
+        $locations .= $thislocation."\n";
     }
 
     $tpl->assign('locations', $locations);

htdocs/index.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $sUserCountry = $login->getUserCountry();
 
@@ -17,7 +17,7 @@ 
 
 $tpl->caching = true;
 $tpl->cache_lifetime = 300;
-$tpl->cache_id = $sUserCountry . '|' . $opt['page']['protocol'];
+$tpl->cache_id = $sUserCountry.'|'.$opt['page']['protocol'];
 
 if (!$tpl->is_cached()) {
     // welcome message
@@ -116,7 +116,7 @@ 
         }
 
         // build static maps url by inserting api key
-        $url = $opt['page']['protocol'] . strstr($opt['logic']['minimapurl'], '://');
+        $url = $opt['page']['protocol'].strstr($opt['logic']['minimapurl'], '://');
         $url = mb_ereg_replace('{gmkey}', $gmkey, $url);
 
         // put into template

htdocs/xml/csv/cache.php

Spacing +8 added lines, -8 removed lines

@@ -5,9 +5,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/web.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/cache.class.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/web.inc.php';
+require_once $opt['rootpath'].'lib2/logic/cache.class.php';
 
 header('Content-type: text/html; charset=utf-8');
 
@@ -35,14 +35,14 @@ 
     } else {
         echo $cache->getCacheId();
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getName()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getName()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getUsername()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getUsername()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPOC()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPOC()).'"';
         echo ';';
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPGC()) . '"';
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPGC()).'"';
         echo ';';
-        echo '""';  // obsolete Navicache WP
+        echo '""'; // obsolete Navicache WP
     }
 }

htdocs/xml/ocxml11.php

Spacing +167 added lines, -167 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);
     }
@@ -192,7 +192,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');
         }
 
@@ -237,13 +237,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 {
@@ -302,23 +302,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>';
         }
@@ -387,7 +387,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'];
     }
@@ -395,7 +395,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'];
@@ -404,7 +404,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'];
     }
@@ -412,7 +412,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'];
     }
@@ -420,7 +420,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'];
     }
@@ -428,7 +428,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'];
     }
@@ -439,32 +439,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");
             }
         }
     }
@@ -472,7 +472,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') {
@@ -480,30 +480,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);
     }
 
@@ -511,18 +511,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);
 
@@ -551,8 +551,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 = '';
@@ -560,74 +560,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"
             );
         }
 
@@ -638,16 +638,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) {
@@ -662,23 +662,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);
 
@@ -698,18 +698,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) {
@@ -728,10 +728,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>";
             }
         }
 
@@ -739,21 +739,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);
 
@@ -794,7 +794,7 @@ 
         }
 
         if ($ocxmlversion >= 13) {
-            $teamcomment = ' teamcomment="' . $r['oc_team_comment'] . '"';
+            $teamcomment = ' teamcomment="'.$r['oc_team_comment'].'"';
         } else {
             $teamcomment = '';
             if ($r['type'] > 8) {
@@ -803,51 +803,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"
             );
         }
 
@@ -862,10 +862,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);
 
@@ -895,30 +895,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']);
@@ -931,10 +931,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);
 
@@ -944,31 +944,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') {
@@ -986,17 +986,17 @@ 
         }
     }
 
-    $call = $safemode_zip . ' --type=' . escapeshellcmd($ziptype) . ' --src=' . escapeshellcmd(
+    $call = $safemode_zip.' --type='.escapeshellcmd($ziptype).' --src='.escapeshellcmd(
             $rel_xmlfile
-        ) . ' --dst=' . escapeshellcmd($rel_zipfile);
+        ).' --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;
 }
@@ -1048,7 +1048,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
             );
@@ -1137,31 +1137,31 @@ 
                         '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` > ' . geomath::getMinLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` > '.geomath::getMinLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`latitude` < ' . geomath::getMaxLat(
+                $sql .= ' AND `cache_coordinates`.`latitude` < '.geomath::getMaxLat(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` >' . geomath::getMinLon(
+                $sql .= ' AND `cache_coordinates`.`longitude` >'.geomath::getMinLon(
                         $selection['lon'],
                         $selection['lat'],
                         $selection['distance']
                     );
-                $sql .= ' AND `cache_coordinates`.`longitude` < ' . geomath::getMaxLon(
+                $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 {
@@ -1300,7 +1300,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];
@@ -1403,7 +1403,7 @@ 
         $str = output_convert($str);
         $str = mb_ereg_replace(']]>', ']] >', $str);
 
-        return '<![CDATA[' . filterevilchars($str) . ']]>';
+        return '<![CDATA['.filterevilchars($str).']]>';
     } else {
         return xmlentities($str);
     }
@@ -1422,7 +1422,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);
     }
 
@@ -1501,13 +1501,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') ||
@@ -1515,9 +1515,9 @@ 
                         (mb_substr($file, - 4) == '.bz2') ||
                         (mb_substr($file, - 4) == '.xml')
                     ) {
-                        @unlink($path . $file);
+                        @unlink($path.$file);
                     } else {
-                        $notunlinked ++;
+                        $notunlinked++;
                     }
                 }
             }

htdocs/editlog.php

Spacing +31 added lines, -31 removed lines

@@ -13,12 +13,12 @@ 
  *  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/logic/logtypes.inc.php';
-require_once __DIR__ . '/lib/recommendation.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/logic/logtypes.inc.php';
+require_once __DIR__.'/lib/recommendation.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -34,7 +34,7 @@ 
         tpl_set_var('username', '');
         tpl_set_var('message_start', '');
         tpl_set_var('message_end', '');
-        tpl_set_var('target', 'editlog.php?logid=' . urlencode($log_id));
+        tpl_set_var('target', 'editlog.php?logid='.urlencode($log_id));
         tpl_set_var('message', $login_required);
         tpl_set_var('helplink', helppagelink('login'));
     } else {
@@ -72,8 +72,8 @@ 
         if (($log_record !== false && (($log_record['status'] != 6) || ($log_record['cache_user_id'] == $login->userid && $log_record['user_id'] == $login->userid)) &&
                 $log_record['status'] != 7) || $useradmin
         ) {
-            require $stylepath . '/editlog.inc.php';
-            require $stylepath . '/rating.inc.php';
+            require $stylepath.'/editlog.inc.php';
+            require $stylepath.'/rating.inc.php';
 
             if ($log_record['node'] != $oc_nodeid) {
                 tpl_errorMsg('editlog', $error_wrong_node);
@@ -133,9 +133,9 @@ 
 
                 // check if user has exceeded his top 10% limit
                 $is_top = sqlValue(
-                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape(
+                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape(
                         $usr['userid']
-                    ) . "' AND `cache_id`='" . sql_escape($log_record['cache_id']) . "'",
+                    )."' AND `cache_id`='".sql_escape($log_record['cache_id'])."'",
                     0
                 );
                 $user_founds = sqlValue(
@@ -144,11 +144,11 @@ 
                      LEFT JOIN `stat_user` ON `user`.`user_id`=`stat_user`.`user_id`
                      WHERE `user`.`user_id`='" . sql_escape(
                         $usr['userid']
-                    ) . "'",
+                    )."'",
                     0
                 );
                 $user_tops = sqlValue(
-                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape($usr['userid']) . "'",
+                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape($usr['userid'])."'",
                     0
                 );
 
@@ -156,7 +156,7 @@ 
                     $rating_msg = mb_ereg_replace(
                         '{chk_sel}',
                         ($is_top ? 'checked' : ''),
-                        $rating_allowed . '<br />' . $rating_stat
+                        $rating_allowed.'<br />'.$rating_stat
                     );
                     $rating_msg = mb_ereg_replace('{max}', floor($user_founds * rating_percentage / 100), $rating_msg);
                     $rating_msg = mb_ereg_replace('{curr}', $user_tops, $rating_msg);
@@ -169,14 +169,14 @@ 
                     }
 
                     if ($user_tops) {
-                        $rating_msg .= '<br />' . $rating_maywithdraw;
+                        $rating_msg .= '<br />'.$rating_maywithdraw;
                     }
                 }
 
                 tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl));
 
                 if (isset($_POST['descMode'])) {
-                    $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+                    $descMode = $_POST['descMode'] + 0; // Ocprop: 2
                     if (($descMode < 1) || ($descMode > 3)) {
                         $descMode = 3;
                     }
@@ -325,14 +325,14 @@ 
                     if (is_latest_log($log_record['cache_id'], $log_record['log_id'])) {
                         $newstatus = sqlValue(
                             "SELECT `cache_status` FROM `log_types`
-                             WHERE `id`='" . sql_escape($log_type) . "'",
+                             WHERE `id`='" . sql_escape($log_type)."'",
                             false
                         );
                         if ($newstatus && $newstatus != $log_record['status']) {
                             sql("SET @STATUS_CHANGE_USER_ID='&1'", $login->userid);
                             sql(
-                                "UPDATE `caches` SET `status`='" . sql_escape($newstatus) . "'
-                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id']) . "'"
+                                "UPDATE `caches` SET `status`='".sql_escape($newstatus)."'
+                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id'])."'"
                             );
                         }
                     }
@@ -340,7 +340,7 @@ 
                     //update user-stat if type changed
                     if ($log_record['logtype'] != $log_type) {
                         //call eventhandler
-                        require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                        require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                         event_change_log_type($log_record['cache_id'], $usr['userid'] + 0);
                     }
 
@@ -381,7 +381,7 @@ 
 
                     //display cache page
                     tpl_redirect(
-                        'viewcache.php?cacheid=' . urlencode($log_record['cache_id']) . '&log=A#log' . urlencode(
+                        'viewcache.php?cacheid='.urlencode($log_record['cache_id']).'&log=A#log'.urlencode(
                             $log_id
                         )
                     );
@@ -403,9 +403,9 @@ 
                 $logtypeoptions = '';
                 foreach ($allowed_logtypes as $logtype) {
                     $selected = ($log_record['logtype'] == $logtype ? ' selected="selected"' : '');
-                    $logtypeoptions .= '<option value="' . $logtype . '"' . $selected . '>';
+                    $logtypeoptions .= '<option value="'.$logtype.'"'.$selected.'>';
                     $logtypeoptions .= htmlspecialchars($logtype_names[$logtype], ENT_COMPAT, 'UTF-8');
-                    $logtypeoptions .= '</option>' . "\n";
+                    $logtypeoptions .= '</option>'."\n";
                 }
                 $disable_typechange = $disable_statuschange && $log_record['is_status_log'];
                 tpl_set_var('type_edit_disabled', $disable_typechange ? $type_edit_disabled : '');
@@ -434,7 +434,7 @@ 
                 tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', $log_record['cache_id']);
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
                 tpl_set_var('logid', $log_id);
                 tpl_set_var('date_message', !$date_ok ? $date_message : '');
@@ -448,7 +448,7 @@ 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', (($descMode == 3) ? 1 : 0));
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if ($descMode == 1) {
                     tpl_set_var('descMode', 1);
                 } else {
@@ -456,15 +456,15 @@ 
                         tpl_set_var('descMode', 2);
                     } else {
                         // 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/log.js.php?logid=0&lang=' .
+                        $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/log.js.php?logid=0&lang='.
                             strtolower(
                                 $locale
-                            ) . '"></script>' . "\n";
+                            ).'"></script>'."\n";
                         tpl_set_var('descMode', 3);
                     }
                 }
-                $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);
 
                 if ($use_log_pw == true && $log_pw != '') {
@@ -485,12 +485,12 @@ 
                             $tmp_smiley = $smiley_link;
                             $tmp_smiley = mb_ereg_replace('{smiley_image}', $smiley['image'][$i], $tmp_smiley);
                             $tmp_smiley = mb_ereg_replace('{smiley_symbol}', $smiley['text'][$i], $tmp_smiley);
-                            $smilies = $smilies . '&nbsp;' .
+                            $smilies = $smilies.'&nbsp;'.
                                 mb_ereg_replace(
                                     '{smiley_file}',
                                     $smiley['file'][$i],
                                     $tmp_smiley
-                                ) . '&nbsp;';
+                                ).'&nbsp;';
                         }
                     }
                     tpl_set_var('smileypath', $opt['template']['smiley']);
@@ -517,7 +517,7 @@ 
     $lastest_log_id = sqlValue(
         "
         SELECT `id` FROM `cache_logs`
-        WHERE `cache_id`='" . sql_escape($cache_id) . "'
+        WHERE `cache_id`='" . sql_escape($cache_id)."'
         ORDER BY `order_date` DESC, `date_created` DESC, `id` DESC
         LIMIT 1",
         0,