OpencachingDeutschland / oc-server3

local/maintenance/cleanup_coordinates.php

Spacing +5 added lines, -5 removed lines

@@ -12,8 +12,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 $rs = sql(
     "SELECT `id`, `cache_id`, `latitude`, `longitude`
@@ -41,14 +41,14 @@ 
 
 if ($duplicates) {
     if ($argc == 2 && $argv[1] == 'go') {
-        echo 'deleting ' . count($duplicates) . " duplicate coordinate records\n";
+        echo 'deleting '.count($duplicates)." duplicate coordinate records\n";
         sql(
             "DELETE FROM `cache_coordinates`
-             WHERE `id` IN (" . implode(',', $duplicates) . ")"
+             WHERE `id` IN (" . implode(',', $duplicates).")"
         );
     } else {
         echo
-            count($duplicates) . ' duplicate coordinates found. ' .
+            count($duplicates).' duplicate coordinates found. '.
             "Add parameter 'go' to delete them.\n";
     }
 } else {

local/mailing/email-addresslist.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $rs = sql(
     'SELECT email FROM `user`
@@ -18,6 +18,6 @@ 
      ORDER BY user_id DESC'
 );
 while ($r = sql_fetch_assoc($rs)) {
-    echo $r['email'] . "\n";
+    echo $r['email']."\n";
 }
 sql_free_result($rs);

local/mailing/mailing.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 
 $total = count($sendto);
 $n = 0;
-echo 'sending email to ' . $total . ' of ' . count($addresses) . " recipients\n\n";
+echo 'sending email to '.$total.' of '.count($addresses)." recipients\n\n";
 
 $subject = '....';
 $from_adr = 'user@do.main';
@@ -41,18 +41,18 @@ 
 
 foreach ($sendto as $receiver) {
     $receiver = trim($receiver);
-    echo ++ $n . "/$total: $receiver";
+    echo ++$n."/$total: $receiver";
     mail(
         $receiver,
         $subject,
         $message,
-        "From: $from_adr\r\n" .
-        "MIME-Version: 1.0\r\n" .
-        "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+        "From: $from_adr\r\n".
+        "MIME-Version: 1.0\r\n".
+        "Content-Type: text/plain; charset=iso-8859-1\r\n".
         'Content-Transfer-Encoding: 8bit'
     );
     echo "\n";
     file_put_contents('sent.txt', "$receiver\n", FILE_APPEND);
 }
 
-echo 'Time needed: ' . (microtime(true) - $starttime) . "s\n";
+echo 'Time needed: '.(microtime(true) - $starttime)."s\n";

local/devel/okapi-update.php

Spacing +13 added lines, -13 removed lines

@@ -9,12 +9,12 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require_once $opt['rootpath'] . 'okapi-update-settings.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require_once $opt['rootpath'].'okapi-update-settings.inc.php';
 
 function git($args)
 {
-    return exec('git ' . $args);
+    return exec('git '.$args);
 }
 
 
@@ -39,7 +39,7 @@ 
 }
 $changes = git('log upstream/master..master');
 if ($changes) {
-    die("[okapi-update] there are unpushed local commits:\n" . $changes);
+    die("[okapi-update] there are unpushed local commits:\n".$changes);
 }
 
 echo "[okapi-update] ok.\n";
@@ -48,7 +48,7 @@ 
 // fetch current OKAPI revision
 
 echo "[okapi-update] pulling and replicating OKAPI master\n";
-echo git('pull ' . OKAPI_REMOTE . ' master') . "\n";
+echo git('pull '.OKAPI_REMOTE.' master')."\n";
 $okapi_version_number = git('rev-list HEAD --count') + 318;
 $okapi_git_revision = git('rev-parse HEAD');
 echo "OKAPI ver. $okapi_version_number\n";
@@ -59,26 +59,26 @@ 
 passthru(
     str_replace(
         '%source',
-        OKAPI_SOURCE_PATH . '/okapi',
-        str_replace('%dest', $opt['rootpath'] . 'okapi', DIRECTORY_TREE_REPLICATOR)
+        OKAPI_SOURCE_PATH.'/okapi',
+        str_replace('%dest', $opt['rootpath'].'okapi', DIRECTORY_TREE_REPLICATOR)
     )
 );
-$core = file_get_contents($opt['rootpath'] . 'okapi/core.php');
+$core = file_get_contents($opt['rootpath'].'okapi/core.php');
 $core = str_replace(
     "\$version_number = null",
-    "\$version_number = " . $okapi_version_number,
+    "\$version_number = ".$okapi_version_number,
     str_replace(
         "\$git_revision = null",
-        "\$git_revision = '" . $okapi_git_revision . "'",
+        "\$git_revision = '".$okapi_git_revision."'",
         $core
     )
 );
-file_put_contents($opt['rootpath'] . 'okapi/core.php', $core);
+file_put_contents($opt['rootpath'].'okapi/core.php', $core);
 chdir($opt['rootpath']);
 passthru('git status');
 
 // commit changes to OC code
 
 echo "[okapi-update] committing to local OC Git repo\n";
-echo git('add .') . "\n";
-echo git('commit -m "OKAPI r' . $okapi_version_number . '"') . "\n";
+echo git('add .')."\n";
+echo git('commit -m "OKAPI r'.$okapi_version_number.'"')."\n";

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

Braces +2 added lines, -1 removed lines

@@ -117,7 +117,8 @@
                             ++ $this->lines_modified;
                         }
                     }
