OpencachingDeutschland / oc-server3

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

htdocs/config2/settings-dist.inc.php

Spacing +19 added lines, -19 removed lines

@@ -107,7 +107,7 @@ 
 // database placeholder
 
 // productive database with opencaching-tables
-$opt['db']['placeholder']['db'] = '';    // selected by default
+$opt['db']['placeholder']['db'] = ''; // selected by default
 
 // empty database for temporary table creation
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -121,14 +121,14 @@ 
 $opt['system']['maillog']['syslog_db_user'] = '';
 $opt['system']['maillog']['syslog_db_password'] = '';
 $opt['system']['maillog']['syslog_db_table'] = '';
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
 
 /* cookie or session
  *
@@ -150,15 +150,15 @@ 
  *
  * other parameters may be customized
  */
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* maximum session lifetime
  */
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -184,7 +184,7 @@ 
 /* other template options
  *
  */
-$opt['page']['origin_url'] = 'https://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'https://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'https://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'https://www.opencaching.de/';
@@ -218,7 +218,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'https://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -378,7 +378,7 @@ 
 
 /* license-related functions
  */
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
 $opt['logic']['license']['admin'] = true;
 $opt['logic']['license']['disclaimer'] = false;
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -386,18 +386,18 @@ 
 
 /* optional APIs
  */
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
 
 /* cache report info settings
  */
 $opt['logic']['cache_reports']['delaydays'] = 2;
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
 
 /* cronjob
  */
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
 
 /* generate sitemap.xml and upload to search engines
  *

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/Page/PageProvider.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 
         $sameLocale = $preferredLocale === $defaultLocale;
 
-        if(!$sameLocale && count($pageBlocks) === 0) {
+        if (!$sameLocale && count($pageBlocks) === 0) {
             //Fetch fallback if blocks are empty
             $pageBlocks = $this->getPageBlocks(
                 $page,

htdocs/src/Oc/Page/Persistence/PageRepository.php

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -116,7 +116,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -175,13 +175,13 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new PageEntity();
-        $entity->id = (int) $data['id'];
+        $entity->id = (int)$data['id'];
         $entity->slug = $data['slug'];
         $entity->metaKeywords = $data['meta_keywords'];
         $entity->metaDescription = $data['meta_description'];
         $entity->metaSocial = $data['meta_social'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

htdocs/src/Oc/Page/Persistence/BlockRepository.php

Spacing +7 added lines, -7 removed lines

@@ -93,7 +93,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -120,7 +120,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -163,7 +163,7 @@ 
             'page_id' => $entity->pageId,
             'title' => $entity->title,
             'html' => $entity->html,
-            'position' => (int) $entity->position,
+            'position' => (int)$entity->position,
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
             'active' => $entity->active,
         ];
@@ -179,13 +179,13 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new BlockEntity();
-        $entity->id = (int) $data['id'];
-        $entity->pageId = (int) $data['page_id'];
+        $entity->id = (int)$data['id'];
+        $entity->pageId = (int)$data['page_id'];
         $entity->title = $data['title'];
         $entity->html = $data['html'];
-        $entity->position = (int) $data['position'];
+        $entity->position = (int)$data['position'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

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;