OpencachingDeutschland / oc-server3

htdocs/lib2/login.class.php

Spacing +10 added lines, -10 removed lines

@@ -15,13 +15,13 @@ 
 
 use OcLegacy\Util\PasswordCrypt;
 
-define('LOGIN_UNKNOWN_ERROR', -1);     // unknown error occurred
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the userAccount locked
+define('LOGIN_UNKNOWN_ERROR', -1); // unknown error occurred
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the userAccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successful
+define('LOGIN_LOGOUT_OK', 5); // logout was successful
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);
@@ -69,7 +69,7 @@ 
 
         // TODO good input evaluation
         if ($cookie->is_set('userid') && $cookie->is_set('username')) {
-            $this->userid = (int) $cookie->get('userid');
+            $this->userid = (int)$cookie->get('userid');
             $this->username = $cookie->get('username');
             $this->permanent = (($cookie->get('permanent') + 0) == 1);
             $this->lastlogin = $cookie->get('lastlogin');
@@ -100,7 +100,7 @@ 
     public function pStoreCookie(): void
     {
         global $cookie;
-        $cookie->set('userid', (int) $this->userid);
+        $cookie->set('userid', (int)$this->userid);
         $cookie->set('username', $this->username);
         $cookie->set('permanent', ($this->permanent === true ? 1 : 0));
         $cookie->set('lastlogin', $this->lastlogin);
@@ -294,7 +294,7 @@ 
                     $rUser['user_id'],
                     ($permanent != false ? 1 : 0)
                 );
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->username = $rUser['username'];
                 $this->permanent = $permanent;
                 $this->lastlogin = date('Y-m-d H:i:s');
@@ -340,7 +340,7 @@ 
             );
             if ($rUser = sql_fetch_assoc($rs)) {
                 $this->username = $rUser['username'];
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->admin = $rUser['admin'];
                 $this->verified = true;
                 sqlf("UPDATE `user` SET `user`.`last_login`=NOW() WHERE `user`.`user_id`='&1'", $this->userid);

local/ocxml11client/xml2array.inc.php

Spacing +3 added lines, -3 removed lines

@@ -13,14 +13,14 @@
 
     public function push_pos(&$pos): void
     {
-        $this->stack[count($this->stack)] =& $pos;
-        $this->stack_ref =& $pos;
+        $this->stack[count($this->stack)] = & $pos;
+        $this->stack_ref = & $pos;
     }
 
     public function pop_pos(): void
     {
         unset($this->stack[count($this->stack) - 1]);
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
     }
 
     /**

htdocs/lib2/common.inc.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $opt['rootpath'] = __DIR__ . '/../';
 
 spl_autoload_register(
-    function ($className): void {
+    function($className): void {
         if (!preg_match('/^[\w]{1,}$/', $className)) {
             return;
         }

htdocs/src/Oc/FieldNotes/Import/ImportService.php

Spacing +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
          */
         $expressionAst = (new ExpressionLanguage())->parse($violation->getPropertyPath(), [])->getNodes();
 
-        return (int) $expressionAst->nodes['node']->nodes[1]->attributes['value'];
+        return (int)$expressionAst->nodes['node']->nodes[1]->attributes['value'];
     }
 }

htdocs/src/OcLegacy/Admin/Gdpr/GdprHandler.php

Spacing +9 added lines, -9 removed lines

@@ -225,7 +225,7 @@ 
                 WHERE cache_id = :cacheId;
 SQL
             , [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery(<<<'SQL'
@@ -237,19 +237,19 @@ 
                 WHERE cache_id = :cacheId
 SQL
             , [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM cache_desc_modified WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM cache_ignore WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM caches_modified WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
         }
     }
@@ -260,8 +260,8 @@ 
             return [];
         }
 
-        $ids = array_map(static function (array $cache) use ($idField) {
-            return (int) $cache[$idField];
+        $ids = array_map(static function(array $cache) use ($idField) {
+            return (int)$cache[$idField];
         }, $data);
 
         $pictures = $this->connection->fetchAll('SELECT * FROM pictures WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [
@@ -281,8 +281,8 @@ 
             return [];
         }
 
-        $ids = array_map(static function (array $cache) use ($idField) {
-            return (int) $cache[$idField];
+        $ids = array_map(static function(array $cache) use ($idField) {
+            return (int)$cache[$idField];
         }, $data);
 
         return $this->connection->fetchAll('SELECT * FROM pictures_modified WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [

htdocs/okapi/meta.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php return array (
+<?php return array(
   'version_number' => 1926,
   'git_revision' => 'dbed1d0d908dcc00a4aa7387de2e08b727dccee8',
 );
\ No newline at end of file

local/devel/generator.php

Spacing +3 added lines, -3 removed lines

@@ -359,13 +359,13 @@ 
 
     file_put_contents(
         __DIR__ . '/Entities/' . $classNameEntity . '.php',
-        "<?php \n\n" . (string) $classEntity,
+        "<?php \n\n" . (string)$classEntity,
         LOCK_EX
     );
 
     file_put_contents(
         __DIR__ . '/Entities/' . $classNameEntity . 'Test.php',
-        "<?php \n\n use OcTest\Modules\AbstractModuleTest; \n\n" . (string) $classEntityTest,
+        "<?php \n\n use OcTest\Modules\AbstractModuleTest; \n\n" . (string)$classEntityTest,
         LOCK_EX
     );
 
@@ -378,7 +378,7 @@ 
 use Oc\Repository\Exception\RecordNotFoundException;
 use Oc\Repository\Exception\RecordNotPersistedException;
 use Oc\Repository\Exception\RecordsNotFoundException; \n\n" .
-        (string) $classRepository,
+        (string)$classRepository,
         LOCK_EX
     );
 }

htdocs/config2/settings-dist.inc.php

Spacing +17 added lines, -17 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
  *
@@ -152,7 +152,7 @@ 
  */
 $opt['session']['cookiename'] = 'ocdevelopment'; // 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']
 
 /* Debug level (combine with OR | )
  *  DEBUG_NO              = productive use
@@ -170,7 +170,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/';
@@ -204,7 +204,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
     ],
 ];
 
@@ -364,7 +364,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';
@@ -372,18 +372,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
  *

htdocs/mylists.php

Spacing +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
 
 if (isset($_REQUEST['list_caches'])) {
     $list_caches = strtoupper(trim($_REQUEST['list_caches']));
-} elseif (isset($_REQUEST['addCache']) &&  $_REQUEST['addCache'] >= 1) {
+} elseif (isset($_REQUEST['addCache']) && $_REQUEST['addCache'] >= 1) {
     $list_caches = $_REQUEST['addCache'];
 } else {
     $list_caches = '';
 }
 
-if (isset($_REQUEST['addCache'])){
+if (isset($_REQUEST['addCache'])) {
     foreach ($list_caches as $nCacheId) {
         $cache = new cache($nCacheId);
         $oc_codes[] = $cache->getWPOC();