OpencachingDeutschland / oc-server3

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

Doc Comments +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
  * @param $oldDescMode
  * @param $descMode
  * @param $text
- * @return mixed|string
+ * @return string
  */
 function processEditorInput($oldDescMode, $descMode, $text, &$representText)
 {
@@ -54,9 +54,9 @@ 
 
 /**
  * @param $text
- * @param $texthtml0
+ * @param boolean $texthtml0
  *
- * @return mixed|string
+ * @return string
  */
 function html2plaintext($text, $texthtml0)
 {

Unused Use Statements -2 removed lines

@@ -6,8 +6,6 @@
 
 // used in both lib1 and lib2 code
 
-use OcLegacy\Editor\EditorConstants;
-
 require_once __DIR__ . '/smiley.inc.php';
 
 

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,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(
             [

htdocs/editlog.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 // editor mode switching
 if (isset($_POST['descMode'])) {
-    $descMode = (int) $_POST['descMode']; // Ocprop: 2
+    $descMode = (int)$_POST['descMode']; // Ocprop: 2
     if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
         $descMode = EditorConstants::EDITOR_MODE;
     }

htdocs/mydetails.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
     if (isset($_REQUEST['save'])) {
         $purifier = new OcHTMLPurifier($opt);
         $desctext = isset($_REQUEST['desctext']) ? $purifier->purify($_REQUEST['desctext']) : "";
-        $desc_htmledit = isset($_REQUEST['descMode']) && ((int) $_REQUEST['descMode']) == EditorConstants::HTML_MODE ? '0' : '1';
+        $desc_htmledit = isset($_REQUEST['descMode']) && ((int)$_REQUEST['descMode']) == EditorConstants::HTML_MODE ? '0' : '1';
         sql(
             "
             UPDATE `user`

htdocs/editdesc.php

Spacing +6 added lines, -6 removed lines

@@ -24,8 +24,8 @@ 
         isset($_REQUEST['desclang']) &&
         !isset($_REQUEST['descid'])) {  // Ocprop
 
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysqli_num_rows($rs) == 1) {
@@ -92,7 +92,7 @@ 
                 //save to DB?
                 if (isset($_POST['post'])) {  // Ocprop
                     //here we read all used information from the form if submitted
-                    $descMode = (int) $_POST['descMode'] ?? EditorConstants::EDITOR_MODE;  // Ocprop
+                    $descMode = (int)$_POST['descMode'] ?? EditorConstants::EDITOR_MODE; // Ocprop
 
                     switch ($descMode) {
                         case EditorConstants::HTML_MODE:
@@ -115,7 +115,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = trim($_POST['short_desc']);  // Ocprop
+                    $short_desc = trim($_POST['short_desc']); // Ocprop
                     $hint = htmlspecialchars(trim($_POST['hints']), ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -130,7 +130,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = trim($_POST['desc']);  // Ocprop
+                    $desc = trim($_POST['desc']); // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -287,7 +287,7 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor

htdocs/newcache.php

Spacing +2 added lines, -2 removed lines

@@ -108,12 +108,12 @@
         // descMode auslesen, falls nicht gesetzt aus dem Profil laden
         if (isset($_POST['descMode'])) {
             // Ocprop
-            $descMode = (int) $_POST['descMode'];
+            $descMode = (int)$_POST['descMode'];
             if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
                 $descMode = EditorConstants::EDITOR_MODE;
             }
             if (isset($_POST['oldDescMode'])) {
-                $oldDescMode = (int) $_POST['oldDescMode'];
+                $oldDescMode = (int)$_POST['oldDescMode'];
                 if (($oldDescMode < EditorConstants::HTML_MODE) || ($oldDescMode > EditorConstants::EDITOR_MODE)) {
                     $oldDescMode = $descMode;
                 }

htdocs_symfony/public/index.php

Spacing +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@ 
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
-require dirname(__DIR__).'/vendor/autoload.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
-(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+(new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
 
 if ($_SERVER['APP_DEBUG']) {
     umask(0000);
@@ -23,7 +23,7 @@ 
     Request::setTrustedHosts([$trustedHosts]);
 }
 
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();