OpencachingDeutschland / oc-server3

htdocs/src/Oc/Libse/Coordinate/TypeCoordinate.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 namespace Oc\Libse\Coordinate;
 
-require_once __DIR__ . '/../../../../lib2/logic/const.inc.php';
+require_once __DIR__.'/../../../../lib2/logic/const.inc.php';
 
 class TypeCoordinate
 {

htdocs/src/Oc/Libse/Coordinate/FormatterCoordinate.php

Spacing +2 added lines, -2 removed lines

@@ -47,12 +47,12 @@
     public function formatHtml($coordinate, $separator = ' ')
     {
         return $this->formatHtmlHemDegMin($this->formatLatHem($coordinate), $this->formatLatDeg($coordinate), $this->formatLatMin($coordinate))
-        . $separator .
+        . $separator.
         $this->formatHtmlHemDegMin($this->formatLonHem($coordinate), $this->formatLonDeg($coordinate), $this->formatLonMin($coordinate));
     }
 
     private function formatHtmlHemDegMin($hem, $deg, $min)
     {
-        return $hem . ' ' . $deg . '° ' . $min . '\'';
+        return $hem.' '.$deg.'° '.$min.'\'';
     }
 }

htdocs/src/Oc/Libse/Validator/IntegerValidator.php

Spacing +2 added lines, -2 removed lines

@@ -30,11 +30,11 @@
 
     protected function getValidateRegex()
     {
-        return '-?[0-9]' . $this->int_len . '$';
+        return '-?[0-9]'.$this->int_len.'$';
     }
 
     protected function getValue($value)
     {
-        return (int) $value;
+        return (int)$value;
     }
 }

htdocs/src/Oc/Libse/Validator/RealValidator.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
     protected function getMinValue()
     {
-        return - 1e38;
+        return -1e38;
     }
 
     protected function getMaxValue()
@@ -32,7 +32,7 @@ 
 
     protected function getValidateRegex()
     {
-        return '-?[0-9]' . $this->int_len . '([,.][0-9]' . $this->dec_len . ')?$';
+        return '-?[0-9]'.$this->int_len.'([,.][0-9]'.$this->dec_len.')?$';
     }
 
     protected function getValue($value)

htdocs/src/Oc/Console/Command/CodeSnifferCommand.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         }
 
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

htdocs/src/Oc/Console/Command/AbstractCommand.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
     {
         parent::__construct($name);
 
-        $this->rootPath = realpath(__DIR__ . '/../../../../');
+        $this->rootPath = realpath(__DIR__.'/../../../../');
     }
 }

htdocs/map2.php

Spacing +60 added lines, -60 removed lines

