OpencachingDeutschland / oc-server3

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.');

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

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 $error_wrong_node = t('This description has been created on another Opencaching website. The cache can only be edited there.');
 
-$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'show_all_langs\')" />';
+$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'show_all_langs\')" />';
 
 $error_desc_not_found = t('(internal error) The description is not available.');
 $error_desc_exists = t('(internal error) It already exists a description for this language.');

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

Spacing +17 added lines, -17 removed lines

@@ -22,23 +22,23 @@
  $show_all = t('Show all');
  $default_NS = 'N';
  $default_EW = 'E';
- $date_time_format_message = ' ' . t('Format: DD-MM-YYYY');
-
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
- $error_lat_not_ok = $error_long_not_ok . "<br />";
- $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
+ $date_time_format_message = '&nbsp;'.t('Format:&nbsp;DD-MM-YYYY');
+
+ $error_general = "<tr><td class='error' colspan='2'><b>".t('Some errors occured, please check the marked fields.')."</b></td></tr>";
+ $error_long_not_ok = '<span class="errormsg">'.t('Your chosen coordinated are invalid').'</span>';
+ $error_lat_not_ok = $error_long_not_ok."<br />";
+ $error_duplicate_coords = '<span class="errormsg">'.t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.').'</span>';
+ $time_not_ok_message = '<span class="errormsg">'.t('The entered time is invalid.').'</span>';
+ $way_length_not_ok_message = '<span class="errormsg">'.t('The entered distance is invalid, Format: aa.aaa').'</span>';
+ $date_not_ok_message = '<span class="errormsg">'.t('Invalid date, format:DD-MM-JJJJ').'</span>';
+ $name_not_ok_message = '&nbsp;<span class="errormsg">'.t('Cachename is invalid').'</span>';
+ $tos_not_ok_message = '<br/><span class="errormsg">'.t('The cache can only be adopted if you agree our terms of use.').'</span>';
+ $type_not_ok_message = '&nbsp;<span class="errormsg">'.t('No cache-type is chosen.').'</span>';
+ $size_not_ok_message = '&nbsp;<span class="errormsg">'.t('No cache-size is chosen.').'</span>';
+ $diff_not_ok_message = '&nbsp;<span class="errormsg">'.t('Choose both valuations!').'</span>';
+ $sizemismatch_message = '&nbsp;<span class="errormsg">'.t('For virtual and webcam caches, the cache size has to be -no container-!').'</span>';
+ $safari_not_allowed_message = '<span class="errormsg">'.t('Only virtual caches can be safari caches.').'</span>';
+ $bad_wpgc_message = '<span class="errormsg">'.t('GC waypoint is invalid, must be GCxxxxx').'</span>';
 
  $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
 

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

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 function removed_message_title($lang)
 {
     global $translate;
-    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang) . "\n---";
+    return $translate->t('The owner of the cache has written the following comment to you:', '', basename(__FILE__), __LINE__, '', 1, $lang)."\n---";
 }

htdocs/lang/de/ocstyle/main.tpl.php

Spacing +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@ 
     //Menü laden
     global $mnu_bgcolor, $mnu_selmenuitem, $develwarning, $tpl_subtitle, $opt, $rootpath, $usr;
 
-    require_once $stylepath . '/lib/menu.php';
+    require_once $stylepath.'/lib/menu.php';
     if (function_exists('post_config')) {
         post_config();
     }
 
-    require_once $rootpath . 'lib2/smarty/ocplugins/function.season.php';
+    require_once $rootpath.'lib2/smarty/ocplugins/function.season.php';
 
     $sUserCountry = getUserCountry();
     $pageidx = mnu_MainMenuIndexFromPageId($menu, $tplname);
@@ -47,7 +47,7 @@ 
     if ($tplname != 'start') {
         $tpl_subtitle .= htmlspecialchars($mnu_selmenuitem['title'], ENT_COMPAT, 'UTF-8');
     }
-    $tpl_subtitle .= ' - ' . htmlspecialchars($opt['locale'][$locale]['page']['subtitle1'], ENT_COMPAT, 'UTF-8');
+    $tpl_subtitle .= ' - '.htmlspecialchars($opt['locale'][$locale]['page']['subtitle1'], ENT_COMPAT, 'UTF-8');
     $meta_keywords = htmlspecialchars($opt['page']['meta']['keywords'], ENT_COMPAT, 'UTF-8');
     $meta_description = htmlspecialchars($opt['page']['meta']['description'], ENT_COMPAT, 'UTF-8');
 ?>
@@ -147,7 +147,7 @@ 
 <?php
                             foreach ($opt['template']['locales'] AS $k => $lang)
                                 if ($lang['show'] == true)
