OpencachingDeutschland / oc-server3

htdocs/lib2/logic/attribute.class.php

Spacing +12 added lines, -12 removed lines

@@ -151,18 +151,18 @@
     public static function getConflictingAttribIds($attribId)
     {
         static $conflicts = [
-            [1, 38],    // only at night - 24/7
-            [1, 40],    // only at night - only by day
-            [24, 25],   // near the parking area - long walk
-            [24, 27],   // near the parking area - hilly area
-            [24, 29],   // near the parking area - swimming required
-            [24, 50],   // near the parking area - cave equipment
-            [24, 51],   // near the parking area - diving equipment
-            [24, 52],   // near the parking area - watercraft
-            [38, 39],   // 24/7 - only at specified times
-            [38, 40],   // 24/7 - only by day
-            [42, 43],   // all seasons - breeding season
-            [42, 60],    // all seassons - only during specified seasons
+            [1, 38], // only at night - 24/7
+            [1, 40], // only at night - only by day
+            [24, 25], // near the parking area - long walk
+            [24, 27], // near the parking area - hilly area
+            [24, 29], // near the parking area - swimming required
+            [24, 50], // near the parking area - cave equipment
+            [24, 51], // near the parking area - diving equipment
+            [24, 52], // near the parking area - watercraft
+            [38, 39], // 24/7 - only at specified times
+            [38, 40], // 24/7 - only by day
+            [42, 43], // all seasons - breeding season
+            [42, 60], // all seassons - only during specified seasons
         ];
 
         static $conflictsByAttr = [];

htdocs/lib2/logic/picture.class.php

Spacing +2 added lines, -2 removed lines

@@ -587,9 +587,9 @@
                 return false;
             }
             // restore picture file
-                $this->setUrl($original_url);     // set the url, so that we can
+                $this->setUrl($original_url); // set the url, so that we can
                 $filename = $this->getFilename(); // .. retrieve the file path+name
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deletedFilename($filename), $this->getFilename());
                 } catch (Exception $e) {

Doc Comments +1 added lines, -1 removed lines

@@ -716,7 +716,7 @@
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function getPageLink()
     {

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'] = '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
 
 /* generate sitemap.xml and upload to search engines
  *

local/ocxml11client/index.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
     $nFileNr = 0;
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
     while ($r = sql_fetch_array($rs)) {
-        $nFileNr ++;
+        $nFileNr++;
         $fileparts = mb_split('/', $r['url']);
         $filename = $fileparts[count($fileparts) - 1];
 
@@ -233,7 +233,7 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
+        for ($i = 1; $i <= $filescount; $i++) {
             echo 'Download Paket: ' . $i . ' von ' . $filescount . "\n";
 
             $fileurl = $opt['url_getsession'];
@@ -407,11 +407,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -428,7 +428,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }