OpencachingDeutschland / oc-server3

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
         }

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

Spacing +2 added lines, -2 removed lines

@@ -41,12 +41,12 @@
                 "SELECT `level`, `code`, AsText(`shape`) AS `geometry`
                 FROM `nuts_layer`
                 WHERE MBRWITHIN(GeomFromText('&1'), `shape`) ORDER BY `level` DESC",
-                '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'].')'
                 )
                 ) {
                     $sCode = $rLayers['code'];

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

Spacing +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@ 
 
         foreach ($opt['db']['slaves'] as $k => $v) {
             $this->check_slave($k);
-            $known_ids[] = "'" . sql_escape($k) . "'";
+            $known_ids[] = "'".sql_escape($k)."'";
         }
 
         if (count($known_ids) > 0) {
-            sql("DELETE FROM `sys_repl_slaves` WHERE `id` NOT IN (" . implode(',', $known_ids) . ")");
+            sql("DELETE FROM `sys_repl_slaves` WHERE `id` NOT IN (".implode(',', $known_ids).")");
         } else {
             sql("DELETE FROM `sys_repl_slaves`");
         }
@@ -88,7 +88,7 @@ 
         if ($nOnline != sql_value("SELECT `online` FROM `sys_repl_slaves` WHERE `id`='&1'", 0, $id)) {
             mail(
                 $opt['db']['error']['mail'],
-                "MySQL Slave Server Id " . $id . " (" . $slave['server'] . ") is now " . (($nOnline != 0) ? 'Online' : 'Offline'),
+                "MySQL Slave Server Id ".$id." (".$slave['server'].") is now ".(($nOnline != 0) ? 'Online' : 'Offline'),
                 ''
             );
         }

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

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 
             $hidden_caches = file_get_contents($opt['cron']['replicate']['delete_hidden_caches']['url']);
             $hc = explode("\n", trim($hidden_caches));
-            $hc_imploded_and_escaped = "'" . implode("','", array_map('sql_escape', $hc)) . "'";
+            $hc_imploded_and_escaped = "'".implode("','", array_map('sql_escape', $hc))."'";
             sql("SET @allowdelete = 1");
-            sql("DELETE FROM `caches` WHERE `wp_oc` IN (" . $hc_imploded_and_escaped . ")");
+            sql("DELETE FROM `caches` WHERE `wp_oc` IN (".$hc_imploded_and_escaped.")");
             // All dependent data in other tables is deleted via trigger.
         }
     }