OpencachingDeutschland / oc-server3

local/devel/style-cleanup.php

Spacing +15 added lines, -15 removed lines

@@ -34,13 +34,13 @@ 
     'htdocs/vendor',
 );
 
-chdir(__DIR__ . '/../..');
+chdir(__DIR__.'/../..');
 
 $cleanup = new StyleCleanup();
 $cleanup->run('.', $exclude);
 
 echo
-    $cleanup->getLinesModified() . ' lines in ' . $cleanup->getFilesModified() . ' files'
+    $cleanup->getLinesModified().' lines in '.$cleanup->getFilesModified().' files'
     . " have been cleaned up\n";
 
 
@@ -80,8 +80,8 @@ 
             # process files in $path
 
             $files = array_merge(
-                glob($path . '/*.php'),
-                glob($path . '/*.tpl')
+                glob($path.'/*.php'),
+                glob($path.'/*.tpl')
             );
 
             foreach ($files as $filepath) {
@@ -93,7 +93,7 @@ 
 
                 if (count($lines) && preg_match('/^(.+?)\<\?/', $lines[0], $matches)) {
                     self::warn(
-                        'invalid character(s) "' . $matches[1] . '" at start of ' . $display_filepath
+                        'invalid character(s) "'.$matches[1].'" at start of '.$display_filepath
                     );
                 }
 
@@ -108,19 +108,19 @@ 
                         && !preg_match("/^ *(\\*|\/\/|#) *\n$/", $line)) {
 
                         $old_line = $line;
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
                         $line = $this->expandTabs($line);
                         $line .= "\n";
 
                         if ($line != $old_line) {
                             $file_modified = true;
-                            ++ $this->lines_modified;
+                            ++$this->lines_modified;
                         }
                     }
                     if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
-                        self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
+                        self::warn('short open tag in line '.$n.' of '.$display_filepath);
                     }
-                    ++ $n;
+                    ++$n;
                 }
 
                 # remove PHP close tags and empty lines from end of file
@@ -131,23 +131,23 @@ 
                     if ($trimmed_line == '?>' || $trimmed_line == '') {
                         unset($lines[$l]);
                         $file_modified = true;
-                        ++ $this->lines_modified;
+                        ++$this->lines_modified;
                     } else {
                         break;
                     }
-                    -- $l;
+                    --$l;
                 }
 
                 if ($file_modified) {
-                    echo 'cleaned ' . substr($filepath, 2) . "\n";
+                    echo 'cleaned '.substr($filepath, 2)."\n";
                     file_put_contents($filepath, implode('', $lines));
-                    ++ $this->files_modified;
+                    ++$this->files_modified;
                 }
             }
 
             # process subdirectories in $path
 
