OpencachingDeutschland / oc-server3

htdocs/src/Oc/Command/CreateWebCacheCommand.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
         $filesJson = json_decode(file_get_contents($projectDir . '/theme/frontend/js/files.json'), true);
         $ownFiles = $filesJson['files'];
 
-        $ownFiles = array_map(function ($file) use ($applicationJsPath) {
+        $ownFiles = array_map(function($file) use ($applicationJsPath) {
             if (strpos($file, '**') !== false) {
                 return null;
             }
@@ -116,7 +116,7 @@ 
         $finder = new Finder();
         $finder->in($applicationJsPath . '/plugins/')->name('*.js');
 
-        $jsPlugins = array_map(function ($file) {
+        $jsPlugins = array_map(function($file) {
             return $file->getRealPath();
         }, iterator_to_array($finder->files()));
 
@@ -147,7 +147,7 @@ 
         $scss = new Compiler();
         $scss->setIgnoreErrors(true);
         $scss->addImportPath($applicationScssPath);
-        $scss->addImportPath(function ($path) use ($projectDir) {
+        $scss->addImportPath(function($path) use ($projectDir) {
             //Check for tilde as this refers to the node_modules dir
             if (strpos($path, '~') === 0) {
                 $path = str_replace(

htdocs/src/Oc/Util/CBench.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         [$uSec, $sec] = explode(' ', microtime());
 
-        return ((float) $uSec + (float) $sec);
+        return ((float)$uSec + (float)$sec);
     }
 
     /**

htdocs/src/Oc/Session/SessionDataNative.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             if ($opt['session']['check_referer']) {
                 if (isset($_SERVER['REFERER'])) {
                     // TODO fix the following if statement, seems corrupted
-                    if (stripos('http' + strstr($_SERVER['REFERER'], '://'), strtolower($opt['page']['absolute_http_url'])) !== 0
+                    if (stripos('http' +strstr($_SERVER['REFERER'], '://'), strtolower($opt['page']['absolute_http_url'])) !== 0
                     ) {
                         $this->createNewSession();
                     }

htdocs/src/OcLegacy/Map/StaticMap.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @var string
      */
-    private $tileCacheBaseDir =  __DIR__ . '/../../../var/cache2/staticmap';
+    private $tileCacheBaseDir = __DIR__ . '/../../../var/cache2/staticmap';
 
     /**
      * @var int
@@ -127,11 +127,11 @@ 
 
         if (isset($_GET['size']) && !empty($_GET['size'])) {
             list($this->width, $this->height) = explode('x', $_GET['size']);
-            $this->width = (int) $this->width;
+            $this->width = (int)$this->width;
             if ($this->width > $this->maxWidth) {
                 $this->width = $this->maxWidth;
             }
-            $this->height = (int) $this->height;
+            $this->height = (int)$this->height;
             if ($this->height > $this->maxHeight) {
                 $this->height = $this->maxHeight;
             }

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/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'] = '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']
 
 /* 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
  *

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