-                    if (preg_match('/\<\?\s/', $line)) {   # relies on \n at EOL
+                    if (preg_match('/\<\?\s/', $line)) {
+# relies on \n at EOL
                         self::warn('short open tag in line ' . $n . ' of ' . $display_filepath);
                     }
                     ++ $n;

local/devel/strip_private_data.php

Spacing +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
 
 if (!($opt['debug'] & DEBUG_DEVELOPER)) {
     die("This script deletes lot of data and must be run only on development systems.\n");
 }
 if ($argc != 2 || $argv[1] != 'go') {
     die(
-        "This script deletes lot of data. Make sure that you really want to dos this,\n" .
+        "This script deletes lot of data. Make sure that you really want to dos this,\n".
         "and confirm it by adding the parameter 'go'.\n"
     );
 }
@@ -63,11 +63,11 @@ 
 echo "clearing user data\n";
 sql('TRUNCATE `cache_adoption`');
 sql('TRUNCATE `cache_ignore`');
-sql('DELETE FROM `cache_lists` WHERE `is_public`<2');  // trigger deletes dependent data
+sql('DELETE FROM `cache_lists` WHERE `is_public`<2'); // trigger deletes dependent data
 sql('TRUNCATE `cache_list_bookmarks`');
 sql('TRUNCATE `cache_list_watches`');
 sql('TRUNCATE `cache_watches`');
-sql('DELETE FROM `coordinates` WHERE `type`=2');   // personal cache notes and coords
+sql('DELETE FROM `coordinates` WHERE `type`=2'); // personal cache notes and coords
 sql('TRUNCATE `queries`');
 sql('TRUNCATE `user_options`');
 sql(
@@ -112,7 +112,7 @@ 
 echo "\n";
 mysql_free_result($rs);
 
-echo "clearing OKAPI data\n";;
+echo "clearing OKAPI data\n"; ;
 if (sql_table_exists('okapi_vars')) {
     echo "clearing OKAPI data\n";
     sql('TRUNCATE `okapi_authorizations`');
@@ -132,10 +132,10 @@ 
 
 echo "clearing other nonpublic data\n";
 sql('TRUNCATE `news`');
-$rs = sql("SHOW TABLES WHERE `Tables_in_" . $opt['db']['placeholder']['db'] . "` LIKE '\_%'");
+$rs = sql("SHOW TABLES WHERE `Tables_in_".$opt['db']['placeholder']['db']."` LIKE '\_%'");
 $tables = sql_fetch_column($rs);
 foreach ($tables as $table) {
-    sql('DROP TABLE ' . $table);
+    sql('DROP TABLE '.$table);
 }
 
 echo "done.\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;