OpencachingDeutschland / oc-server3

htdocs/config2/settings-dist.inc.php

Spacing +21 added lines, -21 removed lines

@@ -7,8 +7,8 @@ 
  *  Do not modify this file - use settings.inc.php!
  ***************************************************************************/
 
-require_once __DIR__. '/locale.inc.php';
-require_once __DIR__. '/settings-dist-common.inc.php';
+require_once __DIR__ . '/locale.inc.php';
+require_once __DIR__ . '/settings-dist-common.inc.php';
 
 /* PHP settings
  *
@@ -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
 
 /* phpbb news integration (index.php, outdated)
  *

htdocs/lib2/search/ftsearch.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -68,9 +68,9 @@ 
 /**
  * str = single word
  * @param $str
- * @param $simple
+ * @param boolean $simple
  *
- * @return array
+ * @return string
  */
 function ftsearch_split(&$str, $simple)
 {
@@ -141,7 +141,7 @@ 
  * str = single word
  * @param $str
  *
- * @return mixed|string
+ * @return string
  */
 function ftsearch_text2simple($str)
 {
@@ -171,7 +171,7 @@ 
  * str = single word
  * @param $str
  *
- * @return mixed|string
+ * @return string
  */
 function ftsearch_text2sort($str)
 {
@@ -314,7 +314,7 @@ 
 /**
  * @param $text
  *
- * @return mixed|string
+ * @return string
  */
 function ftsearch_strip_html($text)
 {

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     ['ai', 'ei'],
     ['ou', 'u'],
     ['th', 't'],
-    ['ph','f'],
+    ['ph', 'f'],
     ['oh', 'o'],
     ['ah', 'a'],
     ['eh', 'e'],
@@ -101,7 +101,7 @@ 
     $str = '';
 
     ftsearch_load_ignores();
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
         // ignore?
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
             unset($astr[$i]);
@@ -156,7 +156,7 @@ 
 
     // doppelte chars ersetzen
     $ordZ = ord('z');
-    for ($c = ord('a'); $c <= $ordZ; $c ++) {
+    for ($c = ord('a'); $c <= $ordZ; $c++) {
         $old_str = '';
         while ($old_str !== $str) {
             $old_str = $str;

htdocs/lib2/search/search.gpx.inc.php

Spacing +2 added lines, -2 removed lines

@@ -433,9 +433,9 @@
         $thisline = mb_ereg_replace('{logs}', $logentries, $thisline);
 
         // attributes
-        $addAttributes = [-1];  // dummy
+        $addAttributes = [-1]; // dummy
         if ($r['type'] == 10) {   // Drive-in
-            $addAttributes[] = 24;  // near the car / park and grab
+            $addAttributes[] = 24; // near the car / park and grab
         }
         $rsAttributes = sql_slave(
             "

htdocs/src/Oc/Translation/CrowdinExport.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $select = '';
         $joins = '';
         foreach (['de', 'fr', 'nl', 'es', 'pl', 'it', 'ru'] as $languageKey) {
-            $joins .= "\n".' LEFT JOIN sys_trans_text ' . $languageKey . ' ON ' . $languageKey . '.trans_id = source.trans_id AND ' . $languageKey . '.lang = "' . $languageKey . '" ';
+            $joins .= "\n" . ' LEFT JOIN sys_trans_text ' . $languageKey . ' ON ' . $languageKey . '.trans_id = source.trans_id AND ' . $languageKey . '.lang = "' . $languageKey . '" ';
             $select .= ', ' . $languageKey . '.text as ' . $languageKey . ' ';
         }
 

htdocs/src/Oc/Page/BlockRepository.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -89,7 +89,7 @@ 
             $entity->toDatabaseArray()
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
     }
 
     /**
@@ -111,7 +111,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }

htdocs/src/Oc/Page/PageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -87,7 +87,7 @@ 
             $entity->toDatabaseArray()
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -111,7 +111,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }

htdocs/src/Oc/Language/LanguageEntity.php

Spacing +9 added lines, -9 removed lines

@@ -94,15 +94,15 @@
      */
     public function fromDatabaseArray(array $data)
     {
-        $this->short = (string) strtolower($data['short']);
-        $this->name = (string) $data['name'];
-        $this->nativeName = (string) $data['native_name'];
-        $this->de = (string) $data['de'];
-        $this->en = (string) $data['en'];
-        $this->translationId = (int) $data['trans_id'];
-        $this->listDefaultDe = (bool) $data['list_default_de'];
-        $this->listDefaultEn = (bool) $data['list_default_en'];
-        $this->isTranslated = (bool) $data['is_translated'];
+        $this->short = (string)strtolower($data['short']);
+        $this->name = (string)$data['name'];
+        $this->nativeName = (string)$data['native_name'];
+        $this->de = (string)$data['de'];
+        $this->en = (string)$data['en'];
+        $this->translationId = (int)$data['trans_id'];
+        $this->listDefaultDe = (bool)$data['list_default_de'];
+        $this->listDefaultEn = (bool)$data['list_default_en'];
+        $this->isTranslated = (bool)$data['is_translated'];
 
         return $this;
     }

htdocs/src/Oc/Country/CountryEntity.php

Spacing +9 added lines, -9 removed lines

@@ -94,15 +94,15 @@
      */
     public function fromDatabaseArray(array $data)
     {
-        $this->short = (string) $data['short'];
-        $this->name = (string) $data['name'];
-        $this->de = (string) $data['de'];
-        $this->en = (string) $data['en'];
-        $this->translationId = (int) $data['trans_id'];
-        $this->listDefaultDe = (bool) $data['list_default_de'];
-        $this->listDefaultEn = (bool) $data['list_default_en'];
-        $this->sortDe = (string) $data['sort_de'];
-        $this->sortEn = (string) $data['sort_en'];
+        $this->short = (string)$data['short'];
+        $this->name = (string)$data['name'];
+        $this->de = (string)$data['de'];
+        $this->en = (string)$data['en'];
+        $this->translationId = (int)$data['trans_id'];
+        $this->listDefaultDe = (bool)$data['list_default_de'];
+        $this->listDefaultEn = (bool)$data['list_default_en'];
+        $this->sortDe = (string)$data['sort_de'];
+        $this->sortEn = (string)$data['sort_en'];
 
         return $this;
     }

htdocs/src/Oc/Page/BlockEntity.php

Spacing +7 added lines, -7 removed lines

@@ -69,7 +69,7 @@ 
             'page_id' => $this->pageId,
             'title' => $this->title,
             'html' => $this->html,
-            'position' => (int) $this->position,
+            'position' => (int)$this->position,
             'updated_at' => $this->updatedAt->format(DateTime::ATOM),
             'active' => $this->active
         ];
@@ -84,13 +84,13 @@ 
      */
     public function fromDatabaseArray(array $data)
     {
-        $this->id = (int) $data['id'];
-        $this->pageId = (int) $data['page_id'];
-        $this->title = (string) $data['title'];
-        $this->html = (string) $data['html'];
-        $this->position = (int) $data['position'];
+        $this->id = (int)$data['id'];
+        $this->pageId = (int)$data['page_id'];
+        $this->title = (string)$data['title'];
+        $this->html = (string)$data['html'];
+        $this->position = (int)$data['position'];
         $this->updatedAt = new DateTime($data['updated_at']);
-        $this->active = (bool) $data['active'];
+        $this->active = (bool)$data['active'];
 
         return $this;
     }