@@ -9,7 +9,7 @@ 
 
 $build_map_towns_menu = true;
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 /* because the map does access some private info like
  * ignored caches, we need to verify the login data
@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -133,7 +133,7 @@ 
     $tpl->error($translate->t('There is no google maps key registered for this domain.', '', '', 0));
 }
 
-$tpl->add_header_javascript($opt['page']['protocol'] . '://maps.googleapis.com/maps/api/js?sensor=false&key=' . urlencode($sGMKey) . '&language=' . strtolower($opt['template']['locale']));
+$tpl->add_header_javascript($opt['page']['protocol'].'://maps.googleapis.com/maps/api/js?sensor=false&key='.urlencode($sGMKey).'&language='.strtolower($opt['template']['locale']));
 // https is supported by google, but may make problems in some environments,
 // e.g. does not work with MSIE 7 on WinXP
 $tpl->add_header_javascript('resource2/misc/map/dragzoom_packed.js');
@@ -279,7 +279,7 @@ 
     global $login;
 
     $rsCache = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, $nDistance)." AS `distance`,
                                   `caches`.`wp_oc`
                              FROM `caches`
                        INNER JOIN `cache_status` ON `caches`.`status`=`cache_status`.`id`
@@ -389,42 +389,42 @@ 
     $wphandler = new HandlerChildWp();
     $waypoints = $wphandler->getChildWps($rCache['cache_id'], true);
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     echo '  <cache ';
-    echo 'name="' . xmlentities($rCache['name']) . '" ';
-    echo 'wpoc="' . xmlentities($rCache['wp_oc']) . '" ';
-    echo 'coords="' . $rCache['longitude'] . ',' . $rCache['latitude'] . '" ';
-    echo 'inactive="' . xmlentities($rCache['inactive']) . '" ';
-    echo 'status_text="' . xmlentities($rCache['statustext']) . '" ';
-    echo 'type_id="' . xmlentities($rCache['type_id']) . '" ';
-    echo 'type_text="' . xmlentities($rCache['type_text']) . '" ';
-    echo 'size="' . xmlentities($rCache['size']) . '" ';
-    echo 'difficulty="' . xmlentities($rCache['difficulty'] / 2) . '" ';
-    echo 'terrain="' . xmlentities($rCache['terrain'] / 2) . '" ';
-    echo 'listed_since="' . xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))) . '" ';
-    echo 'is_publishdate="' . xmlentities($rCache['is_publishdate']) . '" ';
-    echo 'toprating="' . xmlentities($rCache['toprating']) . '" ';
-    echo 'geokreties="' . xmlentities($nGeokretyCount) . '" ';
-    echo 'found="' . xmlentities(($nFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'notfound="' . xmlentities(($nNotFoundCount > 0) ? 1 : 0) . '" ';
-    echo 'attended="' . xmlentities(($nAttendedCount > 0) ? 1 : 0) . '" ';
-    echo 'oconly="' . xmlentities($rCache['oconly']) . '" ';
-    echo 'owner="' . xmlentities($rCache['owner']) . '" ';
-    echo 'username="' . xmlentities($rCache['username']) . '" ';
-    echo 'userid="' . xmlentities($rCache['user_id']) . '" ';
-    echo 'picurl="' . xmlentities($rCache['picurl']) . '" ';
-    echo 'pictitle="' . xmlentities(trim($rCache['pictitle'])) . '" >\n';
+    echo 'name="'.xmlentities($rCache['name']).'" ';
+    echo 'wpoc="'.xmlentities($rCache['wp_oc']).'" ';
+    echo 'coords="'.$rCache['longitude'].','.$rCache['latitude'].'" ';
+    echo 'inactive="'.xmlentities($rCache['inactive']).'" ';
+    echo 'status_text="'.xmlentities($rCache['statustext']).'" ';
+    echo 'type_id="'.xmlentities($rCache['type_id']).'" ';
+    echo 'type_text="'.xmlentities($rCache['type_text']).'" ';
+    echo 'size="'.xmlentities($rCache['size']).'" ';
+    echo 'difficulty="'.xmlentities($rCache['difficulty'] / 2).'" ';
+    echo 'terrain="'.xmlentities($rCache['terrain'] / 2).'" ';
+    echo 'listed_since="'.xmlentities(strftime($opt['locale'][$opt['template']['locale']]['format']['date'], strtotime($rCache['date_created']))).'" ';
+    echo 'is_publishdate="'.xmlentities($rCache['is_publishdate']).'" ';
+    echo 'toprating="'.xmlentities($rCache['toprating']).'" ';
+    echo 'geokreties="'.xmlentities($nGeokretyCount).'" ';
+    echo 'found="'.xmlentities(($nFoundCount > 0) ? 1 : 0).'" ';
+    echo 'notfound="'.xmlentities(($nNotFoundCount > 0) ? 1 : 0).'" ';
+    echo 'attended="'.xmlentities(($nAttendedCount > 0) ? 1 : 0).'" ';
+    echo 'oconly="'.xmlentities($rCache['oconly']).'" ';
+    echo 'owner="'.xmlentities($rCache['owner']).'" ';
+    echo 'username="'.xmlentities($rCache['username']).'" ';
+    echo 'userid="'.xmlentities($rCache['user_id']).'" ';
+    echo 'picurl="'.xmlentities($rCache['picurl']).'" ';
+    echo 'pictitle="'.xmlentities(trim($rCache['pictitle'])).'" >\n';
 
     foreach ($waypoints as $waypoint) {
         echo '    <wpt ';
-        echo 'typeid="' . xmlentities($waypoint['type']) . '" ';
-        echo 'typename="' . xmlentities($waypoint['name']) . '" ';
-        echo 'typepreposition="' . xmlentities($waypoint['preposition']) . '" ';
-        echo 'image="' . xmlentities($waypoint['image']) . '" ';
+        echo 'typeid="'.xmlentities($waypoint['type']).'" ';
+        echo 'typename="'.xmlentities($waypoint['name']).'" ';
+        echo 'typepreposition="'.xmlentities($waypoint['preposition']).'" ';
+        echo 'image="'.xmlentities($waypoint['image']).'" ';
         echo 'imagewidth="38" imageheight="38" ';
-        echo 'latitude="' . xmlentities($waypoint['latitude']) . '" ';
-        echo 'longitude="' . xmlentities($waypoint['longitude']) . '" ';
-        echo 'description="' . xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))) . '" />\n';
+        echo 'latitude="'.xmlentities($waypoint['latitude']).'" ';
+        echo 'longitude="'.xmlentities($waypoint['longitude']).'" ';
+        echo 'description="'.xmlentities(mb_ereg_replace('\r\n', '<br />', htmlentities(trim($waypoint['description']), ENT_NOQUOTES, 'UTF-8'))).'" />\n';
     }
 
     echo '  </cache>\n';
@@ -438,9 +438,9 @@ 
 {
     global $login, $opt;
 
-    echo '<caches>' . "\n";
+    echo '<caches>'."\n";
     $rs = sql_slave(
-        "SELECT " . geomath::getSqlDistanceFormula($nLon, $nLat, 0) . " AS `distance`,
+        "SELECT ".geomath::getSqlDistanceFormula($nLon, $nLat, 0)." AS `distance`,
                           `caches`.`name`, `caches`.`wp_oc`
                      FROM `map2_data`
                INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
@@ -449,30 +449,30 @@ 
                       AND (`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`='&3')
                       AND `map2_data`.`result_id`='&2'
                            ORDER BY `distance` ASC LIMIT 30",
-        '%' . $sName . '%',
+        '%'.$sName.'%',
         $nResultId,
         $login->userid
     );
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
-        echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        echo '<cache name="'.xmlentities($r['name']).'" wpoc="'.xmlentities($r['wp_oc']).'" />'."\n";
+        ++$caches_found;
     }
     sql_free_result($rs);
 
     if (!$caches_found && preg_match('/^[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}\.[^\s[:punct:]]{2,}$/', $sName)) {
-        $result = @file_get_contents('http://api.what3words.com/w3w?key=' . $opt['lib']['w3w']['apikey']
-            . '&string=' . urlencode($sName));
+        $result = @file_get_contents('http://api.what3words.com/w3w?key='.$opt['lib']['w3w']['apikey']
+            . '&string='.urlencode($sName));
         if ($result) {
             $json = json_decode($result, true);
             if (!is_null($json['words']) && !is_null($json['position']) && count($json['position']) == 2) {
-                echo '<coord name="' . xmlentities(implode('.', $json['words'])) .
-                    '" latitude="' . xmlentities($json["position"][0]) .
-                    '" longitude="' . xmlentities($json["position"][1]) . '" />' . "\n";
+                echo '<coord name="'.xmlentities(implode('.', $json['words'])).
+                    '" latitude="'.xmlentities($json["position"][0]).
+                    '" longitude="'.xmlentities($json["position"][1]).'" />'."\n";
             }
         }
     }
-    echo '</caches>' . "\n";
+    echo '</caches>'."\n";
 
     exit;
 }
@@ -496,7 +496,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );
@@ -562,8 +562,8 @@ 
     $bMaxRecordReached = ($nRecordCount > $maxrecords);
 
     // output data
-    echo '<searchresult count="' . xmlentities($nRecordCount) . '" available="1"' .
-        ' maxrecordreached="' . ($bMaxRecordReached ? '1' : '0') . '">' . "\n";
+    echo '<searchresult count="'.xmlentities($nRecordCount).'" available="1"'.
+        ' maxrecordreached="'.($bMaxRecordReached ? '1' : '0').'">'."\n";
 
     if (!$bMaxRecordReached) {
         $namequery = ($cachenames ? ", `caches`.`name` AS `cachename`" : "");
@@ -578,7 +578,7 @@ 
                             IF(`found_logs`.`id` IS NULL, 0, 1) AS `found`,
                             IF(`found_logs`.`id` IS NULL AND `notfound_logs`.`id` IS NOT NULL, 1, 0) AS `notfound`,
                             IF(`caches_attributes`.`attrib_id` IS NULL, 0, 1) AS `oconly`" .
-            $namequery . "
+            $namequery."
                        FROM `map2_data`
                  INNER JOIN `caches` ON `map2_data`.`cache_id`=`caches`.`cache_id`
                  INNER JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
@@ -622,19 +622,19 @@ 
                 $flags |= 16;
             }
             if ($compact) {
-                echo '<c d="' .
+                echo '<c d="'.
                     xmlentities(
-                        $r['wp_oc'] . '/' . round($r['longitude'], 5) . '/' .
-                        round($r['latitude'], 5) . '/' . $r['type'] . '/' . $flags) . '"' .
-                    (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '') .
+                        $r['wp_oc'].'/'.round($r['longitude'], 5).'/'.
+                        round($r['latitude'], 5).'/'.$r['type'].'/'.$flags).'"'.
+                    (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '').
                     ' />';
             } else {
-                echo '<cache wp="' . xmlentities($r['wp_oc']) . '"' .
-                    ' lon="' . xmlentities(round($r['longitude'], 5)) . '"' .
-                    ' lat="' . xmlentities(round($r['latitude'], 5)) . '"' .
-                    ' type="' . xmlentities($r['type']) . '"' .
-                    (isset($r['cachename']) ? ' n="' . xmlentities($r['cachename']) . '"' : '') .
-                    ' f="' . xmlentities($flags) . '" />' . "\n";
+                echo '<cache wp="'.xmlentities($r['wp_oc']).'"'.
+                    ' lon="'.xmlentities(round($r['longitude'], 5)).'"'.
+                    ' lat="'.xmlentities(round($r['latitude'], 5)).'"'.
+                    ' type="'.xmlentities($r['type']).'"'.
+                    (isset($r['cachename']) ? ' n="'.xmlentities($r['cachename']).'"' : '').
+                    ' f="'.xmlentities($flags).'" />'."\n";
             }
         }
         sql_free_result($rs);

htdocs/lang/de/ocstyle/editlog.inc.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@
 
 $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
 
-$date_message = '<span class="errormsg">' . t('date or time is invalid') . '</span>';
+$date_message = '<span class="errormsg">'.t('date or time is invalid').'</span>';
 $smiley_link = '<a href="javascript:insertSmiley(\'{smiley_symbol}\',\'{smiley_file}\')">{smiley_image}</a>';
 
-$log_pw_field = '<tr><td colspan="2">' . t('passwort to log:') . ' <input class="input100" type="text" name="log_pw" maxlength="20" value="" /> (' . t('only for found logs') . ')</td></tr>
+$log_pw_field = '<tr><td colspan="2">'.t('passwort to log:').' <input class="input100" type="text" name="log_pw" maxlength="20" value="" /> ('.t('only for found logs').')</td></tr>
                     <tr><td class="spacer" colspan="2"></td></tr>';
-$log_pw_field_pw_not_ok = '<tr><td colspan="2">' . t('passwort to log:') . ' <input type="text" name="log_pw" maxlength="20" size="20" value=""/><span class="errormsg"> ' . t('Invalid password!') . '</span></td></tr><tr><td class="spacer" colspan="2"></td></tr>';
+$log_pw_field_pw_not_ok = '<tr><td colspan="2">'.t('passwort to log:').' <input type="text" name="log_pw" maxlength="20" size="20" value=""/><span class="errormsg"> '.t('Invalid password!').'</span></td></tr><tr><td class="spacer" colspan="2"></td></tr>';
 
-$teamcomment_field = '&nbsp; <input type="checkbox" name="teamcomment" value="1" class="checkbox" {chk_sel} id="teamcomment" /> <label for="teamcomment">' . t('OC team comment') . "</label>";
+$teamcomment_field = '&nbsp; <input type="checkbox" name="teamcomment" value="1" class="checkbox" {chk_sel} id="teamcomment" /> <label for="teamcomment">'.t('OC team comment')."</label>";
 
 $type_edit_disabled = 'disabled class="disabled"';

htdocs/lang/de/ocstyle/rating.inc.php

Spacing +4 added lines, -4 removed lines

@@ -17,16 +17,16 @@
 
  ****************************************************************************/
 
