OpencachingDeutschland / oc-server3

htdocs/lib2/logic/data-license.inc.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 
             $ltext = "© ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewprofile.php?userid=" . $userid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewprofile.php?userid=".$userid."' target='_blank'>";
             }
             $ltext .= $username;
             if ($html) {
@@ -62,7 +62,7 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $server_address . "viewcache.php?cacheid=" . $cacheid . "' target='_blank'>";
+                $ltext .= "<a href='".$server_address."viewcache.php?cacheid=".$cacheid."' target='_blank'>";
             }
             $ltext .= $opt['page']['sitename'];
             if ($html) {
@@ -70,14 +70,14 @@ 
             }
             $ltext .= ", ";
             if ($html) {
-                $ltext .= "<a href='" . $lurl . "' target='_blank'>";
+                $ltext .= "<a href='".$lurl."' target='_blank'>";
             }
             $ltext .= "CC BY-NC-ND";
             if ($html) {
                 $ltext .= "</a>";
             }
             if ($for_cachedesc) {
-                $ltext .= ", " . $asof . " " . date($df);
+                $ltext .= ", ".$asof." ".date($df);
             }
         }
 

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     $for_cachedesc,
     $html,
     $twolines = false
-) {
+)
+{
     global $opt, $translate;
 
     $ltext = "";

htdocs/lib2/logic/labels.inc.php

Spacing +9 added lines, -9 removed lines

@@ -6,11 +6,11 @@ 
  ***************************************************************************/
 
 // try to include cache file
-if (!file_exists($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php')) {
+if (!file_exists($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php')) {
     labels::CreateCacheFile();
 }
 
-require $opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php';
+require $opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php';
 
 class labels
 {
@@ -20,7 +20,7 @@ 
     {
         global $opt;
 
-        $f = fopen($opt['rootpath'] . 'cache2/labels-' . $opt['template']['locale'] . '.inc.php', 'w');
+        $f = fopen($opt['rootpath'].'cache2/labels-'.$opt['template']['locale'].'.inc.php', 'w');
         fwrite($f, "<?php\n");
 
         $a = array();
@@ -42,7 +42,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_attrib", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_attrib", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -63,7 +63,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_size", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_size", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -84,7 +84,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_status", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_status", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -105,7 +105,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("cache_type", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("cache_type", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $a = [];
         $rs = sql(
@@ -126,7 +126,7 @@ 
             $a[$r['id']] = $r['name'];
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("log_types", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("log_types", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         $nLastGroup = 1;
         $a = array();
@@ -155,7 +155,7 @@ 
             $a[] = $r;
         }
         sql_free_result($rs);
-        fwrite($f, 'labels::addLabels("usercountrieslist", "' . str_replace('"', '\\"', serialize($a)) . '");' . "\n");
+        fwrite($f, 'labels::addLabels("usercountrieslist", "'.str_replace('"', '\\"', serialize($a)).'");'."\n");
 
         fwrite($f, "?>");
         fclose($f);

htdocs/lib2/logic/statpic.class.php

Spacing +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
         global $opt;
 
         // if data changed - delete statpic of user, if exists - will be recreated on next request
-        if (file_exists($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg')) {
-            unlink($opt['rootpath'] . 'images/statpics/statpic' . $this->nUserId . '.jpg');
+        if (file_exists($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg')) {
+            unlink($opt['rootpath'].'images/statpics/statpic'.$this->nUserId.'.jpg');
         }
     }
 }

htdocs/lib2/logic/geodb.class.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 
     private static function setCacheLocation($cache_id)
     {
-        echo $cache_id . "\n";
+        echo $cache_id."\n";
         $rs = sqll(
             "SELECT `latitude`, `longitude`, `last_modified`
              FROM `caches`
@@ -95,16 +95,16 @@ 
         $rs = sqll(
             "SELECT
                 `geodb_coordinates`.`loc_id` `loc_id`,
-                (( " . $lon . " - `geodb_coordinates`.`lon` ) * ( " . $lon . " - `geodb_coordinates`.`lon` ) +
-                 ( " . $lat . " - `geodb_coordinates`.`lat` ) * ( " . $lat . " - `geodb_coordinates`.`lat` )) `dist`
+                (( " . $lon." - `geodb_coordinates`.`lon` ) * ( ".$lon." - `geodb_coordinates`.`lon` ) +
+                 ( " . $lat." - `geodb_coordinates`.`lat` ) * ( ".$lat." - `geodb_coordinates`.`lat` )) `dist`
              FROM `geodb_coordinates`
              INNER JOIN `geodb_locations` ON `geodb_coordinates`.`loc_id`=`geodb_locations`.`loc_id`
              WHERE
                 `geodb_locations`.`loc_type`=100700000
-                AND `geodb_coordinates`.`lon` > " . ($lon - 0.15) . "
-                AND `geodb_coordinates`.`lon` < " . ($lon + 0.15) . "
-                AND `geodb_coordinates`.`lat` > " . ($lat - 0.15) . "
-                AND `geodb_coordinates`.`lat` < " . ($lat + 0.15) . "
+                AND `geodb_coordinates`.`lon` > " . ($lon - 0.15)."
+                AND `geodb_coordinates`.`lon` < " . ($lon + 0.15)."
+                AND `geodb_coordinates`.`lat` > " . ($lat - 0.15)."
+                AND `geodb_coordinates`.`lat` < " . ($lat + 0.15)."
              ORDER BY `dist` ASC
              LIMIT 1"
         );

htdocs/lib2/logic/npas.inc.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 
     $npas = get_npas($cache_id);
     if ($npas) {
-        $desc = "<p>" . str_replace('%1', helppagelink('npa'), _('This geocache is probably placed within the following protected areas (%1Info</a>):')) . "</p>\n" .
+        $desc = "<p>".str_replace('%1', helppagelink('npa'), _('This geocache is probably placed within the following protected areas (%1Info</a>):'))."</p>\n".
             "<ul>\n";
         foreach ($npas as $npa) {
-            $desc .= "<li>" . $npa['npaTypeName'] . ": <a href='http://www.google.de/search?q=" . urlencode($npa['npaTypeName'] . ' ' . $npa['npaName']) . "' target='_blank'>" . $npa['npaName'] . "</a></li>\n";
+            $desc .= "<li>".$npa['npaTypeName'].": <a href='http://www.google.de/search?q=".urlencode($npa['npaTypeName'].' '.$npa['npaName'])."' target='_blank'>".$npa['npaName']."</a></li>\n";
         }
         $desc .= "</ul>\n";
     } else {

htdocs/lib2/logic/useroptions.class.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  *
  ***************************************************************************/
 
-require_once __DIR__ . '/const.inc.php';
+require_once __DIR__.'/const.inc.php';
 
 class useroptions
 {
@@ -150,7 +150,7 @@ 
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;
-        } elseif (preg_match("/" . $this->nOptions[$pId]['check_regex'] . "/", $pValue) || strlen($pValue) == 0) {
+        } elseif (preg_match("/".$this->nOptions[$pId]['check_regex']."/", $pValue) || strlen($pValue) == 0) {
             $this->nOptions[$pId]['option_value'] = $pValue;
 
             return true;

htdocs/lib2/logic/logtypes.inc.php

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
          FROM `log_types`
          LEFT JOIN `sys_trans_text`
              ON `sys_trans_text`.`trans_id` = `log_types`.`trans_id`
-             AND `sys_trans_text`.`lang`='" . sql_escape($locale) . "'"
+             AND `sys_trans_text`.`lang`='" . sql_escape($locale)."'"
     );
     while ($r = sql_fetch_array($rs)) {
         $log_types[$r['id']] = $r['type_name'];
@@ -91,28 +91,28 @@ 
 
     $allowed_logtypes = array();
     if ($owner || $admin_report || $admin_locked) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
     if (($owner && $statuslogs) || $admin_report) {
         if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) {
-            $allowed_logtypes[] = 10;  // ready for search
-            $allowed_logtypes[] = 11;  // temporarily not available
-            $allowed_logtypes[] = 9;   // archived
-            $allowed_logtypes[] = 13;  // locked
+            $allowed_logtypes[] = 10; // ready for search
+            $allowed_logtypes[] = 11; // temporarily not available
+            $allowed_logtypes[] = 9; // archived
+            $allowed_logtypes[] = 13; // locked
         }
         if ($admin_report || $old_logtype == 14) {
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
     if ($cache_type == 6) { // event
-        $allowed_logtypes[] = 8;   // will attend
-        $allowed_logtypes[] = 7;   // attended
+        $allowed_logtypes[] = 8; // will attend
+        $allowed_logtypes[] = 7; // attended
     } else {
-        $allowed_logtypes[] = 1;   // found
-        $allowed_logtypes[] = 2;   // not found
+        $allowed_logtypes[] = 1; // found
+        $allowed_logtypes[] = 2; // not found
     }
     if (!($owner || $admin_report || $admin_locked)) {
-        $allowed_logtypes[] = 3;   // note
+        $allowed_logtypes[] = 3; // note
     }
 
     // always allow to keep the existing logtype when the log is edited by an admin
@@ -151,7 +151,7 @@ 
             } elseif (!$opt['logic']['admin']['team_comments_only_for_reports'] || admin_has_open_report($cache_id)) {
                 // allowed for report processing by admins
                 $allowed = true;
-            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6,7])) {
+            } elseif ($login->hasAdminPriv(ADMIN_USER) && in_array($rCache['status'], [6, 7])) {
                 // allowed for admins && locked caches, see http://forum.opencaching.de/index.php?topic=3102.msg39517#msg39517
                 $allowed = true;
             } else {

Braces +2 added lines, -1 removed lines

@@ -104,7 +104,8 @@
             $allowed_logtypes[] = 14;
         }  // locked, invisible
     }
-    if ($cache_type == 6) { // event
+    if ($cache_type == 6) {
+// event
         $allowed_logtypes[] = 8;   // will attend
         $allowed_logtypes[] = 7;   // attended
     } else {

htdocs/lib2/cli.inc.php

Spacing +3 added lines, -3 removed lines

@@ -19,14 +19,14 @@
 }
 
 // chicken-egg problem ...
-require_once $opt['rootpath'] . 'lib2/const.inc.php';
+require_once $opt['rootpath'].'lib2/const.inc.php';
 
 // do all output in text format
 $opt['gui'] = GUI_TEXT;
 
 // include the main library
-require_once $opt['rootpath'] . 'lib2/common.inc.php';
-require_once $opt['rootpath'] . 'lib2/cli.class.php';
+require_once $opt['rootpath'].'lib2/common.inc.php';
+require_once $opt['rootpath'].'lib2/cli.class.php';
 
 if (($opt['debug'] & DEBUG_OUTOFSERVICE) == DEBUG_OUTOFSERVICE) {
     $cli->debug('exit because DEBUG_OUTOFSERVICE is set');

htdocs/lib2/rss.class.php

Spacing +13 added lines, -13 removed lines

@@ -42,7 +42,7 @@ 
     public function getPubDate()
     {
         if (empty($this->pubDate)) {
-            return date("d.m.y H:i:s") . "GMT";
+            return date("d.m.y H:i:s")."GMT";
         } else {
             return $this->pubDate;
         }
@@ -57,11 +57,11 @@ 
     {
         $out = $this->header();
         $out .= "<channel>\n";
-        $out .= "<title>" . $this->title . "</title>\n";
-        $out .= "<link>" . $this->link . "</link>\n";
-        $out .= "<description>" . $this->description . "</description>\n";
-        $out .= "<language>" . $this->language . "</language>\n";
-        $out .= "<pubDate>" . $this->getPubDate() . "</pubDate>\n";
+        $out .= "<title>".$this->title."</title>\n";
+        $out .= "<link>".$this->link."</link>\n";
+        $out .= "<description>".$this->description."</description>\n";
+        $out .= "<language>".$this->language."</language>\n";
+        $out .= "<pubDate>".$this->getPubDate()."</pubDate>\n";
 
         foreach ($this->tags as $key => $val) {
             $out .= "<$key>$val</$key>\n";
@@ -88,8 +88,8 @@ 
 
     public function header()
     {
-        $out = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
-        $out .= '<rss version="2.0">' . "\n";
+        $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+        $out .= '<rss version="2.0">'."\n";
 
         return $out;
     }
@@ -141,10 +141,10 @@ 
     public function out()
     {
         $out = "<item>\n";
-        $out .= "<title>" . $this->title . "</title>\n";
-        $out .= "<link>" . $this->link . "</link>\n";
-        $out .= "<description>" . $this->description . "</description>\n";
-        $out .= "<pubDate>" . $this->getPubDate() . "</pubDate>\n";
+        $out .= "<title>".$this->title."</title>\n";
+        $out .= "<link>".$this->link."</link>\n";
+        $out .= "<description>".$this->description."</description>\n";
+        $out .= "<pubDate>".$this->getPubDate()."</pubDate>\n";
 
         if ($this->attachment != "") {
             $out .= "<enclosure url='{$this->attachment}' length='{$this->length}' type='{$this->mimetype}' />";
@@ -153,7 +153,7 @@ 
         if (empty($this->guid)) {
             $this->guid = $this->link;
         }
-        $out .= "<guid>" . $this->guid . "</guid>\n";
+        $out .= "<guid>".$this->guid."</guid>\n";
 
         foreach ($this->tags as $key => $val) {
             $out .= "<$key>$val</$key\n>";