OpencachingDeutschland / oc-server3

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();

htdocs/search.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
 $load_query = false;
 $show_lastsearchbutton = true;
 
-$list_caches = isset($_REQUEST['addCache']) &&  $_REQUEST['addCache'] >= 1 ? $_REQUEST['addCache'] : '';
+$list_caches = isset($_REQUEST['addCache']) && $_REQUEST['addCache'] >= 1 ? $_REQUEST['addCache'] : '';
 $added_waypoints = 0;
 
 if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {  // Ocprop: showresult, queryid
@@ -1297,11 +1297,11 @@ 
 
         //add selected caches to selected cachelist
         if (isset($_REQUEST['addToList']) && isset($_REQUEST['addCache']) && isset($_REQUEST['selectCachelist'])) {
-            $list_caches_= $_REQUEST['addToList'];
+            $list_caches_ = $_REQUEST['addToList'];
             $added_waypoints = addToList($list_caches);
-            $addCachelist= cachelist::getListById((int) $_REQUEST['selectCachelist']); // null for invalid ID
+            $addCachelist = cachelist::getListById((int)$_REQUEST['selectCachelist']); // null for invalid ID
         } elseif (isset($_REQUEST['addToList'])) {
-            $addCachelist= cachelist::getListById((int) $_REQUEST['selectCachelist']); // null for invalid ID
+            $addCachelist = cachelist::getListById((int)$_REQUEST['selectCachelist']); // null for invalid ID
             $error_addCaches = true;
         }
 

htdocs/lib2/edithelper.inc.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
             // mode switch from plain text to HTML editor => convert HTML special chars
             $text = nl2br(htmlspecialchars($text));
             // .. and smilies
-            $text = ' ' . $text . ' ';   // see Redmine #1103
+            $text = ' ' . $text . ' '; // see Redmine #1103
             $text = str_replace($smiley['text'], $smiley['spaced_image'], $text);
             if (substr($text, 0, 1) == ' ') {
                 $text = substr($text, 1);
@@ -63,7 +63,7 @@ 
             // convert to HTML for storing to database
             // also implemented in okapi/services/logs/submit.php
             $text = nl2br(htmlspecialchars($text, ENT_COMPAT, 'UTF-8'));
-            $text = str_replace('  ', '  ', $text);   // can produce new '  ' ('  ' + ' ')
+            $text = str_replace('  ', '  ', $text); // can produce new '  ' ('  ' + ' ')
             $text = str_replace('  ', '  ', $text);
         } else {
             // mode switch from HTML editor to plain text, or decode HTML-encoded plain text
@@ -125,7 +125,7 @@ 
         // REDMINE-1249: Missing log text in mail notification
         // simpler solution that converts html to text as the previous class html2text emptied the text completely
         // implementation for line wrap, url's and probably more is missing
-        $text = preg_replace( "/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
+        $text = preg_replace("/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
 
         $text = str_replace(
             [