OpencachingDeutschland / oc-server3

htdocs/lib2/menu.class.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
                         'parent' => MNU_MAP,
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -105,7 +105,7 @@ 
         $rsSubmenu = sqlf('SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC');
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -142,7 +142,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/lib2/logic/coordinate.class.php

Spacing +18 added lines, -18 removed lines

@@ -155,8 +155,8 @@ 
                 0,
             ];
         }
-        $lw = (float) $this->nLon;
-        $bw = (float) $this->nLat;
+        $lw = (float)$this->nLon;
+        $bw = (float)$this->nLat;
 
         //WGS84 Datum
         //Große Halbachse a und Abplattung f
@@ -203,7 +203,7 @@ 
         if ($lzn < 10) {
             $lz = '0' . $lzn;
         }
-        $bd = (int) (1 + ($bw + 80) / 8);
+        $bd = (int)(1 + ($bw + 80) / 8);
         $bz = substr($b_sel, $bd - 1, 1);
 
         //Geographische Breite in Radianten br
@@ -248,20 +248,20 @@ 
         $ew = 0.9996 * ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
                 $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120) + 500000;
 
-        $nk = $nw - (int) $nw;
+        $nk = $nw - (int)$nw;
         if ($nk < 0.5) {
-            $nw = '' . (int) $nw;
+            $nw = '' . (int)$nw;
         } else {
-            $nw = '' . ((int) $nw + 1);
+            $nw = '' . ((int)$nw + 1);
         }
 
         while (strlen($nw) < 7) {
             $nw = '0' . $nw;
         }
 
-        $nk = $ew - (int) $ew;
+        $nk = $ew - (int)$ew;
         if ($nk < 0.5) {
-            $ew = '0' . (int) $ew;
+            $ew = '0' . (int)$ew;
         } else {
             $ew = '0' . intval($ew + 1);
         }
@@ -316,8 +316,8 @@ 
                 0,
             ];
         }
-        $lw = (float) $lw;
-        $bw = (float) $bw;
+        $lw = (float)$lw;
+        $bw = (float)$bw;
 
         // Quellsystem WGS 84 Datum
         // Große Halbachse a und Abplattung fq
@@ -395,8 +395,8 @@ 
                 0,
             ];
         }
-        $lp = (float) $lp;
-        $bp = (float) $bp;
+        $lp = (float)$lp;
+        $bp = (float)$bp;
 
         // Potsdam Datum
         // Große Halbachse a und Abplattung f
@@ -454,18 +454,18 @@ 
         $rw = ($nd * $cos1 * $dl + $nd * $cos3 * (1 - $tan2 + $etasq) * $dl3 / 6 +
             $nd * $cos5 * (5 - 18 * $tan2 + $tan4) * $dl5 / 120 + $kz * 1e6 + 500000);
 
-        $nk = $hw - (int) $hw;
+        $nk = $hw - (int)$hw;
         if ($nk < 0.5) {
-            $hw = (int) $hw;
+            $hw = (int)$hw;
         } else {
-            $hw = ((int) $hw) + 1;
+            $hw = ((int)$hw) + 1;
         }
 
