OpencachingDeutschland / oc-server3

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/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,

htdocs/newcaches.php

Spacing +11 added lines, -12 removed lines

@@ -5,15 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newcaches';
 $tpl->menuitem = MNU_START_NEWCACHES;
 $tpl->change_country_inpage = true;
 
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
 $bEvents = ($cachetype == 6);
 
@@ -24,14 +23,14 @@ 
 }
 
 $tpl->caching = true;
-$tpl->cache_id = $startat . "-" . $country . "-" . $cachetype;
+$tpl->cache_id = $startat."-".$country."-".$cachetype;
 $tpl->cache_lifetime = 300;
 if ($startat > 10 * $perpage) {
     $tpl->cache_lifetime = 3600;
 }
 
 if (!$tpl->is_cached()) {
-    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = " . sql_escape($cachetype) : "");
+    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = ".sql_escape($cachetype) : "");
     if ($bEvents) {
         $cachetype_condition .= " AND `date_hidden` >= curdate()";
     }
@@ -50,14 +49,14 @@ 
             INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
              LEFT JOIN `countries` ON `countries`.`short` = `caches`.`country`
              LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
-                       AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
+                       AND `sys_trans_text`.`lang` = '".sql_escape($opt['template']['locale'])."'
              LEFT JOIN `caches_attributes` `ca`
                   ON `ca`.`cache_id`=`caches`.`cache_id`
                   AND `ca`.`attrib_id`=6
-             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='" . sql_escape($country) . "'" : "") .
-        $cachetype_condition . "
+             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='".sql_escape($country)."'" : "").
+        $cachetype_condition."
               ORDER BY `caches`.`$date_field` $sort_order
-                   LIMIT " . sprintf("%d", $startat) . ',
+                   LIMIT ".sprintf("%d", $startat).',
                    ' . ($perpage + 0)
     );
     // see also write_newcaches_urls() in sitemap.class.php
@@ -70,8 +69,8 @@ 
     $startat = isset($_REQUEST['startat']) ? $_REQUEST['startat'] + 0 : 0;
     $cacheype_par = ($cachetype ? "&cachetype=$cachetype" : "");
     if ($country == '') {
-        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1" . $cachetype_condition, 0);
-        $pager = new pager("newcaches.php?startat={offset}" . $cacheype_par);
+        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1".$cachetype_condition, 0);
+        $pager = new pager("newcaches.php?startat={offset}".$cacheype_par);
     } else {
         $count = sql_value_slave(
             "SELECT COUNT(*)
@@ -81,7 +80,7 @@ 
             0,
             $country
         );
-        $pager = new pager("newcaches.php?country=" . $country . "&startat={offset}" . $cacheype_par);
+        $pager = new pager("newcaches.php?country=".$country."&startat={offset}".$cacheype_par);
     }
     $pager->make_from_offset($startat, $count, 100);
 

htdocs/okapi_settings.php

Spacing +11 added lines, -11 removed lines

@@ -16,24 +16,24 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
-    require $opt['rootpath'] . 'config2/settings-dist.inc.php';
-    require $opt['rootpath'] . 'config2/settings.inc.php';
+    require $opt['rootpath'].'lib2/const.inc.php'; # (into the *local* scope!)
+    require $opt['rootpath'].'config2/settings-dist.inc.php';
+    require $opt['rootpath'].'config2/settings.inc.php';
     
     return array(
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
         'ADMINS'           => array($opt['db']['warn']['mail'], 'rygielski@mimuw.edu.pl'),
         'FROM_FIELD'       => $opt['mail']['contact'],
-        'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
+        'DATA_LICENSE_URL' => $opt['page']['absolute_url'].$opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                           => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -43,16 +43,16 @@ 
         'TIMEZONE'         => $opt['php']['timezone'],
         'SITE_URL'         => $opt['page']['absolute_url'],
         'REGISTRATION_URL' => $opt['page']['https']['mode'] != HTTPS_DISABLED
-                                  ? 'https://' . $opt['page']['domain'] . '/register.php'
-                                  : $opt['page']['absolute_url'] . 'register.php',
+                                  ? 'https://'.$opt['page']['domain'].'/register.php'
+                                  : $opt['page']['absolute_url'].'register.php',
         'VAR_DIR'          => $opt['okapi']['var_dir'],
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/').'/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
-        'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'SITE_LOGO'        => $opt['page']['absolute_url'].'resource2/'.$opt['template']['default']['style'].'/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
-        'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
+        'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],

htdocs/a.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  *  Activation page shortcut to keep URLs in activation Emails short
  ***************************************************************************/
 
-require __DIR__ . '/activation.php';
+require __DIR__.'/activation.php';

htdocs/log.php

Spacing +10 added lines, -10 removed lines

@@ -11,11 +11,11 @@ 
 }
 
 // include librarys
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/cache.class.php';
-require_once __DIR__ . '/lib2/logic/user.class.php';
-require_once __DIR__ . '/lib2/logic/cachelog.class.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/cache.class.php';
+require_once __DIR__.'/lib2/logic/user.class.php';
+require_once __DIR__.'/lib2/logic/cachelog.class.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // prepare template and menue
 $tpl->name = 'log_cache';
@@ -121,7 +121,7 @@ 
     // get logtext editormode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -146,7 +146,7 @@ 
     if ($descMode == 3) {
         $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
         $tpl->add_header_javascript(
-            'resource2/tinymce/config/log.js.php?lang=' . strtolower($opt['template']['locale'])
+            'resource2/tinymce/config/log.js.php?lang='.strtolower($opt['template']['locale'])
         );
     }
     $tpl->add_header_javascript(editorJsPath());
@@ -158,7 +158,7 @@ 
     if (is_numeric($logDateMonth)
         && is_numeric($logDateDay)
         && is_numeric($logDateYear)
-        && ($logTimeHour . $logTimeMinute == "" || is_numeric($logTimeHour))
+        && ($logTimeHour.$logTimeMinute == "" || is_numeric($logTimeHour))
         && ($logTimeMinute == "" || is_numeric($logTimeMinute))
     ) {
         $validate['dateOk'] = checkdate($logDateMonth, $logDateDay, $logDateYear)
@@ -223,7 +223,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
+        $logTimeSecond = ($logTimeHour.$logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
 
@@ -279,7 +279,7 @@ 
         }
 
         // finished, redirect to listing
-        $tpl->redirect('viewcache.php?cacheid=' . $cache->getCacheId());
+        $tpl->redirect('viewcache.php?cacheid='.$cache->getCacheId());
     }
 
     // assign values to template