OpencachingDeutschland / oc-server3

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;

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())

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

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

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
                            ORDER BY `free_wp` ASC
                               LIMIT 250",
                 $opt['logic']['waypoint_pool']['prefix'],
-                '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$'
+                '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$'
             );
         } else {
             // query the last used waypoint
@@ -70,7 +70,7 @@ 
                                    SELECT MAX(WPTODEC(`wp_oc`, '&2')) AS dec_wp
                                      FROM `cache_waypoint_pool`
                                  ) AS tbl",
-                '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$',
+                '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$',
                 $opt['logic']['waypoint_pool']['prefix']
             );
         }
@@ -78,16 +78,16 @@ 
         while (($rStartWp = sql_fetch_assoc($rsStartWp)) && ($nInsertCount < $max_inserts_count)) {
             $free_wp = $rStartWp['free_wp'];
             if ($free_wp == '') {
-                $free_wp = $opt['logic']['waypoint_pool']['prefix'] . '0001';
+                $free_wp = $opt['logic']['waypoint_pool']['prefix'].'0001';
             }
             $nInsertCount += $this->fill_turn($free_wp, $max_inserts_count - $nInsertCount);
-            $rowCount ++;
+            $rowCount++;
         }
         sql_free_result($rsStartWp);
 
         if ($rowCount == 0) {
             // new database ...
-            $nInsertCount += $this->fill_turn($opt['logic']['waypoint_pool']['prefix'] . '0001', $max_inserts_count);
+            $nInsertCount += $this->fill_turn($opt['logic']['waypoint_pool']['prefix'].'0001', $max_inserts_count);
         }
 
         return $nInsertCount;
@@ -111,9 +111,9 @@ 
                                      FROM `cache_waypoint_pool`
                                     WHERE WPTODEC(`wp_oc`, '&3')>WPTODEC('&1', '&3')
                                  ) AS tbl",
-            $opt['logic']['waypoint_pool']['prefix'] . '100000',
+            $opt['logic']['waypoint_pool']['prefix'].'100000',
             $start_wp,
-            '^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$',
+            '^'.$opt['logic']['waypoint_pool']['prefix'].'['.$opt['logic']['waypoint_pool']['valid_chars'].']{1,}$',
             $opt['logic']['waypoint_pool']['prefix']
         );
 
@@ -121,7 +121,7 @@ 
         $nWaypointsGenerated = 0;
         while (($nWaypointsGenerated < $max_inserts_count) && ($start_wp != $end_wp)) {
             sql("INSERT INTO `cache_waypoint_pool` (`wp_oc`) VALUES ('&1')", $start_wp);
-            $nWaypointsGenerated ++;
+            $nWaypointsGenerated++;
             $start_wp = $this->increment_waypoint($start_wp, $opt['logic']['waypoint_pool']['prefix']);
         }
 
@@ -142,7 +142,7 @@ 
 
         $wp_value = substr($wp, 2);
         $b36_value = '';
-        for ($i = 0; $i < strlen($wp_value); $i ++) {
+        for ($i = 0; $i < strlen($wp_value); $i++) {
             $b36_value .= substr($b36_chars, strpos($wp_chars, substr($wp_value, $i, 1)), 1);
         }
 
@@ -150,14 +150,14 @@ 
         $b36_value = strtoupper(base_convert($dec_value, 10, strlen($wp_chars)));
 
         $wp_value = '';
-        for ($i = 0; $i < strlen($b36_value); $i ++) {
+        for ($i = 0; $i < strlen($b36_value); $i++) {
             $wp_value .= substr($wp_chars, strpos($b36_chars, substr($b36_value, $i, 1)), 1);
         }
 
         if (strlen($wp_value) < 4) {
-            return $prefix . substr('0000' . $wp_value, - 4);
+            return $prefix.substr('0000'.$wp_value, - 4);
         } else {
-            return $prefix . $wp_value;
+            return $prefix.$wp_value;
         }
     }
 }

htdocs/util2/cron/runcron.php

Spacing +9 added lines, -9 removed lines

@@ -11,16 +11,16 @@ 
  *
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 // test for user who runs the cronjob
 $processUser = posix_getpwuid(posix_geteuid());
 if ($processUser['name'] != $opt['cron']['username']) {
     die(
-        "ERROR: runcron must be run by '" . $opt['cron']['username']
-        . "' but was called by '" . $processUser['name'] . "'\n" .
-        "Try something like 'sudo -u " . $opt['cron']['username'] . " php runcron.php'.\n");
+        "ERROR: runcron must be run by '".$opt['cron']['username']
+        . "' but was called by '".$processUser['name']."'\n".
+        "Try something like 'sudo -u ".$opt['cron']['username']." php runcron.php'.\n");
 }
 
 // ensure that we do not run concurrently
@@ -34,13 +34,13 @@ 
         }
     }
 
-    $modules_dir = $opt['rootpath'] . 'util2/cron/modules/';
+    $modules_dir = $opt['rootpath'].'util2/cron/modules/';
     $param = count($argv) > 1 ? $argv[1] : '';
 
     if ($param != '' && substr($param, 0, 1) != '-' && !strstr('/', $param)) {
         // run one job manually for debugging purpose
         $ignore_interval = true;
-        require $modules_dir . $argv[1] . '.class.php';
+        require $modules_dir.$argv[1].'.class.php';
     } else {
         if (cronjobs_enabled()) {
             $ignore_interval = false;
@@ -48,9 +48,9 @@ 
             while (false !== ($file = readdir($hDir))) {
                 if (substr($file, -10) == '.class.php') {
                     if ($param == '--show') {
-                        echo 'running ' . $file . "\n";
+                        echo 'running '.$file."\n";
                     }
-                    require $modules_dir . $file;
+                    require $modules_dir.$file;
                 }
             }
         }