-        $nk = $rw - (int) $rw;
+        $nk = $rw - (int)$rw;
         if ($nk < 0.5) {
-            $rw = (int) $rw;
+            $rw = (int)$rw;
         } else {
-            $rw = (int) ($rw + 1);
+            $rw = (int)($rw + 1);
         }
 
         return [

htdocs/lib2/logic/attribute.class.php

Spacing +12 added lines, -12 removed lines

@@ -151,18 +151,18 @@
     public static function getConflictingAttribIds($attribId)
     {
         static $conflicts = [
-            [1, 38],    // only at night - 24/7
-            [1, 40],    // only at night - only by day
-            [24, 25],   // near the parking area - long walk
-            [24, 27],   // near the parking area - hilly area
-            [24, 29],   // near the parking area - swimming required
-            [24, 50],   // near the parking area - cave equipment
-            [24, 51],   // near the parking area - diving equipment
-            [24, 52],   // near the parking area - watercraft
-            [38, 39],   // 24/7 - only at specified times
-            [38, 40],   // 24/7 - only by day
-            [42, 43],   // all seasons - breeding season
-            [42, 60],    // all seassons - only during specified seasons
+            [1, 38], // only at night - 24/7
+            [1, 40], // only at night - only by day
+            [24, 25], // near the parking area - long walk
+            [24, 27], // near the parking area - hilly area
+            [24, 29], // near the parking area - swimming required
+            [24, 50], // near the parking area - cave equipment
+            [24, 51], // near the parking area - diving equipment
+            [24, 52], // near the parking area - watercraft
+            [38, 39], // 24/7 - only at specified times
+            [38, 40], // 24/7 - only by day
+            [42, 43], // all seasons - breeding season
+            [42, 60], // all seassons - only during specified seasons
         ];
 
         static $conflictsByAttr = [];

htdocs/lib2/logic/picture.class.php

Spacing +2 added lines, -2 removed lines

@@ -587,9 +587,9 @@
                 return false;
             }
             // restore picture file
-                $this->setUrl($original_url);     // set the url, so that we can
+                $this->setUrl($original_url); // set the url, so that we can
                 $filename = $this->getFilename(); // .. retrieve the file path+name
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deletedFilename($filename), $this->getFilename());
                 } catch (Exception $e) {

htdocs/lib2/ss_zip.class.php

Spacing +9 added lines, -9 removed lines

@@ -141,9 +141,9 @@ 
         }
 
         $fnl = strlen($filename);
-        $fh = "\x14\x00";    // ver needed to extract
-        $fh .= "\x00\x00";    // gen purpose bit flag
-        $fh .= "\x08\x00";    // compression method
+        $fh = "\x14\x00"; // ver needed to extract
+        $fh .= "\x00\x00"; // gen purpose bit flag
+        $fh .= "\x08\x00"; // compression method
         $fh .= "\x00\x00\x00\x00"; // last mod time and date
         $fh .=
             pack(
@@ -170,16 +170,16 @@ 
                 'va*v3V2',
                 0,
                 $fh,
-                0,        // file comment length
-                0,        // disk number start
-                0,        // internal file attributes
-                $attr,    // external file attributes - 'archive/directory' bit set
+                0, // file comment length
+                0, // disk number start
+                0, // internal file attributes
+                $attr, // external file attributes - 'archive/directory' bit set
                 $this->offset
             ) . $filename;
 
         $this->offset += 42 + $fnl + $gzsize;
         $this->cdir[] = $cdir;
-        $this->cnt ++;
+        $this->cnt++;
         $this->idx = $this->cnt - 1;
     }
 
@@ -227,7 +227,7 @@ 
                 $cdsl, // size of central dir
                 $zdsl, // offset to start of central dir
                 0
-            );              // .zip file comment length
+            ); // .zip file comment length
         return $this->zipfile;
     }
 

local/ocxml11client/index.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
     $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];
 
@@ -233,7 +233,7 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
+        for ($i = 1; $i <= $filescount; $i++) {
             echo 'Download Paket: ' . $i . ' von ' . $filescount . "\n";
 
             $fileurl = $opt['url_getsession'];
@@ -407,11 +407,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -428,7 +428,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }

