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/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;

Braces +15 added lines, -18 removed lines

@@ -145,10 +145,11 @@ 
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
                         <td>
 <?php
-                            foreach ($opt['template']['locales'] AS $k => $lang)
-                                if ($lang['show'] == true)
+                            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> ';
-?>
+                            }
+                            ?>
                         </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
                         <td>
@@ -157,10 +158,8 @@ 
                                     global $tpl_usercountries;
                                     $nLastGroup = 0;
                                     $maxUserCountries = count($tpl_usercountries);
-                                    for ($i = 0; $i < $maxUserCountries; $i++)
-                                    {
-                                        if ($nLastGroup != $tpl_usercountries[$i]['group'])
-                                        {
+                                    for ($i = 0; $i < $maxUserCountries; $i++) {
+                                        if ($nLastGroup != $tpl_usercountries[$i]['group']) {
                                             echo '<option disabled="disabled">';
                                             if ($tpl_usercountries[$i]['group'] == 1) {
                                                 echo '- ' . t('This OC node') . ' -';
@@ -205,11 +204,12 @@ 
                     <ul>
 <?php
                         // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
-                        if ($pageidx >= 0)
-                            mnu_EchoMainMenu($menu[$pageidx]['siteid']);
-                        else
-                            mnu_EchoMainMenu(-1);
-?>
+                        if ($pageidx >= 0) {
+                                                    mnu_EchoMainMenu($menu[$pageidx]['siteid']);
+                        } else {
+                                                    mnu_EchoMainMenu(-1);
+                        }
+                        ?>
                     </ul>
                 </div>
 
@@ -228,8 +228,7 @@ 
                 <div class="nav3">
 <?php
                     //SubNavigation
-                    if (isset($menu[$pageidx]['submenu']))
-                    {
+                    if (isset($menu[$pageidx]['submenu'])) {
 ?>
                         <ul>
                             <li class="title">{t}Main menu{/t}</li>
@@ -257,8 +256,7 @@ 
 
                     <!-- Paypalbutton -->
 <?php
-                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations'])
-                    {
+                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) {
 ?>
                         <p class="sidebar-maintitle">{t}Donations{/t}</p>
                         <div style="margin-top:16px;width:100%;text-align:center;">
@@ -273,8 +271,7 @@ 
 
                     <!-- Social Media -->
 <?php
-                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia'])
-                    {
+                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) {
 ?>
                     <p class="sidebar-maintitle">{t}Social media{/t}</p>
                     <div style="margin-top: 10px; margin-bottom: 14px; margin-left: auto; margin-right: auto; text-align: center">

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
                         <td>
 <?php
-                            foreach ($opt['template']['locales'] AS $k => $lang)
+                            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> ';
 ?>

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

Spacing +23 added lines, -23 removed lines

@@ -20,28 +20,28 @@ 
 
 $error_wrong_node = t('This cache has been created on another Opencaching website. The cache can only be edited there.');
 
-$all_countries_submit = '<input type="submit" name="show_all_countries_submit" id="showallcountries" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'showallcountries\')" />';
-$error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
-$name_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
-$date_message = '<span class="errormsg">' . t('date is invalid') . '</span>';
-$coords_message = '<span class="errormsg">' . t('The used coordinates are invalid.') . '</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 distance you have entered is invalid. Format aa.aaa') . '</span>';
-$sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
-$status_message = '&nbsp;<span class="errormsg">' . t('The cache-status does not fit to your publishing options') . '</span>';
-$status_change = '<br /><div style="margin-top:6px"><img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" >' . t('To change the state, you need to <a href="log.php?cacheid=%1">log</a> the new state.') . '</div>';
-$diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</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>';
-$nopictures = '<tr><td colspan="2">' . t('No pictures available') . '</td></tr><tr><td colspan="2">&nbsp;</td></tr>';
-$pictureline0 = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">' . t('edit') . '</a>] [<a href="picture.php?action=delete&uuid={uuid}">' . t('delete') . '</a>]</td></tr>';
-$pictureline = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">' . t('edit') . '</a>] [<a href="picture.php?action=delete&uuid={uuid}">' . t('delete') . '</a>] [<a href="picture.php?action=up&uuid={uuid}">' . t('move up') . '</a>]</td></tr>';
+$all_countries_submit = '<input type="submit" name="show_all_countries_submit" id="showallcountries" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'showallcountries\')" />';
+$error_general = "<tr><td class='error' colspan='2'><b>".t('Some errors occured, please check the marked fields.')."</b></td></tr>";
+$name_message = '&nbsp;<span class="errormsg">'.t('Cachename is invalid').'</span>';
+$date_message = '<span class="errormsg">'.t('date is invalid').'</span>';
+$coords_message = '<span class="errormsg">'.t('The used coordinates are invalid.').'</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 distance you have entered is invalid. Format aa.aaa').'</span>';
+$sizemismatch_message = '&nbsp;<span class="errormsg">'.t('For virtual and webcam caches, the cache size has to be -no container-!').'</span>';
+$status_message = '&nbsp;<span class="errormsg">'.t('The cache-status does not fit to your publishing options').'</span>';
+$status_change = '<br /><div style="margin-top:6px"><img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" >'.t('To change the state, you need to <a href="log.php?cacheid=%1">log</a> the new state.').'</div>';
+$diff_not_ok_message = '&nbsp;<span class="errormsg">'.t('Choose both valuations!').'</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>';
+$nopictures = '<tr><td colspan="2">'.t('No pictures available').'</td></tr><tr><td colspan="2">&nbsp;</td></tr>';
+$pictureline0 = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">'.t('edit').'</a>] [<a href="picture.php?action=delete&uuid={uuid}">'.t('delete').'</a>]</td></tr>';
+$pictureline = '<tr><td colspan="2"><a href="{link}">{title}</a> [<a href="picture.php?action=edit&uuid={uuid}">'.t('edit').'</a>] [<a href="picture.php?action=delete&uuid={uuid}">'.t('delete').'</a>] [<a href="picture.php?action=up&uuid={uuid}">'.t('move up').'</a>]</td></tr>';
 // Ocprop: <a href=\"http://.*?\.opencaching\.de/images/uploads/.*?\">(.*?)<\/a>.*?\[<a href=\"picture\.php\?action=[a-z]*?\&uuid=(.*?)\">
 $picturelines = '{lines}<tr><td colspan="2">&nbsp;</td></tr>';
 $gc_com_msg2 = t('To prevent any problems with geocaching.com we want to please you to upload all linked pictures to %1 as well and link the pictures in the HTML code to these on %1');
 
-$nowaypoints = '<tr><td colspan="2">' . t('No waypoints available') . '</td></tr>';
-$waypointline = '<tr bgcolor="#ffffff"><td><table class="narrowtable" cellspacing="0" cellpadding="0"><tr><td><img src="{wp_image}" /></td><td>{wp_type}</td></tr></table></td><td><table class="narrowtable"><tr><td style="white-space:nowrap">{wp_coordinate}</td></tr></table></tp><td>{wp_show_description}</td><td>[<a href="childwp.php?cacheid={cacheid}&childid={childid}">' . t('Edit') . '</a>] [<a href="childwp.php?cacheid={cacheid}&deleteid={childid}">' . t('Delete') . '</a>]</td></tr>';
+$nowaypoints = '<tr><td colspan="2">'.t('No waypoints available').'</td></tr>';
+$waypointline = '<tr bgcolor="#ffffff"><td><table class="narrowtable" cellspacing="0" cellpadding="0"><tr><td><img src="{wp_image}" /></td><td>{wp_type}</td></tr></table></td><td><table class="narrowtable"><tr><td style="white-space:nowrap">{wp_coordinate}</td></tr></table></tp><td>{wp_show_description}</td><td>[<a href="childwp.php?cacheid={cacheid}&childid={childid}">'.t('Edit').'</a>] [<a href="childwp.php?cacheid={cacheid}&deleteid={childid}">'.t('Delete').'</a>]</td></tr>';
 $waypointlines = '<tr><td colspan="2"><table class="edit_wptable">{lines}</table></td></tr><tr><td colspan="2">&nbsp;</td></tr>';
 
 $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
@@ -58,17 +58,17 @@ 
 $activation_form = '
     <tr><td class="spacer" colspan="2"></td></tr>
     <tr>
-        <td>' . t('Publication:') . '</td>
+        <td>' . t('Publication:').'</td>
         <td>
-            <input type="radio" class="radio" name="publish" id="publish_now" value="now" {publish_now_checked} />&nbsp;<label for="publish_now">' . t('Publish now') . '</label><br />
-            <input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">' . t('Publish on') . '</label>
+            <input type="radio" class="radio" name="publish" id="publish_now" value="now" {publish_now_checked} />&nbsp;<label for="publish_now">' . t('Publish now').'</label><br />
+            <input type="radio" class="radio" name="publish" id="publish_later" value="later" {publish_later_checked} />&nbsp;<label for="publish_later">' . t('Publish on').'</label>
             <input class="input20" type="text" name="activate_day" maxlength="2" value="{activate_day}"/>.
             <input class="input20" type="text" name="activate_month" maxlength="2" value="{activate_month}"/>.
             <input class="input40" type="text" name="activate_year" maxlength="4" value="{activate_year}"/>&nbsp;
             <select name="activate_hour" class="input60">
                 {activation_hours}
-            </select>&nbsp;' . t('#time_suffix_label#') . '&nbsp;{activate_on_message}<br />
-            <input type="radio" class="radio" name="publish" id="publish_notnow" value="notnow" {publish_notnow_checked} />&nbsp;<label for="publish_notnow">' . t('Do not publish now.') . '</label>
+            </select>&nbsp;' . t('#time_suffix_label#').'&nbsp;{activate_on_message}<br />
+            <input type="radio" class="radio" name="publish" id="publish_notnow" value="notnow" {publish_notnow_checked} />&nbsp;<label for="publish_notnow">' . t('Do not publish now.').'</label>
         </td>
     </tr>
     ';

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

Spacing +3 added lines, -3 removed lines

@@ -18,6 +18,6 @@
 $submit = t('Add');
 $default_lang = t('EN');
  
-$lang_message = '<br/><span class="errormsg">' . t('There already exists a description in this language') . '</span>';
-$error_no_lang_selected = '&nbsp;<span class="errormsg">' . t('Please select a language.') . "</span>";
-$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="' . t('Show all') . '" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';
+$lang_message = '<br/><span class="errormsg">'.t('There already exists a description in this language').'</span>';
+$error_no_lang_selected = '&nbsp;<span class="errormsg">'.t('Please select a language.')."</span>";
+$show_all_langs_submit = '&nbsp;<input type="submit" name="show_all_langs_submit" value="'.t('Show all').'" class="formbutton" onclick="submitbutton(\'show_all_langs_submit\')" />';

htdocs/lang/de/ocstyle/lib/menu.php

Spacing +19 added lines, -19 removed lines

@@ -285,7 +285,7 @@ 
     /* selmenuitem contains the selected (bold) menu item */
     global $mnu_selmenuitem;
 
-    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i ++) {
+    for ($i = 0, $ret = - 1; ($i < count($menustructure)) && ($ret == - 1); $i++) {
         if ($menustructure[$i]['siteid'] == $pageid) {
             $mnu_selmenuitem = $menustructure[$i];
 
@@ -313,22 +313,22 @@ 
     global $menu;
     $c = 0;
     $max = count($menu);
-    for ($i = 0; $i < $max; $i ++) {
+    for ($i = 0; $i < $max; $i++) {
         if ($menu[$i]['visible'] == true) {
             $sTarget = isset($menu[$i]['target']) ? $menu[$i]['target'] : '';
-            $sItem = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . '>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
-            $sItemSel = '<a href="' . $menu[$i]['filename'] . '" ' . $sTarget . ' class=\'selected bg-green06\'>' . htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a>';
+            $sItem = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
+            $sItemSel = '<a href="'.$menu[$i]['filename'].'" '.$sTarget.' class=\'selected bg-green06\'>'.htmlspecialchars(t($menu[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a>';
 
             if ($menu[$i]['siteid'] == $selmenuid) {
                 /* $sItem = '<li>TODO:selected' . $sItem . '</li>'; */
-                $sItem = '<li>' . $sItemSel . '</li>';
+                $sItem = '<li>'.$sItemSel.'</li>';
             } else {
-                $sItem = '<li>' . $sItem . '</li>';
+                $sItem = '<li>'.$sItem.'</li>';
             }
 
-            echo $sItem . "\n";
+            echo $sItem."\n";
 
-            $c ++;
+            $c++;
         }
     }
 }
@@ -348,7 +348,7 @@ 
 
     if (!$bHasSubmenu) {
         /* prüfen, ob ein Submenü vorhanden ist */
-        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i ++) {
+        for ($i = 0, $bSubmenu = false; ($i < count($menustructure)) && ($bSubmenu == false); $i++) {
             if (isset($menustructure[$i]['submenu'])) {
                 $bSubmenu = true;
             }
@@ -365,19 +365,19 @@ 
         }
     }
     $maxMenuStructure = count($menustructure);
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
         if ($menustructure[$i]['visible'] == true) {
             if ($menustructure[$i]['siteid'] == $pageid) {
-                echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
             } else {
                 if (isset($menustructure[$i]['submenu'])) {
                     if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
-                        echo '<li class="' . $cssclass . ' group_active"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                        echo '<li class="'.$cssclass.' group_active"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                     } else {
-                        echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                        echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                     }
                 } else {
-                    echo '<li class="' . $cssclass . '"><a href="' . $menustructure[$i]['filename'] . '">' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8') . '</a></li>' . "\n";
+                    echo '<li class="'.$cssclass.'"><a href="'.$menustructure[$i]['filename'].'">'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8').'</a></li>'."\n";
                 }
             }
 
@@ -397,7 +397,7 @@ 
  */
 function mnu_IsMenuParentOf($parentmenuitems, $menuitemid)
 {
-    for ($i = 0; $i < count($parentmenuitems); $i ++) {
+    for ($i = 0; $i < count($parentmenuitems); $i++) {
         if ($parentmenuitems[$i]['siteid'] == $menuitemid) {
             return true;
         }
@@ -439,15 +439,15 @@ 
 function mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure)
 {
     $maxMenuStructure = count($menustructure);
-    for ($i = 0; $i < $maxMenuStructure; $i ++) {
+    for ($i = 0; $i < $maxMenuStructure; $i++) {
         if ($menustructure[$i]['siteid'] == $pageid) {
-            echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
+            echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
 
             return;
         } else {
             if (isset($menustructure[$i]['submenu'])) {
                 if (mnu_IsMenuParentOf($menustructure[$i]['submenu'], $pageid)) {
-                    echo '&nbsp;&gt;&nbsp;' . htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
+                    echo '&nbsp;&gt;&nbsp;'.htmlspecialchars(t($menustructure[$i]['menustring']), ENT_COMPAT, 'UTF-8');
                     mnu_prv_EchoBreadCrumbSubItem($pageid, $menustructure[$i]['submenu']);
 
                     return;
@@ -465,6 +465,6 @@ 
 {
     $helplink = helppagelink($tplname);
     if ($helplink != "") {
-        echo $helplink . '<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
+        echo $helplink.'<img src="resource2/ocstyle/images/misc/32x32-help.png" /></a>';
     }
 }

Braces +2 added lines, -1 removed lines

@@ -423,7 +423,8 @@
 {
     global $menu;
 
-    if ($mainmenuindex >= 0) { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
+    if ($mainmenuindex >= 0) {
+// is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
         echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8');
 
         if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) {