OpencachingDeutschland / oc-server3

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/ocxml11client/index.php

Spacing +56 added lines, -56 removed lines

@@ -27,12 +27,12 @@ 
  * - Test mit aktuellem OC.de-Stand
  ***************************************************************************/
 
-$rootpath = __DIR__ . '/../../htdocs/';
+$rootpath = __DIR__.'/../../htdocs/';
 
 // chdir to proper directory (needed for cronjobs)
 chdir(substr(realpath($_SERVER['PHP_SELF']), 0, strrpos(realpath($_SERVER['PHP_SELF']), '/')));
 
-require_once $rootpath . 'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
 require_once 'xml2array.inc.php';
 require_once 'settings.php';
 
@@ -67,16 +67,16 @@ 
     $nFileNr = 0;
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
     while ($r = sql_fetch_array($rs)) {
-        $nFileNr ++;
+        $nFileNr++;
         $fileparts = mb_split('/', $r['url']);
         $filename = $fileparts[count($fileparts) - 1];
 
-        echo 'Downloading file ' . $nFileNr . ' of ' . $rCount['c'] . ': ' . $filename . "\n";
+        echo 'Downloading file '.$nFileNr.' of '.$rCount['c'].': '.$filename."\n";
 
         $success = true;
-        if (!file_exists($opt['pictures']['directory'] . $filename)) {
-            if (!@copy($r['url'], $opt['pictures']['directory'] . $filename)) {
-                echo 'error: Download nicht erfolgreich' . "\n";
+        if (!file_exists($opt['pictures']['directory'].$filename)) {
+            if (!@copy($r['url'], $opt['pictures']['directory'].$filename)) {
+                echo 'error: Download nicht erfolgreich'."\n";
                 $success = false;
             }
         }
@@ -84,7 +84,7 @@ 
         if ($success == true) {
             sql(
                 "UPDATE `pictures` SET `local`=1, `url`='&1' WHERE `id`='&2'",
-                $opt['pictures']['url'] . $filename,
+                $opt['pictures']['url'].$filename,
                 $r['id']
             );
         }
@@ -196,7 +196,7 @@ 
 
     if ($opt['session'] == 1) {
         // records abfragen
-        $sessionfile = $opt['tmpdir'] . 'session.xml';
+        $sessionfile = $opt['tmpdir'].'session.xml';
         if (file_exists($sessionfile)) {
             unlink($sessionfile);
         }
@@ -215,21 +215,21 @@ 
         $recordscount += $session['OCXMLSESSION']['RECORDS']['PICTURE'];
         $recordscount += $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'];
 
-        echo 'Abruf seit ' . $lastUpdate . "\n";
+        echo 'Abruf seit '.$lastUpdate."\n";
         echo "------------------------\n";
-        echo 'Session-Id: ' . $sessionid . "\n";
-        echo 'User: ' . $session['OCXMLSESSION']['RECORDS']['USER'] . "\n";
-        echo 'Cache: ' . $session['OCXMLSESSION']['RECORDS']['CACHE'] . "\n";
-        echo 'Cachdesc: ' . $session['OCXMLSESSION']['RECORDS']['CACHEDESC'] . "\n";
-        echo 'Cachelog: ' . $session['OCXMLSESSION']['RECORDS']['CACHELOG'] . "\n";
-        echo 'Picture: ' . $session['OCXMLSESSION']['RECORDS']['PICTURE'] . "\n";
-        echo 'Removedobject: ' . $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'] . "\n";
+        echo 'Session-Id: '.$sessionid."\n";
+        echo 'User: '.$session['OCXMLSESSION']['RECORDS']['USER']."\n";
+        echo 'Cache: '.$session['OCXMLSESSION']['RECORDS']['CACHE']."\n";
+        echo 'Cachdesc: '.$session['OCXMLSESSION']['RECORDS']['CACHEDESC']."\n";
+        echo 'Cachelog: '.$session['OCXMLSESSION']['RECORDS']['CACHELOG']."\n";
+        echo 'Picture: '.$session['OCXMLSESSION']['RECORDS']['PICTURE']."\n";
+        echo 'Removedobject: '.$session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT']."\n";
         echo "------------------------\n";
-        echo 'Summe: ' . $recordscount . "\n";
+        echo 'Summe: '.$recordscount."\n";
 
         $filescount = ($recordscount + (500 - $recordscount % 500)) / 500;
 
-        echo 'Anzahl der Pakete: ' . $filescount . "\n";
+        echo 'Anzahl der Pakete: '.$filescount."\n";
         echo "\n";
 
         if ($recordscount == 0) {
@@ -237,20 +237,20 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
-            echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
+        for ($i = 1; $i <= $filescount; $i++) {
+            echo "Download Paket: ".$i.' von '.$filescount."\n";
 
             $fileurl = $opt['url_getsession'];
             $fileurl = mb_ereg_replace('{sessionid}', $sessionid, $fileurl);
             $fileurl = mb_ereg_replace('{file}', $i, $fileurl);
             $fileurl = mb_ereg_replace('{zip}', $opt['zip'], $fileurl);
-            $target = $opt['tmpdir'] . $sessionid . '-' . sprintf('%04d', $i) . $fileext;
+            $target = $opt['tmpdir'].$sessionid.'-'.sprintf('%04d', $i).$fileext;
 
             copy($fileurl, $target);
         }
     } else {
-        echo 'Download ...' . "\n";
-        $target = $opt['tmpdir'] . date('YmdHis') . $fileext;
+        echo 'Download ...'."\n";
+        $target = $opt['tmpdir'].date('YmdHis').$fileext;
         copy($url, $target);
     }
 }
@@ -262,24 +262,24 @@ 
     // alle zips entpacken
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             $bCopy = false;
             if (mb_substr($file, mb_strrpos($file, '.')) == '.zip') {
-                echo 'Unzipping file ' . $file . "\n";
+                echo 'Unzipping file '.$file."\n";
                 system(
-                    $opt['unzip'] . ' --type=zip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                    $opt['unzip'].' --type=zip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                 );
             } else {
                 if (mb_substr($file, mb_strrpos($file, '.')) == '.gz') {
-                    echo 'Unzipping file ' . $file . "\n";
+                    echo 'Unzipping file '.$file."\n";
                     system(
-                        $opt['unzip'] . ' --type=gzip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                        $opt['unzip'].' --type=gzip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                     );
                 } else {
                     if (mb_substr($file, mb_strrpos($file, '.')) == '.bz2') {
-                        echo 'Unzipping file ' . $file . "\n";
+                        echo 'Unzipping file '.$file."\n";
                         system(
-                            $opt['unzip'] . ' --type=bzip2 --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                            $opt['unzip'].' --type=bzip2 --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                         );
                     } else {
                         if (mb_substr($file, mb_strrpos($file, '.')) == '.xml') {
@@ -291,16 +291,16 @@ 
 
             // und jetzt die gezippte Datei verschieben
             $archivdir = $opt['archivdir'];
-            $archivdir .= $opt['curdb'] . '/';
+            $archivdir .= $opt['curdb'].'/';
 
             if (!is_dir($archivdir)) {
                 mkdir($archivdir);
             }
 
             if ($bCopy == true) {
-                copy($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                copy($opt['tmpdir'].$file, $archivdir.'/'.$file);
             } else {
-                rename($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                rename($opt['tmpdir'].$file, $archivdir.'/'.$file);
             }
         }
     }
@@ -315,9 +315,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                $files[] = $opt['tmpdir'] . $file;
+                $files[] = $opt['tmpdir'].$file;
             }
         }
     }
@@ -331,7 +331,7 @@ 
 
 function importxmlfile($file)
 {
-    echo 'Importing file ' . $file . "\n";
+    echo 'Importing file '.$file."\n";
 
     $xmlReader = new xmlReader();
     $xmlReader->open($file);
@@ -411,11 +411,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }
@@ -459,7 +459,7 @@ 
                     ImportRemovedObjectArray($node['REMOVEDOBJECT']);
                     break;
                 default:
-                    echo 'Unknown Element "' . $xmlReader->name . '", skipping' . "\n";
+                    echo 'Unknown Element "'.$xmlReader->name.'", skipping'."\n";
                     break;
             }
         }
@@ -481,9 +481,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                unlink($opt['tmpdir'] . $file);
+                unlink($opt['tmpdir'].$file);
             }
         }
     }