-                                    echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
+                                    echo '<a style="text-decoration: none;" href="index.php?locale='.$k.'"><img src="'.$lang['flag'].'" alt="'.$lang['name'].'" title="'.$lang['name'].'" width="24px" height="18px" /></a> ';
 ?>
                         </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
@@ -163,11 +163,11 @@ 
                                         {
                                             echo '<option disabled="disabled">';
                                             if ($tpl_usercountries[$i]['group'] == 1) {
-                                                echo '- ' . t('This OC node') . ' -';
+                                                echo '- '.t('This OC node').' -';
                                             } elseif ($tpl_usercountries[$i]['group'] == 2) {
-                                                echo '- ' . t('Other OC nodes') . ' -';
+                                                echo '- '.t('Other OC nodes').' -';
                                             } elseif ($tpl_usercountries[$i]['group'] == 3) {
-                                                echo '- ' . t('Others') . ' -';
+                                                echo '- '.t('Others').' -';
                                             } else {
                                                 echo '-';
                                             }
@@ -175,7 +175,7 @@ 
                                         }
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
 
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
+                                        echo '<option value="'.htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8').'"'.(($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '').'>'.htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8').'</option>';
                                     }
 ?>
                                 </select>&nbsp;

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

Spacing +12 added lines, -12 removed lines

@@ -22,33 +22,33 @@ 
 tpl_set_var('loginbox', ' ');
 tpl_set_var(
     'functionsbox',
-    '<a href="index.php?page=suche">' . t('Search') . '</a> | <a href="index.php?page=sitemap">' . t('Sitemap') . '</a>'
+    '<a href="index.php?page=suche">'.t('Search').'</a> | <a href="index.php?page=sitemap">'.t('Sitemap').'</a>'
 );
 tpl_set_var('runtime', '');
 
 //set up main template specific string
-$sLoggedOut = '<form action="' . ($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '') . 'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>' . t(
+$sLoggedOut = '<form action="'.($opt['page']['https']['force_login'] ? $opt['page']['absolute_https_url'] : '').'login.php" method="post" enctype="application/x-www-form-urlencoded" name="login" dir="ltr" style="display: inline;"><b>'.t(
         'User:'
-    ) . '</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>' . t(
+    ).'</b>&nbsp;&nbsp;<input name="email" size="10" type="text" class="textboxes" value="" />&nbsp;&nbsp;&nbsp;<b>'.t(
         'Password:'
-    ) . '</b>&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="hidden" name="source" value="titlebar" />&nbsp;<input type="submit" name="LogMeIn" value="' . t(
+    ).'</b>&nbsp;&nbsp;<input name="password" size="10" type="password" class="textboxes" value="" />&nbsp;<input type="hidden" name="action" value="login" /><input type="hidden" name="target" value="{target}" /><input type="hidden" name="source" value="titlebar" />&nbsp;<input type="submit" name="LogMeIn" value="'.t(
         'Login'
-    ) . '" class="formbutton" style="width: 74px;" onclick="submitbutton(\'LogMeIn\')" /></form>';
-$sLoggedIn = "<b>" . t(
+    ).'" class="formbutton" style="width: 74px;" onclick="submitbutton(\'LogMeIn\')" /></form>';
+$sLoggedIn = "<b>".t(
         'Logged in as'
-    ) . ' <a href="myhome.php" class="testing-top-left-corner-username">{username}</a></b> - <a href="login.php?action=logout">' . t(
+    ).' <a href="myhome.php" class="testing-top-left-corner-username">{username}</a></b> - <a href="login.php?action=logout">'.t(
         'Logout'
-    ) . '</a>';
+    ).'</a>';
 
 // target in Loginbox setzen
-$target = basename($_SERVER['PHP_SELF']) . '?';
+$target = basename($_SERVER['PHP_SELF']).'?';
 
 // REQUEST-Variablen durchlaufen und an target anhaengen
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
 reset($_REQUEST);
 while (list ($varname, $varvalue) = each($_REQUEST)) {
     if (in_array($varname, $allowed)) {
-        $target .= $varname . '=' . $varvalue . '&';
+        $target .= $varname.'='.$varvalue.'&';
     }
 }
 if (mb_substr($target, - 1) == '?' || mb_substr($target, - 1) == '&') {
@@ -74,10 +74,10 @@ 
  '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
-            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />
+            <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice').'" title="'.t('Notice').'" />
             ' . t('Your HTML code will be changed again by a special filter. This is necessary to avoid dangerous HTML-tags,
                  such as &lt;script&gt;. A list of allowed HTML tags, you can find
-                 <a href="articles.php?page=htmltags">here</a>') . '
+                 <a href="articles.php?page=htmltags">here</a>').'
         </td>
     </tr>
     ';