OpencachingDeutschland / oc-server3

htdocs/lib2/search/search.txt.inc.php

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@ 
 
         if ($r['html'] == 0) {
             $thisline = mb_ereg_replace('{htmlwarn}', '', $thisline);
-            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', decodeEntities(strip_tags($r['desc'])).$license, $thisline);
         } else {
             $thisline = mb_ereg_replace('{htmlwarn}', " ($converted_from_html)", $thisline);
-            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']) . $license, $thisline);
+            $thisline = mb_ereg_replace('{desc}', html2txt($r['desc']).$license, $thisline);
         }
 
         $thisline = mb_ereg_replace('{type}', $r['type'], $thisline);
@@ -197,7 +197,7 @@ 
                 $thislog = mb_ereg_replace('{text}', html2txt($rLog['text']), $thislog);
             }
 
-            $logentries .= $thislog . "\n";
+            $logentries .= $thislog."\n";
         }
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
@@ -205,7 +205,7 @@ 
         if (!$bUseZip) {
             echo $thisline;
         } else {
-            $phpzip->add_data($r['waypoint'] . '.txt', $thisline);
+            $phpzip->add_data($r['waypoint'].'.txt', $thisline);
         }
     }
     mysql_free_result($rs);

htdocs/lib2/search/search.kml.inc.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     $kmlLine =
         '
 <Placemark>
-  <description><![CDATA[' . $t_by . ' {username}<br><br><a href="' . $opt['page']['default_absolute_url'] . 'viewcache.php?cacheid={cacheid}">' . $t_showdesc . '</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>' . $t_type . ' {type}<br>' . $t_size . ' {size}</td></tr><tr><td colspan="2">' . $t_difficulty . '<br>' . $t_terrain . '</td></tr></table>]]></description>
+  <description><![CDATA[' . $t_by.' {username}<br><br><a href="'.$opt['page']['default_absolute_url'].'viewcache.php?cacheid={cacheid}">'.$t_showdesc.'</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>'.$t_type.' {type}<br>'.$t_size.' {size}</td></tr><tr><td colspan="2">'.$t_difficulty.'<br>'.$t_terrain.'</td></tr></table>]]></description>
   <name>{name}{archivedflag}</name>
   <LookAt>
     <longitude>{lon}</longitude>
@@ -34,7 +34,7 @@ 
   <Point>
     <coordinates>{lon},{lat},0</coordinates>
   </Point>
-  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by . ' {username}</Snippet>
+  <Snippet>D: {difficulty}/T: {terrain} {size}  ' . $t_by.' {username}</Snippet>
 </Placemark>
 ';
 
