OpencachingDeutschland / oc-server3

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;

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/maillog.class.php

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 class maillog
 {
     public $name = 'maillog';
-    public $interval = 600;  // every 10 minutes
+    public $interval = 600; // every 10 minutes
 
 
     public function run()
@@ -33,14 +33,14 @@ 
             $opt['system']['maillog']['syslog_db_user'],
             $opt['system']['maillog']['syslog_db_password'],
             true
-        );  // use separate connection even if on same DB host
+        ); // use separate connection even if on same DB host
         if ($dbc === false) {
-            echo $this->name . ": could not connect to syslog database\n";
+            echo $this->name.": could not connect to syslog database\n";
 
             return;
         }
-        if (@mysql_query("USE " . $opt['system']['maillog']['syslog_db_name'], $dbc) === false) {
-            echo $this->name . ": could not open syslog database: " . mysql_error() . "\n";
+        if (@mysql_query("USE ".$opt['system']['maillog']['syslog_db_name'], $dbc) === false) {
+            echo $this->name.": could not open syslog database: ".mysql_error()."\n";
 
             return;
         }
@@ -52,13 +52,13 @@ 
         $col_program = mysql_real_escape_string($opt['system']['maillog']['column']['program']);
 
         $maillog_where =
-            "`" . $col_hostname . "`='" . mysql_real_escape_string($opt['system']['maillog']['syslog_oc_host']) . "' AND
-            `" . $col_program . "` like '" . mysql_real_escape_string($opt['system']['maillog']['syslog_mta']) . "'";
+            "`".$col_hostname."`='".mysql_real_escape_string($opt['system']['maillog']['syslog_oc_host'])."' AND
+            `" . $col_program."` like '".mysql_real_escape_string($opt['system']['maillog']['syslog_mta'])."'";
 
         $rs = @mysql_query(
             "
-            SELECT TIMESTAMPDIFF(DAY, MAX(" . $col_created . "), NOW())
-            FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table']) . "`
+            SELECT TIMESTAMPDIFF(DAY, MAX(" . $col_created."), NOW())
+            FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table'])."`
             WHERE " . $maillog_where
         );
         $r = mysql_fetch_row($rs);
@@ -80,26 +80,26 @@ 
         // case some entries with same timestamp as $last_date will be processed redundantly.
 
         $rs = @mysql_query(
-            "SELECT `" . $col_id . "` `id`,
-                      `" . $col_message . "` `message`,
-                      `" . $col_created . "` `created`
-                 FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table']) . "`
-                WHERE `" . $col_created . "`>='" . mysql_real_escape_string($last_date) . "'
-                  AND (`" . $col_id . "`>'" . mysql_real_escape_string(
+            "SELECT `".$col_id."` `id`,
+                      `" . $col_message."` `message`,
+                      `" . $col_created."` `created`
+                 FROM `" . mysql_real_escape_string($opt['system']['maillog']['syslog_db_table'])."`
+                WHERE `" . $col_created."`>='".mysql_real_escape_string($last_date)."'
+                  AND (`" . $col_id."`>'".mysql_real_escape_string(
                 $last_id
-            ) . "' OR `" . $col_created . "`>'" . mysql_real_escape_string($last_date) . "')
-                  AND  " . $maillog_where . "
-             ORDER BY `" . $col_created . "`,`" . $col_id . "`",
+            )."' OR `".$col_created."`>'".mysql_real_escape_string($last_date)."')
+                  AND  " . $maillog_where."
+             ORDER BY `" . $col_created."`,`".$col_id."`",
             $dbc
         );
         if ($rs === false) {
-            echo $this->name . ": syslog query error (" . mysql_errno() . "): " . mysql_error() . "\n";
+            echo $this->name.": syslog query error (".mysql_errno()."): ".mysql_error()."\n";
 
             return;
         }
 
         while ($logentry = mysql_fetch_assoc($rs)) {
-            $message = $logentry['message'];   // latin-1 charset
+            $message = $logentry['message']; // latin-1 charset
             $delivered = strpos($message, 'status=sent') > 0;
             $bounced = strpos($message, 'status=bounced') > 0;
             if ($delivered || $bounced) {
@@ -123,7 +123,7 @@ 
                         }
                     }
                 } else {
-                    echo $this->name . ": no email address found for record ID " . $logentry['id'] . "\n";
+                    echo $this->name.": no email address found for record ID ".$logentry['id']."\n";
                 }
             }
             $last_id = $logentry['id'];

Braces +2 added lines, -1 removed lines

@@ -112,7 +112,8 @@
                             $emailadr
                         );
                     } else {
-                        if ($bounced) {  // maximum one bounce per day is counted, to filter out temporary problems
+                        if ($bounced) {
+// maximum one bounce per day is counted, to filter out temporary problems
                             sql(
                                 "UPDATE `user` SET `email_problems`=`email_problems`+1, `last_email_problem`='&2'
                               WHERE `email`='&1' AND IFNULL(`last_email_problem`,'') < '&2'",

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/geokrety/fix-waypoints.php

Spacing +9 added lines, -9 removed lines

@@ -10,17 +10,17 @@
  *  Data import functions are in util2/cron/modules/geokrety.class.php.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
 
 if (count($argv) != 2 || $argv[1] != 'run') {
-    die("\n" .
-        "Please verify that runcron.php is disabled in crontab;\n" .
-        "then run this script with\n" .
-        "\n" .
-        "   php fix-waypoints.php run\n" .
-        "\n" .
-        "Don't forget to re-enable cronjobs afterwards!\n" .
+    die("\n".
+        "Please verify that runcron.php is disabled in crontab;\n".
+        "then run this script with\n".
+        "\n".
+        "   php fix-waypoints.php run\n".
+        "\n".
+        "Don't forget to re-enable cronjobs afterwards!\n".
         "\n");
 }
 

htdocs/util2/geokrety/check-waypoints.php

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,8 @@ 
  *  Data import functions are in util2/cron/modules/geokrety.class.php.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
 
 $itemwps = [];
 
@@ -63,12 +63,12 @@ 
                     $wp
                 ) == 0
             ) {
-                echo "item " . $itemid . ": " . $wp . " is missing in gk_move_waypoint\n";
+                echo "item ".$itemid.": ".$wp." is missing in gk_move_waypoint\n";
             } else {
-                echo "item " . $itemid . ": " . $wp . " is not the current wp in gk_move_waypoint\n";
+                echo "item ".$itemid.": ".$wp." is not the current wp in gk_move_waypoint\n";
             }
         } elseif (isset($flags['movewp']) && !isset($flags['itemwp'])) {
-            echo "item " . $itemid . ": " . $wp . " is missing in gk_item_waypoint\n";
+            echo "item ".$itemid.": ".$wp." is missing in gk_item_waypoint\n";
         }
     }
 }