@@ -501,14 +501,14 @@ 
         // andere DB connecten?
         if (mb_substr($arg, 0, 5) == '--db=') {
             if (!is_numeric(mb_substr($arg, 5))) {
-                die('invalid alternative DB' . "\n");
+                die('invalid alternative DB'."\n");
             }
 
             $nDb = mb_substr($arg, 5);
 
             if ($nDb != 0) {
                 if (!isset($opt['db'][$nDb])) {
-                    die('invalid alternative DB' . "\n");
+                    die('invalid alternative DB'."\n");
                 }
 
                 mysql_close($dblink);
@@ -517,7 +517,7 @@ 
                     sql("SET NAMES 'utf8'");
                     sql('USE `&1`', $opt['db'][1]['name']);
                 } else {
-                    die('Connect to alternative DB failed' . "\n");
+                    die('Connect to alternative DB failed'."\n");
                 }
 
                 $opt['curdb'] = $nDb;
@@ -531,7 +531,7 @@ 
             sql("SET NAMES 'utf8'");
             sql('USE `&1`', $dbname);
         } else {
-            die('Connect to alternative DB failed' . "\n");
+            die('Connect to alternative DB failed'."\n");
         }
     }
 }
@@ -544,7 +544,7 @@ 
         !isset($r['USERNAME']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportUserArray required element not defined' . "\n";
+        echo 'warn: ImportUserArray required element not defined'."\n";
 
         return;
     }
