OpencachingDeutschland / oc-server3

htdocs/lib2/translateAccess.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/logic/const.inc.php';
+require_once __DIR__.'/logic/const.inc.php';
 
 class translateAccess
 {

htdocs/lib2/common.inc.php

Spacing +23 added lines, -23 removed lines

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

htdocs/lib2/smiley.inc.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
     $smiley_a = array();
     for ($n = 0; $n < count($smiley['file']); ++ $n) {
-        $smiley['image'][$n] = '<img src="' . $opt['template']['smiley'] . $smiley['file'][$n] . '" alt="' . $smiley['text'][$n] . '" border="0" width="18px" height="18px" />';
-        $smiley['spaced_image'][$n] = ' ' . $smiley['image'][$n] . ' ';
+        $smiley['image'][$n] = '<img src="'.$opt['template']['smiley'].$smiley['file'][$n].'" alt="'.$smiley['text'][$n].'" border="0" width="18px" height="18px" />';
+        $smiley['spaced_image'][$n] = ' '.$smiley['image'][$n].' ';
         $smiley_a[] = [
             'text' => $smiley['text'][$n],
             'file' => $smiley['file'][$n],

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/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;
 }

Braces +2 added lines, -1 removed lines

@@ -67,7 +67,8 @@
     if (($rBounds = sql_fetch_assoc($rs)) && $rBounds['lat_min'] !== null /* >0 caches */) {
         if ($rBounds['lat_min'] == $rBounds['lat_max'] &&
             $rBounds['lon_min'] == $rBounds['lon_max']
-        ) { // 1 Cache
+        ) {
+// 1 Cache
             $halfwin = 0.02;
             $rBounds['lat_min'] -= $halfwin;
             $rBounds['lat_max'] += $halfwin;

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';

htdocs/lib2/cli.class.php

Spacing +5 added lines, -5 removed lines

@@ -11,30 +11,30 @@
 {
     public function out($str)
     {
-        echo $str . "\n";
+        echo $str."\n";
     }
 
     public function debug($str)
     {
         global $opt;
         if (($opt['debug'] & DEBUG_CLI) == DEBUG_CLI) {
-            echo 'DEBUG: ' . $str . "\n";
+            echo 'DEBUG: '.$str."\n";
         }
     }
 
     public function warn($str)
     {
-        echo 'WARN: ' . $str . "\n";
+        echo 'WARN: '.$str."\n";
     }
 
     public function error($str)
     {
-        echo 'ERROR: ' . $str . "\n";
+        echo 'ERROR: '.$str."\n";
     }
 
     public function fatal($str)
     {
-        echo 'FATAL: ' . $str . "\n";
+        echo 'FATAL: '.$str."\n";
         exit;
     }
 }