OpencachingDeutschland / oc-server3

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

Spacing +4 added lines, -4 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -27,15 +27,15 @@
                     $result = 'ok';
                 } else {
                     $result = @file_get_contents(
-                        $opt['cron']['gcwp']['report'] .
-                        '?ocwp=' . urlencode($r['wp_oc']) .
-                        '&gcwp=' . urlencode($r['wp_external']) .
-                        '&source=' . urlencode($r['source'])
+                        $opt['cron']['gcwp']['report'].
+                        '?ocwp='.urlencode($r['wp_oc']).
+                        '&gcwp='.urlencode($r['wp_external']).
+                        '&source='.urlencode($r['source'])
                     );
                     $result = trim($result);
                 }
                 if ($result != 'ok') {
-                    echo "could not push GC waypoint report (id " . $r['report_id'] . "): " . $result . "\n";
+                    echo "could not push GC waypoint report (id ".$r['report_id']."): ".$result."\n";
                     break;
                 } else {
                     sql(

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

Spacing +9 added lines, -9 removed lines

@@ -42,17 +42,17 @@ 
     {
         global $opt;
 
-        if (!@mkdir(__DIR__ . '/../../../cache2/geokrety')) {
+        if (!@mkdir(__DIR__.'/../../../cache2/geokrety')) {
             // die('can\'t create geogrety cache dir');
         }
-        $path = __DIR__ . '/../../../cache2/geokrety/import-' . date('Ymd-His') . '.xml';
+        $path = __DIR__.'/../../../cache2/geokrety/import-'.date('Ymd-His').'.xml';
 
         // Changed default-value for getSysConfig() from '2005-01-01 00:00:00' to 'NOW - 9d 12h'
         // to safely stay in api-limit, even when client and server are in different time zones.
         $modifiedsince = strtotime(
             getSysConfig('geokrety_lastupdate', date($opt['db']['dateformat'], time() - 60 * 60 * 24 * 9.5))
         );
-        if (!@copy('http://geokrety.org/export.php?modifiedsince=' . date('YmdHis', $modifiedsince - 1), $path)) {
+        if (!@copy('http://geokrety.org/export.php?modifiedsince='.date('YmdHis', $modifiedsince - 1), $path)) {
             return false;
         }
 
@@ -81,19 +81,19 @@ 
 
         $xr->read();
         if ($xr->nodeType != XMLReader::ELEMENT) {
-            echo 'error: First element expected, aborted' . "\n";
+            echo 'error: First element expected, aborted'."\n";
 
             return;
         }
         if ($xr->name != 'gkxml') {
-            echo 'error: First element not valid, aborted' . "\n";
+            echo 'error: First element not valid, aborted'."\n";
 
             return;
         }
 
         $startupdate = $xr->getAttribute('date');
         if ($startupdate == '') {
-            echo 'error: Date attribute not valid, aborted' . "\n";
+            echo 'error: Date attribute not valid, aborted'."\n";
 
             return;
         }
@@ -115,7 +115,7 @@ 
                         break;
                 }
 
-                $nRecordsCount ++;
+                $nRecordsCount++;
             }
         } while ($xr->next());
 
@@ -253,7 +253,7 @@ 
         $waypoints = $element->getElementsByTagName('waypoints');
         if ($waypoints->length > 0) {
             $wpItems = $waypoints->item(0)->getElementsByTagName('waypoint');
-            for ($i = 0; $i < $wpItems->length; $i ++) {
+            for ($i = 0; $i < $wpItems->length; $i++) {
                 $wp = mb_trim($wpItems->item($i)->nodeValue);
                 if ($wp != '') {
                     sql("INSERT INTO `gk_move_waypoint` (`id`, `wp`) VALUES ('&1', '&2')", $id, $wp);
@@ -285,7 +285,7 @@ 
                 WHERE `id`='&2' AND `wp`!=''",
                 $gkid,
                 $r['id']
-            );  // "late log" bugfix: replaced $id paramter by $r['id']
+            ); // "late log" bugfix: replaced $id paramter by $r['id']
         } else {
             // do nothing
         }