OpencachingDeutschland / oc-server3

htdocs/lib2/Net/IDNA2/Exception/Nameprep.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../Exception.php';
+require_once __DIR__.'/../Exception.php';
 // adjusted path for OC distribution
 
 class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception

htdocs/lib2/ProcessSync.class.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
     public function __construct($name)
     {
         global $opt;
-        $this->pidfile_path = $opt['rootpath'] . "cache2/$name.pid";
+        $this->pidfile_path = $opt['rootpath']."cache2/$name.pid";
     }
 
 
@@ -29,7 +29,7 @@ 
         }
 
         if (file_exists($this->pidfile_path)) {
-            echo "Error: Pidfile (" . $this->pidfile_path . ") already present\n";
+            echo "Error: Pidfile (".$this->pidfile_path.") already present\n";
 
             return false;
         } else {
@@ -39,7 +39,7 @@ 
 
                 return true;
             } else {
-                echo "can't create Pidfile " . $this->pidfile_path . "\n";
+                echo "can't create Pidfile ".$this->pidfile_path."\n";
 
                 return false;
             }
@@ -59,19 +59,19 @@ 
 
             // bad PID file, e.g. due to system malfunction while creating the file?
             if ($pid_daemon <= 0) {
-                echo "removing bad pid_file (" . $this->pidfile_path . ")\n";
+                echo "removing bad pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return false;
             } // process running?
             elseif (posix_kill($pid_daemon, 0)) {
                 // yes, good bye
-                echo "Error: process for " . $this->pidfile_path . " is already running with pid=$pid_daemon\n";
+                echo "Error: process for ".$this->pidfile_path." is already running with pid=$pid_daemon\n";
 
                 return false;
             } else {
                 // no, remove pid_file
-                echo "process not running, removing old pid_file (" . $this->pidfile_path . ")\n";
+                echo "process not running, removing old pid_file (".$this->pidfile_path.")\n";
                 unlink($this->pidfile_path);
 
                 return true;
@@ -93,11 +93,11 @@ 
                 unlink($this->pidfile_path);
             }
         } else {
-            echo "Error: can't delete own pidfile (" . $this->pidfile_path . ")\n";
+            echo "Error: can't delete own pidfile (".$this->pidfile_path.")\n";
         }
 
         if ($message) {
-            echo $message . "\n";
+            echo $message."\n";
         }
     }
 

htdocs/lib2/web.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,23 +19,23 @@ 
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in HTML format
 $opt['gui'] = GUI_HTML;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
 
 // enforce http or https?
 if ($opt['page']['https']['mode'] == HTTPS_DISABLED) {
     if ($opt['page']['https']['active']) {
-        $tpl->redirect('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('http://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = false;
 } elseif ($opt['page']['https']['mode'] == HTTPS_ENFORCED) {
     if (!$opt['page']['https']['active']) {
-        $tpl->redirect('https://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
+        $tpl->redirect('https://'.$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
     }
     $opt['page']['force_https_login'] = true;
 }
@@ -83,7 +83,7 @@ 
     if (substr($helppage, 0, 1) == "!") {
         substr($helppage, 1);
     } elseif ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki'])) {
-        return $opt['locale'][$help_locale]['helpwiki'] . str_replace(' ', '_', $helppage);
+        return $opt['locale'][$help_locale]['helpwiki'].str_replace(' ', '_', $helppage);
     } else {
         return "";
     }
@@ -98,8 +98,8 @@ 
         return "";
     } else {
         $imgtitle = $translate->t($title, '', basename(__FILE__), __LINE__);
-        $imgtitle = "alt='" . $imgtitle . "' title='" . $imgtitle . "'";
+        $imgtitle = "alt='".$imgtitle."' title='".$imgtitle."'";
 
-        return "<a class='nooutline' href='" . $helpurl . "' " . $imgtitle . " target='_blank'>";
+        return "<a class='nooutline' href='".$helpurl."' ".$imgtitle." target='_blank'>";
     }
 }

htdocs/cachelist.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Shortcut for cachelist search
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $id = isset($_REQUEST['id']) ? $_REQUEST['id'] + 0 : 0;
 $password = isset($_REQUEST['key']) ? $_REQUEST['key'] : '';
@@ -33,9 +33,9 @@ 
         }
     }
 
-    $tpl->redirect("search.php?searchto=searchbylist&listid=" . $id .
-        ($password != "" ? "&listkey=" . urlencode($password) : "") .
-        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname" . $invalid_waypoints);
+    $tpl->redirect("search.php?searchto=searchbylist&listid=".$id.
+        ($password != "" ? "&listkey=".urlencode($password) : "").
+        "&showresult=1&f_disabled=0&f_inactive=0&f_ignored=1&sort=byname".$invalid_waypoints);
 } else {
     $tpl->redirect("cachelists.php");
 }

