OpencachingDeutschland / oc-server3

htdocs/login.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
     $target = 'myhome.php';
 }
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';   // Ocprop
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; // Ocprop
 
 if ($action == 'cookieverify') {
     // we should be logged in ... check if cookie is set ...
@@ -58,8 +58,8 @@ 
         $tpl->error(ERROR_ALREADY_LOGGEDIN);
     }
 
-    $username = isset($_POST['email']) ? $_POST['email'] : '';  // Ocprop
-    $password = isset($_POST['password']) ? $_POST['password'] : '';  // Ocprop
+    $username = isset($_POST['email']) ? $_POST['email'] : ''; // Ocprop
+    $password = isset($_POST['password']) ? $_POST['password'] : ''; // Ocprop
 
     $retval = $login->try_login($username, $password, null);
     $password = '';

htdocs/config2/settings-dist.inc.php

Spacing +19 added lines, -19 removed lines

@@ -108,7 +108,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'] = '';
@@ -122,14 +122,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
  *
@@ -151,15 +151,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'] = 'oc_devel'; // 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.
@@ -185,7 +185,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/';
@@ -219,7 +219,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
     ],
 ];
 
@@ -379,7 +379,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';
@@ -387,18 +387,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/config2/settings-dev.inc.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 );
 
 $opt['page']['develsystem'] = true;
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 
 $opt['mail']['from'] = 'root';
 $opt['mail']['subject'] = '[local.opencaching.de] ';

htdocs/config2/settings-dist-common.inc.php

Spacing +4 added lines, -4 removed lines

@@ -15,11 +15,11 @@ 
  *   bin/dbsv-update.php will then migrate the tables' charset.
  */
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
 
 // handling of SQL and PHP errors
 $opt['db']['error']['display'] = false;
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
 
 // page title
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@ 
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
  * See examples for overriding in settings-sample.inc.php.
  */
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
 // see http://forum.opencaching.de/index.php?topic=3065.0
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -94,7 +94,7 @@ 
 // see also setting in lib/settings.inc.php!
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
 $opt['logic']['admin']['enable_listing_admins'] = false;
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
 
 /*
  * html purifier

htdocs/config2/settings-sample.inc.php

Spacing +3 added lines, -3 removed lines

@@ -66,8 +66,8 @@ 
  * other parameters may be customized
  */
 $opt['session']['mode'] = SAVE_COOKIE;
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 /* multi-domain settings
  *

htdocs/editlog.php

Spacing +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
                 tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl));
 
                 if (isset($_POST['descMode'])) {
-                    $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+                    $descMode = $_POST['descMode'] + 0; // Ocprop: 2
                     if (($descMode < 1) || ($descMode > 3)) {
                         $descMode = 3;
                     }
@@ -434,7 +434,7 @@ 
                 tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', $log_record['cache_id']);
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
                 tpl_set_var('logid', $log_id);
                 tpl_set_var('date_message', !$date_ok ? $date_message : '');

htdocs/lib/settings-dist.inc.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 
 // sql debugging
 $sql_allow_debug = 0;
-$sql_debug_cryptkey = 'this is my very, very secret \'secret key\'';  // min. 24 chars
+$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars
 
 // replacements for sql()
 $sql_replacements['db'] = $dbname;
@@ -148,7 +148,7 @@ 
 
 /* default locale
  */
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
 
 // include all locale settings
 require_once $rootpath . 'config2/locale.inc.php';

htdocs/lib/settings-dev.inc.php

Spacing +2 added lines, -2 removed lines

@@ -117,11 +117,11 @@
 /* maximum number of failed logins per hour before that IP address is blocked
  * (used to prevent brute-force-attacks)
  */
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
 
 // data license
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
 $opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
 
 $opt['logic']['admin']['listingadmin_notification'] = 'root';

htdocs/lib/consts-common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  *  common constant definitions of lib1 and lib2
  ***************************************************************************/
 
-define('GUI_HTML', 0);   // also defined in lib/consts.inc.php
+define('GUI_HTML', 0); // also defined in lib/consts.inc.php
 define('GUI_TEXT', 1);
 
-define('HTTPS_DISABLED', 0);   // also defined in lib/consts.inc.php
+define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php
 define('HTTPS_ENABLED', 1);
 define('HTTPS_ENFORCED', 2);