@@ -637,7 +637,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportCacheArray required element not defined' . "\n";
+        echo 'warn: ImportCacheArray required element not defined'."\n";
 
         return;
     }
@@ -808,7 +808,7 @@ 
         !isset($r['LANGUAGE']['__ATTR']['ID']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCacheDescArray required element not defined' . "\n";
+        echo 'error: ImportCacheDescArray required element not defined'."\n";
 
         return;
     }
@@ -965,7 +965,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCachelogArray required element not defined' . "\n";
+        echo 'error: ImportCachelogArray required element not defined'."\n";
 
         return;
     }
@@ -996,7 +996,7 @@ 
 
     // logtype gültig?
     if (sqlValue(
-            "SELECT COUNT(*) FROM `log_types` WHERE `id`='" . sql_escape($r['LOGTYPE']['__ATTR']['ID']) . "'",
+            "SELECT COUNT(*) FROM `log_types` WHERE `id`='".sql_escape($r['LOGTYPE']['__ATTR']['ID'])."'",
             0
         ) == 0
     ) {
@@ -1070,7 +1070,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportPictureArray required element not defined ' . "\n";
+        echo 'error: ImportPictureArray required element not defined '."\n";
 
         return;
     }
@@ -1171,7 +1171,7 @@ 
         !isset($r['OBJECT']['__DATA']) ||
         !isset($r['REMOVEDDATE']['__DATA'])
     ) {
-        echo 'error: ImportRemovedObjectArray required element not defined' . "\n";
+        echo 'error: ImportRemovedObjectArray required element not defined'."\n";
 
         return;
     }
@@ -1283,12 +1283,12 @@ 
 
 function importError($recordtype, $uuid, $r, $info)
 {
-    echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'error: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function importWarn($recordtype, $uuid, $r, $info)
 {
-    echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'warn: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function restorevalues()

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

htdocs/myhome.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/reportcache.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;