htdocs/lib2/logic/countriesList.class.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     public function isDefault($id)
     {
-        $isDefault = (int) sql_value(
+        $isDefault = (int)sql_value(
             "SELECT COUNT(*) FROM `countries_list_default` WHERE `lang`='&1' AND `show`='&2'",
             0,
             $this->locale,

htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php

Spacing +19 added lines, -19 removed lines

@@ -184,7 +184,7 @@ 
             $databaseArray
         );
 
-        $entity->cacheId = (int) $this->connection->lastInsertId();
+        $entity->cacheId = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -298,38 +298,38 @@ 
         $entity = new GeoCacheEntity();
         $entity->cacheId = $data['cache_id'];
         $entity->uuid = $data['uuid'];
-        $entity->node = (int) $data['node'];
+        $entity->node = (int)$data['node'];
         $entity->dateCreated = new DateTime($data['date_created']);
-        $entity->isPublishdate = (bool) $data['is_publishdate'];
+        $entity->isPublishdate = (bool)$data['is_publishdate'];
         $entity->lastModified = new DateTime($data['last_modified']);
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
         $entity->listingLastModified = new DateTime($data['listing_last_modified']);
         $entity->metaLastModified = new DateTime($data['meta_last_modified']);
-        $entity->userId = (int) $data['user_id'];
+        $entity->userId = (int)$data['user_id'];
         $entity->name = $data['name'];
-        $entity->longitude = (double) $data['longitude'];
-        $entity->latitude = (double) $data['latitude'];
-        $entity->type = (int) $data['type'];
-        $entity->status = (int) $data['status'];
+        $entity->longitude = (double)$data['longitude'];
+        $entity->latitude = (double)$data['latitude'];
+        $entity->type = (int)$data['type'];
+        $entity->status = (int)$data['status'];
         $entity->country = $data['country'];
         $entity->dateHidden = new DateTime($data['date_hidden']);
-        $entity->size = (int) $data['size'];
-        $entity->difficulty = (int) $data['difficulty'];
-        $entity->terrain = (int) $data['terrain'];
+        $entity->size = (int)$data['size'];
+        $entity->difficulty = (int)$data['difficulty'];
+        $entity->terrain = (int)$data['terrain'];
         $entity->logpw = $data['logpw'];
-        $entity->searchTime = (float) $data['search_time'];
-        $entity->wayLength = (float) $data['way_length'];
+        $entity->searchTime = (float)$data['search_time'];
+        $entity->wayLength = (float)$data['way_length'];
         $entity->wpGc = $data['wp_gc'];
         $entity->wpGcMaintained = $data['wp_gc_maintained'];
         $entity->wpOc = $data['wp_oc'];
         $entity->descLanguages = $data['desc_languages'];
         $entity->defaultDesclang = $data['default_desclang'];
         $entity->dateActivate = new DateTime($data['date_activate']);
-        $entity->needNpaRecalc = (bool) $data['need_npa_recalc'];
-        $entity->showCachelists = (bool) $data['show_cachelists'];
-        $entity->protectOldCoords = (bool) $data['protect_old_coords'];
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
+        $entity->needNpaRecalc = (bool)$data['need_npa_recalc'];
+        $entity->showCachelists = (bool)$data['show_cachelists'];
+        $entity->protectOldCoords = (bool)$data['protect_old_coords'];
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
         $entity->flagsLastModified = new DateTime($data['flags_last_modified']);
 
         return $entity;

local/devel/Repositories/LanguagesRepository.php

Spacing +10 added lines, -10 removed lines

@@ -121,7 +121,7 @@ 
             $databaseArray
         );
 
-        $entity->short = (int) $this->connection->lastInsertId();
+        $entity->short = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -193,15 +193,15 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new LanguagesEntity();
-        $entity->short = (string) $data['short'];
-        $entity->name = (string) $data['name'];
-        $entity->transId = (int) $data['trans_id'];
-        $entity->nativeName = (string) $data['native_name'];
-        $entity->de = (string) $data['de'];
-        $entity->en = (string) $data['en'];
-        $entity->listDefaultDe = (int) $data['list_default_de'];
-        $entity->listDefaultEn = (int) $data['list_default_en'];
-        $entity->isTranslated = (int) $data['is_translated'];
+        $entity->short = (string)$data['short'];
+        $entity->name = (string)$data['name'];
+        $entity->transId = (int)$data['trans_id'];
+        $entity->nativeName = (string)$data['native_name'];
+        $entity->de = (string)$data['de'];
+        $entity->en = (string)$data['en'];
+        $entity->listDefaultDe = (int)$data['list_default_de'];
+        $entity->listDefaultEn = (int)$data['list_default_en'];
+        $entity->isTranslated = (int)$data['is_translated'];
 
         return $entity;
     }