@@ -93,7 +93,7 @@ 
 
     while ($r = sql_fetch_array($rs)) {
         $thisline = $kmlLine;
-        $typeimgurl = '<img src="{urlbase}resource2/' . $style . '/images/cacheicon/' . $r['icon_large'] . '" alt="' . $r['typedesc'] . '" title="' . $r['typedesc'] . '" />';
+        $typeimgurl = '<img src="{urlbase}resource2/'.$style.'/images/cacheicon/'.$r['icon_large'].'" alt="'.$r['typedesc'].'" title="'.$r['typedesc'].'" />';
 
         $thisline = mb_ereg_replace('{icon}', $r['kml_name'], $thisline);
         $thisline = mb_ereg_replace('{typeimgurl}', $typeimgurl, $thisline);
@@ -111,11 +111,11 @@ 
 
         if (($r['status'] == 2) || ($r['status'] == 3) || ($r['status'] == 6)) {
             if ($r['status'] == 2) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_temporarily_na . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_temporarily_na.')', $thisline);
             } elseif ($r['status'] == 3) {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_archived . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_archived.')', $thisline);
             } else {
-                $thisline = mb_ereg_replace('{archivedflag}', ' (' . $state_locked . ')', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', ' ('.$state_locked.')', $thisline);
             }
         } else {
             $thisline = mb_ereg_replace('{archivedflag}', '', $thisline);

htdocs/lib2/search/search.loc.inc.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
     $server_domain = $opt['page']['domain'];
     $server_address = $opt['page']['default_absolute_url'];
 
-    $locHead = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><loc version="1.0" src="' . $server_domain . '">' . "\n";
+    $locHead = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><loc version="1.0" src="'.$server_domain.'">'."\n";
 
     $locLine =
         '
@@ -27,7 +27,7 @@ 
     <name id="{waypoint}"><![CDATA[{archivedflag}{name} by {username}]]></name>
     <coord lat="{lat}" lon="{lon}"/>
     <type>Geocache</type>
-    <link text="Beschreibung">' . $server_address . 'viewcache.php?cacheid={cacheid}</link>
+    <link text="Beschreibung">' . $server_address.'viewcache.php?cacheid={cacheid}</link>
 </waypoint>
 ';
 
@@ -78,11 +78,11 @@ 
 
         if (($r['status'] == 2) || ($r['status'] == 3) || ($r['status'] == 6)) {
             if ($r['status'] == 2) {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_temporarily_na . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_temporarily_na.'!, ', $thisline);
             } elseif ($r['status'] == 3) {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_archived . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_archived.'!, ', $thisline);
             } else {
-                $thisline = mb_ereg_replace('{archivedflag}', $state_locked . '!, ', $thisline);
+                $thisline = mb_ereg_replace('{archivedflag}', $state_locked.'!, ', $thisline);
             }
         } else {
             $thisline = mb_ereg_replace('{archivedflag}', '', $thisline);

htdocs/lib2/search/ftsearch.inc.php

Spacing +3 added lines, -3 removed lines

@@ -188,7 +188,7 @@ 
     $str = '';
 
     ftsearch_load_ignores();
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
         // ignore?
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
             unset($astr[$i]);
@@ -237,11 +237,11 @@ 
     }
 
     // doppelte chars ersetzen
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
         $old_str = '';
         while ($old_str != $str) {
             $old_str = $str;
-            $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
+            $str = mb_ereg_replace(chr($c).chr($c), chr($c), $str);
         }
         $old_str = '';
     }