htdocs/mystatpic.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/./lib2/web.inc.php';
+require_once __DIR__.'/./lib2/web.inc.php';
 
 $tpl->name = 'mystatpic';
 $tpl->menuitem = MNU_MYPROFILE_DATA_STATPIC;

htdocs/query.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'query';
 $tpl->menuitem = MNU_MYPROFILE_QUERIES;
@@ -72,7 +72,7 @@ 
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

Braces +2 added lines, -1 removed lines

@@ -39,7 +39,8 @@
 } elseif ($action == 'delete') {
     $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] + 0 : 0;
     deletequery($queryid);
-} else { // default: view
+} else {
+// default: view
     viewqueries();
 }
 

htdocs/mailto.php

Spacing +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'mailto';
 $tpl->menuitem = MNU_USER_MAILTO;
 
 $login->verify();
 if ($login->userid == 0) {
-    $tpl->redirect('login.php?target=' . urlencode($tpl->target));
+    $tpl->redirect('login.php?target='.urlencode($tpl->target));
 }
 
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -36,7 +36,7 @@ 
     $wp = $_REQUEST['wp'];
     $cachename = trim(sql_value("SELECT `name` FROM `caches` WHERE `wp_oc`='&1'", '', $wp));
     if ($cachename) {
-        $subject = $translate->t('Your geocache', '', 0, 0) . ' "' . $cachename . '" (' . $wp . ')';
+        $subject = $translate->t('Your geocache', '', 0, 0).' "'.$cachename.'" ('.$wp.')';
     }
 } elseif (isset($_REQUEST['reportid']) && $login->admin) {
     $rs = sql(
@@ -47,7 +47,7 @@ 
         $_REQUEST['reportid']
     );
     if ($r = sql_fetch_assoc($rs)) {
-        $subject = $translate->t('Your geocache report for', '', 0, 0) . ' ' . $r['wp_oc'] . ' (' . $r['name'] . ')';
+        $subject = $translate->t('Your geocache report for', '', 0, 0).' '.$r['wp_oc'].' ('.$r['name'].')';
     }
     sql_free_result($rs);
 }

htdocs/config2/settings-dist.inc.php

Spacing +23 added lines, -23 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
     ],
 ];
 
@@ -277,7 +277,7 @@ 
 $opt['logic']['pictures']['dummy']['bgcolor'] = [255, 255, 255];
 $opt['logic']['pictures']['dummy']['text'] = '';
 $opt['logic']['pictures']['dummy']['textcolor'] = [0, 0, 0];
-$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'] . 'images/';
+$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'].'images/';
 
 /* cachemaps (obsolete)
  */
@@ -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)
  *
@@ -496,7 +496,7 @@ 
 // a redirect to redirect-setting will be done
 // (use exact same url with slashes etc. as registered by garmin)
 $opt['lib']['garmin']['domain'] = 'www.site.org';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 
 // if the plugin is not called from the correct domain, redirect to this site
 // (e.g. domain called without www. prefix) - must match domain of $opt['lib']['garmin']['url']
@@ -524,7 +524,7 @@ 
 
 // max number of caches displayed in google maps
 if (isset($_SERVER['HTTP_USER_AGENT'])) {
-    $user_agent = " " . $_SERVER['HTTP_USER_AGENT'];
+    $user_agent = " ".$_SERVER['HTTP_USER_AGENT'];
     if (strpos($user_agent, "MSIE") && !strpos($user_agent, "Opera")) {
         $opt['map']['maxrecords'] = 200;
     } else {
@@ -540,7 +540,7 @@ 
 /*
  * OKAPI
  */
-$opt['okapi']['var_dir'] = $opt['rootpath'] . 'var/okapi';
+$opt['okapi']['var_dir'] = $opt['rootpath'].'var/okapi';
 $opt['okapi']['github_access_token'] = null;
 
 /* Opencaching Node Daemon

htdocs/config2/settings-sample.inc.php

Spacing +4 added lines, -4 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
  *
@@ -191,7 +191,7 @@ 
  */
 $opt['lib']['garmin']['domain'] = '<domain>';
 $opt['lib']['garmin']['key'] = '00112233445566778899AABBCCDDEEFF00';
-$opt['lib']['garmin']['url'] = 'http://' . $opt['lib']['garmin']['domain'] . '/';
+$opt['lib']['garmin']['url'] = 'http://'.$opt['lib']['garmin']['domain'].'/';
 $opt['lib']['garmin']['page_url'] = 'http://<domain>/';
 
 // developer.what3words.com API Key