-            $dirs = glob($path . '/*', GLOB_ONLYDIR);
+            $dirs = glob($path.'/*', GLOB_ONLYDIR);
             foreach ($dirs as $dir) {
                 if ($dir != '.' && $dir != '..') {
                     $this->cleanup($dir);
@@ -170,6 +170,6 @@ 
 
     private static function warn($msg)
     {
-        echo '! ' . $msg . "\n";
+        echo '! '.$msg."\n";
     }
 }

local/devel/find_bad_encodings.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for files which are no longer Unicode-encoded
  ***************************************************************************/
 
-chdir(__DIR__ . '/../../htdocs');
+chdir(__DIR__.'/../../htdocs');
 require_once 'lib2/cli.inc.php';
 
 
@@ -25,7 +25,7 @@ 
     $hDir = opendir($dir);
     if ($hDir !== false) {
         while (($file = readdir($hDir)) !== false) {
-            $path = $dir . '/' . $file;
+            $path = $dir.'/'.$file;
             if (is_dir($path) && substr($file, 0, 1) !== '.' && $subdirs) {
                 scan($path, $subdirs);
             } else {
@@ -41,7 +41,7 @@ 
 
 function test_encoding($path)
 {
-    static $ur_exclude = [  // no unicode reminder needed
+    static $ur_exclude = [// no unicode reminder needed
         'lang/de/ocstyle/search1/search.result.caches',
         'lib2/b2evo-captcha',
         'lib2/HTMLPurifier',
@@ -57,7 +57,7 @@ 
         if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
             $ur = mb_stripos($contents, "Unicode Reminder");
             if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
-                echo "Bad Unicode Reminder found in $path: " . mb_trim(mb_substr($contents, $ur + 17, 2)) . "\n";
+                echo "Bad Unicode Reminder found in $path: ".mb_trim(mb_substr($contents, $ur + 17, 2))."\n";
             } else {
                 echo "Unexpected non-ASCII chars (BOMs?) in header of $path\n";
             }

local/prodsys/phpzip.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
 $zipper['bzip2'] = 'nice --adjustment=19 bzip2 -1 -c {src} > {dst}';
 
 if ($argv[1] == '--help') {
-    echo $argv[0] . " --type=<ziptype> --src=<source> --dst=<destination>
+    echo $argv[0]." --type=<ziptype> --src=<source> --dst=<destination>
 --type   can be zip, gzip or bzip2
 --src    relative* path to source file
 --dst    relative* path to destination file
@@ -36,11 +36,11 @@ 
             6
         ) != '--dst=')
 ) {
-    die("wrong paramter\nuse " . $argv[0] . " --help\n");
+    die("wrong paramter\nuse ".$argv[0]." --help\n");
 }
 
 if (isset($argv[4])) {
-    die("wrong paramter\nuse " . $argv[0] . " --help\n");
+    die("wrong paramter\nuse ".$argv[0]." --help\n");
 }
 
 $type = substr($argv[1], 7);
@@ -48,26 +48,26 @@ 
 $dst = substr($argv[3], 6);
 
 if (!isset($zipper[$type])) {
-    die("invaild zip type\nuse " . $argv[0] . " --help\n");
+    die("invaild zip type\nuse ".$argv[0]." --help\n");
 }
 
 if (checkpath($src) == false) {
-    die("invaild src\nuse " . $argv[0] . " --help\n");
+    die("invaild src\nuse ".$argv[0]." --help\n");
 }
 
 if (checkpath($dst) == false) {
-    die("invaild dst\nuse " . $argv[0] . " --help\n");
+    die("invaild dst\nuse ".$argv[0]." --help\n");
 }
 
-$src = $basedir . $src;
-$dst = $basedir . $dst;
+$src = $basedir.$src;
+$dst = $basedir.$dst;
 
 if (!file_exists($src)) {
-    die("error: source not exist\nuse " . $argv[0] . " --help\n");
+    die("error: source not exist\nuse ".$argv[0]." --help\n");
 }
 
 if (file_exists($dst)) {
-    die("error: destination already exists\nuse " . $argv[0] . " --help\n");
+    die("error: destination already exists\nuse ".$argv[0]." --help\n");
 }
 
 $cmd = $zipper[$type];
@@ -84,7 +84,7 @@ 
         return false;
     }
 
-    for ($i = 0; $i < count($parts); $i ++) {
+    for ($i = 0; $i < count($parts); $i++) {
         if (($parts[$i] == '..') || ($parts[$i] == '.')) {
             return false;
         }

local/prodsys/purge_master_logs.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     $rLastLog = mysql_fetch_array($rs);
     mysql_free_result($rs);
 
-    mysql_query("PURGE MASTER LOGS TO '" . mysql_real_escape_string($rLastLog[0], $dblink) . "'", $dblink);
+    mysql_query("PURGE MASTER LOGS TO '".mysql_real_escape_string($rLastLog[0], $dblink)."'", $dblink);
 }
 
 mysql_close($dblink);

local/ocxml11client/settings-dist.php

Spacing +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
 
 // Bilder downloaden?
 $opt['pictures']['download'] = 1;
-$opt['pictures']['directory'] = $rootpath . 'images/uploads/';
+$opt['pictures']['directory'] = $rootpath.'images/uploads/';
 $opt['pictures']['url'] = 'http://www.so-komm-ich-uebers-web-da.hin/www.opencaching.de/html/images/uploads/';
 
 // Sessions verwenden?
 $opt['session'] = 1;
-$opt['zip'] = 'gzip';                // 0; zip; bzip2; gzip
+$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip
 
 // Gebietsauswahl nach Land
 $opt['bycountry'] = 0;

local/stat/coordstat.php

Spacing +8 added lines, -8 removed lines

@@ -8,8 +8,8 @@ 
 // statistical data for cache and log activity map
 // optional script to be released locally into htdocs/api/stat
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 error_reporting(error_reporting() & ~E_NOTICE);
 
@@ -26,7 +26,7 @@ 
     $year = substr($cache['date_created'], 0, 4);
     if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
         $years[$year] = true;
-        $liste[$lat][$long]["caches"][$year] ++;
+        $liste[$lat][$long]["caches"][$year]++;
     }
 }
 mysql_free_result($rs);
@@ -50,7 +50,7 @@ 
         $year = substr($cache["date"], 0, 4);
         if ($year >= 2005 && $year <= date("Y") && ($lat != 0 || $long != 0)) {
             $years[$year] = true;
-            $liste[$lat][$long]["logs"][$year] ++;
+            $liste[$lat][$long]["logs"][$year]++;
         }
     }
     mysql_free_result($rs);
@@ -67,7 +67,7 @@ 
 while ($cache = sql_fetch_assoc($rs)) {
     $lat = floor($cache["latitude"] / $grid);
     $long = floor($cache["longitude"] / $grid);
-    $liste[$lat][$long]["caches"]["all"] ++;
+    $liste[$lat][$long]["caches"]["all"]++;
     $liste[$lat][$long]["logs"]["all"] += $cache["logs"];
 }
 mysql_free_result($rs);
@@ -89,11 +89,11 @@ 
 
 foreach ($liste as $lat => $liste2) {
     foreach ($liste2 as $long => $cachecounts) {
-        echo ($lat * $grid + 0.5 * $grid) . ',' . ($long * $grid + 0.5 * $grid) . ',' .
-            $cachecounts['caches']['all'] . ',' .
+        echo ($lat * $grid + 0.5 * $grid).','.($long * $grid + 0.5 * $grid).','.
+            $cachecounts['caches']['all'].','.
             $cachecounts['logs']['all'];
         foreach ($years as $year => $dummy) {
-            echo ',' . $cachecounts["caches"][$year] . ',' . $cachecounts["logs"][$year];
+            echo ','.$cachecounts["caches"][$year].','.$cachecounts["logs"][$year];
         }
         echo "\r\n";
     }

local/stat/newimages.php

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@ 
 // list of new images
 // optional script to be released locally into htdocs/api/stat
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if (!isset($_REQUEST['since'])) {
     exit;
@@ -23,6 +23,6 @@ 
     $since
 );
 while ($pic = sql_fetch_assoc($rs)) {
-    echo $pic['url'] . "\n";
+    echo $pic['url']."\n";
 }
 mysql_free_result($rs);

htdocs/dbmaintain.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'event_attendance';
 $tpl->popup = true;

htdocs/newemail.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'event_attendance';
 $tpl->popup = true;