OpencachingDeutschland / oc-server3

htdocs/util2/geodb/make_searchindex.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once __DIR__ . '/../../lib2/cli.inc.php';
-require_once __DIR__ . '/../../lib2/search/search.inc.php';
+require_once __DIR__.'/../../lib2/cli.inc.php';
+require_once __DIR__.'/../../lib2/search/search.inc.php';
 
 
 sql('DELETE FROM geodb_search');
@@ -30,7 +30,7 @@ 
     foreach ($simpletextsarray as $text) {
         if ($text != '') {
             if (nonalpha($text)) {
-                die($text . "\n");
+                die($text."\n");
             }
 
             $simpletext = search_text2simple($text);
@@ -50,7 +50,7 @@ 
 
 function nonalpha($str)
 {
-    for ($i = 0; $i < mb_strlen($str); $i ++) {
+    for ($i = 0; $i < mb_strlen($str); $i++) {
         if (!((ord(mb_substr($str, $i, 1)) >= ord('a')) && (ord(mb_substr($str, $i, 1)) <= ord('z')))) {
             return true;
         }

htdocs/util2/google-earth/caches.php

Spacing +10 added lines, -10 removed lines

@@ -10,8 +10,8 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
-require $opt['rootpath'] . 'templates2/ocstyle/search.tpl.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
+require $opt['rootpath'].'templates2/ocstyle/search.tpl.inc.php';
 
 $bbox = isset($_REQUEST['BBOX']) ? $_REQUEST['BBOX'] : '0,0,0,0';
 $abox = mb_split(',', $bbox);
@@ -46,7 +46,7 @@ 
 $kmlLine =
     '
 <Placemark>
-  <description><![CDATA[' . $t_by . ' {username}<br><br><a href="{urlbase}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="{urlbase}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}</name>
   <LookAt>
     <longitude>{lon}</longitude>
@@ -236,7 +236,7 @@ 
         $nCount = $nCount + 1;
         $thisline = $kmlLine;
 
-        $typeimgurl = '<img src="' . $opt['page']['default_absolute_url'] . 'resource2/' . $opt['template']['style'] . '/images/cacheicon/' . $r['icon_large'] . '" alt="' . $r['typedesc'] . '" title="' . $r['typedesc'] . '" />';
+        $typeimgurl = '<img src="'.$opt['page']['default_absolute_url'].'resource2/'.$opt['template']['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);
@@ -313,15 +313,15 @@ 
     // prepare lines
     $sZoomIn = str_replace("\r", "", $sZoomIn);
     $sLines = mb_split("\n", $sZoomIn);
-    for ($i = 0; $i < count($sLines); $i ++) {
+    for ($i = 0; $i < count($sLines); $i++) {
         $sLines[$i] = str_pad($sLines[$i], ($nColumnsCount - 1), ' ');
     }
 
     $nDegreePerLine = ($lat_to - $lat_from) / count($sLines);
     $nDegreePerColumn = ($lon_to - $lon_from) / $nColumnsCount;
 
-    for ($nLine = 0; $nLine < count($sLines); $nLine ++) {
-        for ($nColumn = 0; $nColumn < $nColumnsCount; $nColumn ++) {
+    for ($nLine = 0; $nLine < count($sLines); $nLine++) {
+        for ($nColumn = 0; $nColumn < $nColumnsCount; $nColumn++) {
             if (substr($sLines[$nLine], $nColumn, 1) == '#') {
                 $nLat = $lat_to - $nDegreePerLine * $nLine;
                 $nLon = $lon_from + $nDegreePerColumn * $nColumn;
@@ -331,14 +331,14 @@ 
                     <description><![CDATA[You have to zoom in to see the Geocaches]]></description>
                     <name></name>
                     <LookAt>
-                        <longitude>' . $nLon . '</longitude>
-                        <latitude>' . $nLat . '</latitude>
+                        <longitude>' . $nLon.'</longitude>
+                        <latitude>' . $nLat.'</latitude>
                         <range>5000</range>
                         <tilt>0</tilt>
                         <heading>3</heading>
                     </LookAt>
                     <Point>
-                        <coordinates>' . $nLon . ',' . $nLat . ',0</coordinates>
+                        <coordinates>' . $nLon.','.$nLat.',0</coordinates>
                     </Point>
                 </Placemark>
                 ';

htdocs/util2/cron/fill_search_index.php

Spacing +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
  ****************************************************************************/
 
 // needs absolute rootpath because called as cronjob
-$opt['rootpath'] = __DIR__ . '/../../';
+$opt['rootpath'] = __DIR__.'/../../';
 
-require __DIR__ . '/../../lib2/cli.inc.php';
-require __DIR__ . '/../../lib2/search/ftsearch.inc.php';
+require __DIR__.'/../../lib2/cli.inc.php';
+require __DIR__.'/../../lib2/search/ftsearch.inc.php';
 
 if (!cronjobs_enabled()) {
     exit;

htdocs/util2/cron/modules/gcwp_update.class.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 class gcwp_update
 {
     public $name = 'gcwp_update';
-    public $interval = 3600;  // every hour
+    public $interval = 3600; // every hour
 
 
     public function run()
@@ -26,7 +26,7 @@ 
         foreach ($opt['cron']['gcwp']['sources'] as $source) {
             $wpdata = @file($source);
             if ($wpdata === false) {
-                echo 'gcwp_update: error reading ' . $source . "\n";
+                echo 'gcwp_update: error reading '.$source."\n";
                 $errors = true;
             } else {
                 foreach ($wpdata as $line) {
@@ -48,7 +48,7 @@ 
                 "
                     UPDATE caches
                     SET wp_gc_maintained = UCASE(TRIM(wp_gc))
-                    WHERE wp_oc NOT IN ('" . implode("','", $ocwp_imported) . "')"
+                    WHERE wp_oc NOT IN ('" . implode("','", $ocwp_imported)."')"
             );
         }
     }

htdocs/util2/cron/modules/autoarchive_caches.class.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 class autoarchive
 {
     public $name = 'autoarchive';
-    public $interval = 43200;  // twice per day
+    public $interval = 43200; // twice per day
 
 
     public function run()
@@ -21,12 +21,12 @@ 
 
         if ($opt['cron']['autoarchive']['run']) {
             if (!$login->logged_in()) {
-                echo $this->name . ": not logged in / no system user configured\n";
+                echo $this->name.": not logged in / no system user configured\n";
             } elseif ($login->hasAdminPriv(ADMIN_USER)) {
                 $this->archive_disabled_caches();
                 $this->archive_events();
             } else {
-                echo $this->name . ": user '" . $opt['logic']['systemuser']['user'] . "' cannot maintain caches\n";
+                echo $this->name.": user '".$opt['logic']['systemuser']['user']."' cannot maintain caches\n";
             }
         }
     }
@@ -80,12 +80,12 @@ 
                 $months = ($rCache['listing_age'] > 366 ? 12 : 6);
                 $this->archive_cache(
                     $rCache['cache_id'],
-                    'This cache has been "temporarily unavailable" for more than %1 months now; ' .
-                    'therefore it is being archived automatically. The owner may decide to ' .
+                    'This cache has been "temporarily unavailable" for more than %1 months now; '.
+                    'therefore it is being archived automatically. The owner may decide to '.
                     'maintain the cache and re-enable the listing.',
                     $months
                 );
-                ++ $archived;
+                ++$archived;
 
                 // This limit throttles archiving. If something goes wrong, it won't
                 // produce too much trouble.
@@ -113,8 +113,8 @@ 
         while ($rCache = sql_fetch_assoc($rs)) {
             $this->archive_cache(
                 $rCache['cache_id'],
-                'This event took place more than five weeks ago; therefore it is ' .
-                'being archived automatically. The owner may re-enable the listing ' .
+                'This event took place more than five weeks ago; therefore it is '.
+                'being archived automatically. The owner may re-enable the listing '.
                 'if it should stay active for some exceptional reason.'
             );
         }
@@ -127,11 +127,11 @@ 
 
         $log = cachelog::createNew($cache_id, $login->userid);
         if ($log === false) {
-            echo $this->name . ": cannot create log for cache $cache_id\n";
+            echo $this->name.": cannot create log for cache $cache_id\n";
         } else {
             $cache = new cache($cache_id);
             if (!$cache->setStatus(3) || !$cache->save()) {
-                echo $this->name . ": cannot change status of cache $cache_id\n";
+                echo $this->name.": cannot change status of cache $cache_id\n";
             } else {
                 // create log
                 $log->setType(cachelog::LOGTYPE_ARCHIVED, true);
@@ -143,11 +143,11 @@ 
                 // create log text in appropriate language
                 $translated_comment = $translate->t($comment, '', '', 0, '', 1, $cache->getDefaultDescLanguage());
                 $translated_comment = str_replace('%1', $months, $translated_comment);
-                $log->setText('<p>' . $translated_comment . '</p>');
+                $log->setText('<p>'.$translated_comment.'</p>');
                 $log->setTextHtml(1);
 
                 if (!$log->save()) {
-                    echo $this->name . ": could not save archive log for cache $cache_id\n";
+                    echo $this->name.": could not save archive log for cache $cache_id\n";
                 }
             }
         }

htdocs/util2/cron/modules/okapi_cleanup.class.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     {
         global $opt;
 
-        $files = glob($opt['okapi']['var_dir'] . '/garmin*.zip');
+        $files = glob($opt['okapi']['var_dir'].'/garmin*.zip');
         foreach ($files as $file) {
             // delete old download files after 24 hours; this large interval filters out any
             // timezone mismatches in file sysytems (e.g. on unconventional development

htdocs/util2/cron/modules/cache_npa_areas.class.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@ 
             $rsLayers = sql(
                 "SELECT `id`, `type_id`, AsText(`shape`) AS `geometry`
                 FROM `npa_areas` WHERE `exclude`=0 AND MBRWITHIN(GeomFromText('&1'), `shape`)",
-                'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')'
+                'POINT('.$rCache['longitude'].' '.$rCache['latitude'].')'
             );
             while ($rLayers = sql_fetch_assoc($rsLayers)) {
                 if (gis::ptInLineRing(
                     $rLayers['geometry'],
-                    'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')'
+                    'POINT('.$rCache['longitude'].' '.$rCache['latitude'].')'
                 )
                 ) {
                     $bExclude = false;
@@ -44,12 +44,12 @@ 
                         AND `type_id`='&1'
                         AND MBRWITHIN(GeomFromText('&2'), `shape`)",
                         $rLayers['type_id'],
-                        'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')'
+                        'POINT('.$rCache['longitude'].' '.$rCache['latitude'].')'
                     );
                     while (($rExclude = sql_fetch_assoc($rsExclude)) && ($bExclude == false)) {
                         if (gis::ptInLineRing(
                             $rExclude['geometry'],
-                            'POINT(' . $rCache['longitude'] . ' ' . $rCache['latitude'] . ')'
+                            'POINT('.$rCache['longitude'].' '.$rCache['latitude'].')'
                         )
                         ) {
                             $bExclude = true;

htdocs/util2/cron/modules/orphan_cleanup.class.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 class orphan_cleanup
 {
     public $name = 'orphan_cleanup';
-    public $interval = 86400;   // once per day
+    public $interval = 86400; // once per day
 
     public function run()
     {
@@ -35,7 +35,7 @@ 
                 "DELETE FROM `xmlsession_data`
                  WHERE `session_id` IN (SELECT `session_id` FROM &tmpsessiondata)"
             );
-            echo 'orphan_cleanup: dropped ' . $count . " record(s) from xmlsession_data\n";
+            echo 'orphan_cleanup: dropped '.$count." record(s) from xmlsession_data\n";
         }
         sql_drop_temp_table('tmpsessiondata');
 
@@ -57,7 +57,7 @@ 
                 "DELETE FROM `map2_data`
                  WHERE `result_id` IN (SELECT `result_id` FROM &tmpsessiondata)"
             );
-            echo 'orphan_cleanup: dropped ' . $count . " record(s) from map2_data\n";
+            echo 'orphan_cleanup: dropped '.$count." record(s) from map2_data\n";
         }
         sql_drop_temp_table('tmpsessiondata');
     }

htdocs/util2/cron/modules/picture_cleanup.class.php

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
             }
 
             for ($n = 1; $n < count($instances); ++ $n) {
-                if ($instances[$n]['filesize'] !== false) {// ensure that pic is stored locally
+                if ($instances[$n]['filesize'] !== false) {
+// ensure that pic is stored locally
                     for ($nn = $n - 1; $nn >= 0; -- $nn) {
                         if ($instances[$nn]['filesize'] === $instances[$n]['filesize']) {
                             if (file_get_contents($instances[$nn]['pic']->getFilename())

Spacing +3 added lines, -3 removed lines

@@ -51,9 +51,9 @@
                                 $picture = $instances[$n]['pic'];
                                 echo
                                     'deleting duplicate picture '
-                                    . $picture->getPictureId() . ' ("' . $picture->getTitle() . '")'
-                                    . ' from log ' . $rDuplicatePic['object_id']
-                                    . ' of cache ' . $instances[$n]['cache_id'] . "\n";
+                                    . $picture->getPictureId().' ("'.$picture->getTitle().'")'
+                                    . ' from log '.$rDuplicatePic['object_id']
+                                    . ' of cache '.$instances[$n]['cache_id']."\n";
                                 $picture->delete(false);
                                 $instances[$n]['filesize'] = false;
                                 break;