htdocs/lib2/search/search.html.inc.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
                     LEFT JOIN `caches_attributes` AS `tbloconly`
                            ON `caches`.`cache_id`=`tbloconly`.`cache_id` AND `tbloconly`.`attrib_id`=6
                     LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id`
-                          AND `stt`.`lang`=\'' . sql_escape($opt['template']['locale']) . '\'';
+                          AND `stt`.`lang`=\'' . sql_escape($opt['template']['locale']).'\'';
 
 
 function search_output()
@@ -38,11 +38,11 @@ 
     $tpl->menuitem = MNU_CACHES_SEARCH_RESULT;
 
     $startat = floor($startat / $caches_per_page) * $caches_per_page;
-    $sql .= ' LIMIT ' . $startat . ', ' . $caches_per_page;
+    $sql .= ' LIMIT '.$startat.', '.$caches_per_page;
 
     // run SQL query
     sql_enable_foundrows();
-    $rs_caches = sql_slave("SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS " . $sql);
+    $rs_caches = sql_slave("SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS ".$sql);
     $resultcount = sql_value_slave('SELECT FOUND_ROWS()', 0);
     sql_foundrows_done();
     $tpl->assign('results_count', $resultcount);
@@ -95,13 +95,13 @@ 
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {
             $ownlogs = "";
         } else {
-            $ownlogs = " AND `cache_logs`.`user_id`='" . sql_escape($login->userid) . "'";
+            $ownlogs = " AND `cache_logs`.`user_id`='".sql_escape($login->userid)."'";
         }
         $sql = "
                 SELECT `cache_logs`.`id`, `cache_logs`.`type`, `cache_logs`.`date`, `log_types`.`icon_small`
                 FROM `cache_logs`, `log_types`
-                WHERE `cache_logs`.`cache_id`='" . sql_escape($rCache['cache_id']) . "'
-                      AND `log_types`.`id`=`cache_logs`.`type`" . $ownlogs . "
+                WHERE `cache_logs`.`cache_id`='" . sql_escape($rCache['cache_id'])."'
+                      AND `log_types`.`id`=`cache_logs`.`type`" . $ownlogs."
                 ORDER BY `cache_logs`.`order_date` DESC, `cache_logs`.`date_created` DESC, `cache_logs`.`id` DESC
                 LIMIT 6";
         $rs = sql_slave($sql);
@@ -138,12 +138,12 @@ 
 
     $tpl->assign('caches', $caches);
 
-    $page = 'search.php?queryid=' . $options['queryid'] . '&startat={offset}&sortby=' . $options['sort'];
+    $page = 'search.php?queryid='.$options['queryid'].'&startat={offset}&sortby='.$options['sort'];
     if (isset($options['sortorder']) && $options['sortorder']) {
-        $page .= "&sortorder=" . $options['sortorder'];
+        $page .= "&sortorder=".$options['sortorder'];
     }
     if (isset($options['creationdate']) && $options['creationdate']) {
-        $page .= "&creationdate=" . $options['creationdate'];
+        $page .= "&creationdate=".$options['creationdate'];
     }
     $pager = new pager($page, 2, 9);
     $pager->make_from_offset($startat, $resultcount, $caches_per_page);

htdocs/lib2/search/search.xml.inc.php

Spacing +9 added lines, -9 removed lines

@@ -35,13 +35,13 @@ 
         <status id=\"{statusid}\">{status}</status>
         <lon value=\"{lonvalue}\">{lon}</lon>
         <lat value=\"{latvalue}\">{lat}</lat>
-        <distance unit=\"" . $distance_unit . "\">{distance}</distance>
+        <distance unit=\"" . $distance_unit."\">{distance}</distance>
         <type id=\"{typeid}\">{type}</type>
         <difficulty>{difficulty}</difficulty>
         <terrain>{terrain}</terrain>
         <size id=\"{sizeid}\">{container}</size>
         <country id=\"{countryid}\">{country}</country>
-        <link><![CDATA[" . $opt['page']['default_absolute_url'] . "viewcache.php?wp={waypoint}]]></link>
+        <link><![CDATA[" . $opt['page']['default_absolute_url']."viewcache.php?wp={waypoint}]]></link>
         <desc><![CDATA[{shortdesc}]]></desc>
         <hints><![CDATA[{hints}]]></hints>
     </cache>
@@ -49,7 +49,7 @@ 
 
     // create temporary table
     sql_temp_table_slave('searchtmp');
-    sql_slave('CREATE TEMPORARY TABLE &searchtmp SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS ' . $sql . $sqlLimit);
+    sql_slave('CREATE TEMPORARY TABLE &searchtmp SELECT SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS '.$sql.$sqlLimit);
 
     $resultcount = sql_value_slave('SELECT FOUND_ROWS()', 0);
 
@@ -59,17 +59,17 @@ 
 
     // start output
     if (!$db['debug']) {
-        header("Content-type: application/xml; charset=" . $encoding);
+        header("Content-type: application/xml; charset=".$encoding);
         //header("Content-Disposition: attachment; filename=" . $sFilebasename . ".txt");
 
-        echo "<?xml version=\"1.0\" encoding=\"" . $encoding . "\"?>\n";
+        echo "<?xml version=\"1.0\" encoding=\"".$encoding."\"?>\n";
         echo "<result>\n";
 
         echo "    <docinfo>\n";
-        echo "        <results>" . $rCount['count'] . "</results>\n";
-        echo "        <startat>" . $startat . "</startat>\n";
-        echo "        <perpage>" . $count . "</perpage>\n";
-        echo "        <total>" . $resultcount . "</total>\n";
+        echo "        <results>".$rCount['count']."</results>\n";
+        echo "        <startat>".$startat."</startat>\n";
+        echo "        <perpage>".$count."</perpage>\n";
+        echo "        <total>".$resultcount."</total>\n";
         echo "    </docinfo>\n";
     }
 

htdocs/lib2/search/search.inc.php

Spacing +6 added lines, -6 removed lines

@@ -156,8 +156,8 @@ 
     }
 
     // doppelte chars ersetzen
-    for ($c = ord('a'); $c <= ord('z'); $c ++) {
-        $str = mb_ereg_replace(chr($c) . chr($c), chr($c), $str);
+    for ($c = ord('a'); $c <= ord('z'); $c++) {
+        $str = mb_ereg_replace(chr($c).chr($c), chr($c), $str);
     }
 
     return $str;
@@ -257,14 +257,14 @@ 
 {
     global $opt;
 
-    $desclangs = ',' . $rCache['desc_languages'] . ',';
+    $desclangs = ','.$rCache['desc_languages'].',';
     $desclang = $rCache['desc_language'];
 
-    if (strpos($desclangs, ',' . $opt['template']['locale'] . ',') !== false) {
+    if (strpos($desclangs, ','.$opt['template']['locale'].',') !== false) {
         $desclang = $opt['template']['locale'];
-    } elseif (strpos($desclangs, ',' . $opt['template']['default']['locale'] . ',') !== false) {
+    } elseif (strpos($desclangs, ','.$opt['template']['default']['locale'].',') !== false) {
         $desclang = $opt['template']['default']['locale'];
-    } elseif (strpos($desclangs, ',' . $opt['template']['default']['fallback_locale'] . ',') !== false) {
+    } elseif (strpos($desclangs, ','.$opt['template']['default']['fallback_locale'].',') !== false) {
         $desclang = $opt['template']['default']['fallback_locale'];
     } elseif (strpos($desclangs, ',EN,') !== false) {
         $desclang = 'EN';

htdocs/lib2/search/search.map2.inc.php

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
     $tpl->error(ERROR_INVALID_OPERATION);
 }
 
-$sqlchecksum = sprintf('%u', crc32($cachesFilter . "\n" . $sqlFilter));
+$sqlchecksum = sprintf('%u', crc32($cachesFilter."\n".$sqlFilter));
 
 // check if query was already executed within the cache period
 $rsMapCache = sql(
@@ -28,12 +28,12 @@ 
 );
 if ($rMapCache = sql_fetch_assoc($rsMapCache)) {
     $resultId = $rMapCache['result_id'];
-    sql("UPDATE `map2_result` SET `shared_counter`=`shared_counter`+1 WHERE `result_id`='" . ($resultId + 0) . "'");
+    sql("UPDATE `map2_result` SET `shared_counter`=`shared_counter`+1 WHERE `result_id`='".($resultId + 0)."'");
 } else {
     // ensure that query is performed without errors before reserving the result_id
     sql_temp_table_slave('tmpmapresult');
     sql_slave("CREATE TEMPORARY TABLE &tmpmapresult (`cache_id` INT UNSIGNED NOT NULL, PRIMARY KEY (`cache_id`)) ENGINE=MEMORY");
-    sql_slave("INSERT INTO &tmpmapresult (`cache_id`) " . $sqlFilter);
+    sql_slave("INSERT INTO &tmpmapresult (`cache_id`) ".$sqlFilter);
 
     sql(
         "
@@ -41,7 +41,7 @@ 
         VALUES ('&1', '&2', '&3', NOW(), NOW())",
         $db['slave_id'],
         $sqlchecksum,
-        $cachesFilter . "\n" . $sqlFilter
+        $cachesFilter."\n".$sqlFilter
     );
     $resultId = sql_insert_id();
 
@@ -74,11 +74,11 @@ 
             $rBounds['lon_min'] -= $halfwin;
             $rBounds['lon_max'] += $halfwin;
         }
-        $bounds_param = "&lat_min=" . round($rBounds['lat_min'], 5) . "&lat_max=" . round($rBounds['lat_max'], 5) . '&lon_min=' . round($rBounds['lon_min'], 5) . '&lon_max=' . round($rBounds['lon_max'], 5);
+        $bounds_param = "&lat_min=".round($rBounds['lat_min'], 5)."&lat_max=".round($rBounds['lat_max'], 5).'&lon_min='.round($rBounds['lon_min'], 5).'&lon_max='.round($rBounds['lon_max'], 5);
     }
     sql_free_result($rs);
 
-    $tpl->redirect('map2.php?queryid=' . $options['queryid'] . '&resultid=' . $resultId . $bounds_param);
+    $tpl->redirect('map2.php?queryid='.$options['queryid'].'&resultid='.$resultId.$bounds_param);
 } else {
     echo $resultId;
 }

htdocs/lib2/search/search.ovl.inc.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * OVL search output for TOP25, TOP50 etc.
  ****************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/charset.inc.php';
+require_once $opt['rootpath'].'lib2/charset.inc.php';
 
 $search_output_file_download = true;
 $content_type_plain = 'application/ovl';