OpencachingDeutschland / oc-server3

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'];

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;
                 }
             }
         }

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";
         }
     }
 }

htdocs/util2/geokrety/save-gkstate.php

Spacing +12 added lines, -12 removed lines

@@ -8,23 +8,23 @@ 
  *  creates backups of gk_ tables and initializes archive directory.
  ***************************************************************************/
 
-$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] != 'init' && $argv[1] != 'discard')) {
-    die("\n" .
-        "Please verify that runcron.php is disabled in crontab;\n" .
-        "then run this script with\n" .
-        "\n" .
-        "   php save-gkstate.php init      to initialize or reset GK archive\n" .
-        "   php save-gkstate.php discard   to discard GK archive\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 save-gkstate.php init      to initialize or reset GK archive\n".
+        "   php save-gkstate.php discard   to discard GK archive\n".
+        "\n".
+        "Don't forget to re-enable cronjobs afterwards!\n".
         "\n");
 }
 
 if ($opt['cron']['geokrety']['xml_archive'] != ($argv[1] == 'init')) {
-    die("Error: Geokrety XML archiving is " . ($opt['cron']['geokrety']['xml_archive'] ? 'enabled' : 'disabled') . " in settings\n");
+    die("Error: Geokrety XML archiving is ".($opt['cron']['geokrety']['xml_archive'] ? 'enabled' : 'disabled')." in settings\n");
 }
 
 echo "deleting old archive if exists\n";
@@ -35,7 +35,7 @@ 
 sql("DROP TABLE IF EXISTS _backup_gk_move_waypoint");
 sql("DROP TABLE IF EXISTS _backup_gk_user");
 
-foreach (glob($opt['rootpath'] . "cache2/geokrety/import-*.xml") as $f) {
+foreach (glob($opt['rootpath']."cache2/geokrety/import-*.xml") as $f) {
     unlink($f);
 }
 

htdocs/util2/cache_repairnames/repairnames.php

Spacing +3 added lines, -3 removed lines

@@ -10,14 +10,14 @@
  *  version 9 on, as newcache.php and editcache.php now trim the names.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require __DIR__ . '/../../lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require __DIR__.'/../../lib2/cli.inc.php';
 
 $rs = sql("SELECT `cache_id`, `name` FROM `caches` WHERE `name`<'\"' ORDER BY `name` ASC");
 while ($r = sql_fetch_array($rs)) {
     $name = trim($r['name']);
     if ($name != $r['name'] && $name != "") {
-        echo "ID " . $r['cache_id'] . ": trimmed cache name to '" . $name . "'\n";
+        echo "ID ".$r['cache_id'].": trimmed cache name to '".$name."'\n";
         sql("UPDATE `caches` SET `name`='&1' WHERE `cache_id`=&2", $name, $r['cache_id']);
     }
 }

htdocs/childwp.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 use Oc\Libse\ChildWp\ControllerChildWp;
 use Oc\Libse\ChildWp\HandlerChildWp;
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'childwp';
 $tpl->menuitem = MNU_CACHES_HIDE;
@@ -34,7 +34,7 @@ 
 }
 
 if ($redirect) {
-    $tpl->redirect('editcache.php?cacheid=' . $presenter->getCacheId());
+    $tpl->redirect('editcache.php?cacheid='.$presenter->getCacheId());
 }
 
 $presenter->prepare($tpl);

htdocs/newcachesrest.php

Spacing +3 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'newcachesrest';
 $tpl->menuitem = MNU_START_NEWCACHES;
@@ -14,8 +14,7 @@ 
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();
@@ -27,7 +26,7 @@ 
         FROM `caches`
         INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
         WHERE `cache_status`.`allow_user_view`=1
-        AND `country`!='" . sql_escape($country) . "'
+        AND `country`!='" . sql_escape($country)."'
         ORDER BY `date_created` DESC LIMIT 200"
     );