OpencachingDeutschland / oc-server3

htdocs/lib2/errorhandler.inc.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
     $errorlog_dir = __DIR__ . '/../var/errorlog';
     $errorlog_path = $errorlog_dir . '/errorlog-' . date('Y-m-d');
 
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
 
     // All errors which may happen here are ignored, to avoid error recursions.
 

htdocs/config2/settings-dist.inc.php

Spacing +21 added lines, -21 removed lines

@@ -7,8 +7,8 @@ 
  *  Do not modify this file - use settings.inc.php!
  ***************************************************************************/
 
-require_once __DIR__. '/locale.inc.php';
-require_once __DIR__. '/settings-dist-common.inc.php';
+require_once __DIR__ . '/locale.inc.php';
+require_once __DIR__ . '/settings-dist-common.inc.php';
 
 /* PHP settings
  *
@@ -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'] = 'http://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'http://www.opencaching.de/';
@@ -218,7 +218,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'http://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -377,7 +377,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';
@@ -385,18 +385,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
 
 /* phpbb news integration (index.php, outdated)
  *

htdocs/lib2/logic/getNew.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
     }
 
     /**
-     * @param $userCountry
+     * @param string $userCountry
      */
     public function set_userCountry($userCountry)
     {
@@ -41,7 +41,7 @@ 
      *
      * @param string $type type of the "new"-information, i.e. cache, event, rating, etc
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return resource|null mysql result used by smarty assign_rs
      */
     public function rsForSmarty($type, $args = null)
     {
@@ -89,7 +89,7 @@ 
      * cacheRs executes the database statements for type "cache"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function cacheRs($args = null)
     {
@@ -143,7 +143,7 @@ 
      * eventRs executes the database statements for type "event"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function eventRs($args = null)
     {
@@ -215,7 +215,7 @@ 
      * ratingRs executes the database statements for type "rating"
      *
      * @param array $args numeric array containing the parameter for "sql_slave"
-     * @return object mysql result used by smarty assign_rs
+     * @return resource mysql result used by smarty assign_rs
      */
     private function ratingRs($args = null)
     {

htdocs/lib2/search/search.html.inc.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         // decide if the cache is new
         $dDiff = dateDiff('d', $rCache['date_created'], date('Y-m-d'));
 
-        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int) $rCache['type'] !== 6);
+        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int)$rCache['type'] !== 6);
 
         // get last logs
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {

htdocs/viewprofile.php

Spacing +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
 $tpl->assign('hidden', $record['hidden'] <= 0 ? '0' : $record['hidden']);
 $tpl->assign('active', $active);
 $tpl->assign('recommended', sql_value("SELECT COUNT(*) FROM `cache_rating` WHERE `user_id`='&1'", 0, $userid));
-$tpl->assign('maxrecommended', (int) floor($record['found'] * $opt['logic']['rating']['percentageOfFounds'] / 100));
+$tpl->assign('maxrecommended', (int)floor($record['found'] * $opt['logic']['rating']['percentageOfFounds'] / 100));
 $tpl->assign('show_statistics', $show_statistics);
 $tpl->assign('show_oconly81', $show_oconly81);
 

htdocs/editlog.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
                     $rating_msg = mb_ereg_replace('{max}', floor($user_founds * $rating_percentage / 100), $rating_msg);
                     $rating_msg = mb_ereg_replace('{curr}', $user_tops, $rating_msg);
                 } else {
-                    $anzahl = (int) (($user_tops + 1 - ($user_founds * $rating_percentage / 100)) / ($rating_percentage / 100));
+                    $anzahl = (int)(($user_tops + 1 - ($user_founds * $rating_percentage / 100)) / ($rating_percentage / 100));
                     if ($anzahl > 1) {
                         $rating_msg = mb_ereg_replace('{anzahl}', $anzahl, $rating_too_few_founds);
                     } else {

htdocs/src/OcLegacy/Cronjobs/SiteMaps.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $page = $opt['page'];
         $url = ($page['https']['mode'] == HTTPS_ENFORCED ? $page['absolute_https_url'] : $page['absolute_http_url']);
 
-        $url = urlencode($url. 'sitemap.xml');
+        $url = urlencode($url . 'sitemap.xml');
 
         $this->pingSearchEngine('http://www.google.com/webmasters/ping?sitemap=' . $url);
         $this->pingSearchEngine(

htdocs/src/OcLegacy/Util/SiteMapXml.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         $sXML .= '<lastmod>' . xmlentities(date('c', $dLastMod)) . '</lastmod>';
         $sXML .= '<changefreq>' . xmlentities($sChangeFreq) . '</changefreq>';
         $sXML .= '<priority>' . xmlentities($nPriority) . '</priority>';
-        $sXML .= '</url>'."\n";
+        $sXML .= '</url>' . "\n";
 
         $this->writeInternal($sXML);
     }

htdocs/lib2/logic/user.class.php

Spacing +2 added lines, -2 removed lines

@@ -1591,7 +1591,7 @@ 
         global $opt;
 
         // get number of possible rates
-        return (int) floor($this->getStatFound() * $opt['logic']['rating']['percentageOfFounds'] / 100);
+        return (int)floor($this->getStatFound() * $opt['logic']['rating']['percentageOfFounds'] / 100);
     }
 
     public function allowRatings()
@@ -1605,7 +1605,7 @@ 
         global $opt;
         $rating = $opt['logic']['rating'];
 
-        return (int) ($rating['percentageOfFounds'] - ($this->getStatFound() % $rating['percentageOfFounds']));
+        return (int)($rating['percentageOfFounds'] - ($this->getStatFound() % $rating['percentageOfFounds']));
     }
 
     public function showStatFounds()