-$rating_tpl =    '<tr>
-                <td valign="top">' . t('Recommendations:') . '</td>
+$rating_tpl = '<tr>
+                <td valign="top">' . t('Recommendations:').'</td>
                 <td valign="top">
                     {rating_msg}
-                    <noscript><br />' . t('A recommendation can only be made within a "found"-log!') . '</noscript>
+                    <noscript><br />' . t('A recommendation can only be made within a "found"-log!').'</noscript>
                 </td>
             </tr>
             <tr><td class="spacer" colspan="2"></td></tr>';
 
-$rating_allowed = '<input type="hidden" name="ratingoption" value="1"><input type="checkbox" name="rating" value="1" class="checkbox" {chk_sel}/>&nbsp;' . t('This cache is one of my recommendations.');
+$rating_allowed = '<input type="hidden" name="ratingoption" value="1"><input type="checkbox" name="rating" value="1" class="checkbox" {chk_sel}/>&nbsp;'.t('This cache is one of my recommendations.');
 $rating_too_few_founds = t('You need additional {anzahl} finds, to make another recommandation.');
 $rating_maywithdraw = t('Alternatively, you can withdraw a <a href="mytop5.php">existing recommendation</a>.');
 $rating_stat = t('You have given {curr} of {max} possible recommendations.');