OpencachingDeutschland / oc-server3

htdocs/ignore.php

Switch Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
 }
 
 switch ($action) {
-    case 'addignore':
-        sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
-        break;
-    case 'removeignore':
-        sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
-        break;
+        case 'addignore':
+            sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
+            break;
+        case 'removeignore':
+            sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
+            break;
 }
 
 // clear cached map result, so that the change directly appears on the map

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $cache_id = isset($_GET['cacheid']) ? $_GET['cacheid'] + 0 : 0;
 $action = isset($_GET['action']) ? $_GET['action'] : '';
-$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid=' . $cache_id;
+$target = isset($_GET['target']) ? $_GET['target'] : 'viewcache.php?cacheid='.$cache_id;
 
 $login->verify();
 
@@ -41,7 +41,7 @@ 
 $map_result_id = sql_value(
     "SELECT `result_id`
      FROM `map2_result`
-     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid) . "'\")
+     WHERE INSTR(sqlquery,\"`user_id`='" . sql_escape($login->userid)."'\")
      LIMIT 1",
     0
 );

htdocs/editcache.php

Braces +15 added lines, -5 removed lines

@@ -76,10 +76,12 @@ 
 if ($error == false) {
     //cacheid
     $cache_id = 0;
-    if (isset($_REQUEST['cacheid']))  // Ocprop
+    if (isset($_REQUEST['cacheid'])) {
+        // Ocprop
     {
         $cache_id = $_REQUEST['cacheid'];
     }
+    }
 
     if ($usr === false) {
         $tplname = 'login';
@@ -197,9 +199,11 @@ 
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
 
                 if ($status_old == 5 && $status == 5) {
-                    if (isset($_POST['publish']))  // Ocprop
+                    if (isset($_POST['publish'])) {
+                        // Ocprop
                     {
                         $publish = $_POST['publish'];
+                    }
                         if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) {
                             // somebody messed up the POST-data, so we do not publish the cache, since he isn't published right now (status=5)
                             $publish = 'notnow';
@@ -228,12 +232,14 @@ 
                     $status = $status_old;
                 }
 
-                if ($status_old == 7) // cache is locked
+                if ($status_old == 7) {
+                    // cache is locked
                 {
                     // only admins can change status of locked caches
                     if (($bAdmin & ADMIN_USER) != ADMIN_USER) {
                         // no status change allowed for normal user
                         $status = $status_old;
+                }
                     }
                 }
 
@@ -439,11 +445,13 @@ 
                 }
 
                 //try to save to DB?
-                if (isset($_POST['submit']))  // Ocprop
+                if (isset($_POST['submit'])) {
+                    // Ocprop
                 {
                     //all validations ok?
                     if (!($hidden_date_not_ok || $lat_not_ok || $lon_not_ok || $name_not_ok || $time_not_ok || $way_length_not_ok || $size_not_ok || $activate_date_not_ok || $status_not_ok || $diff_not_ok || $attribs_not_ok || $wpgc_not_ok)) {
                         $cache_lat = $coords_lat_h + $coords_lat_min / 60;
+                }
                         if ($coords_latNS == 'S') {
                             $cache_lat = - $cache_lat;
                         }
@@ -931,9 +939,11 @@ 
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
 
                 // show activation form?
-                if ($status_old == 5) // status = not yet published
+                if ($status_old == 5) {
+                    // status = not yet published
                 {
                     $tmp = $activation_form;
+                }
 
                     $tmp = mb_ereg_replace(
                         '{activate_day}',

Spacing +63 added lines, -63 removed lines

@@ -13,9 +13,9 @@ 
 use Oc\Libse\ChildWp\HandlerChildWp;
 use Oc\Libse\Coordinate\FormatterCoordinate;
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
 
 function getWaypoints($cacheid)
 {
@@ -85,7 +85,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', 'editcache.php?cacheid=' . urlencode($cache_id));
+        tpl_set_var('target', 'editcache.php?cacheid='.urlencode($cache_id));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -131,7 +131,7 @@ 
             if ($cache_record['user_id'] == $usr['userid'] || $login->listingAdmin()) {
                 $tplname = 'editcache';
 
-                require $stylepath . '/editcache.inc.php';
+                require $stylepath.'/editcache.inc.php';
 
                 if ($cache_record['node'] != $oc_nodeid) {
                     tpl_errorMsg('editcache', $error_wrong_node);
@@ -139,7 +139,7 @@ 
                 }
 
                 //here we read all used information from the form if submitted, otherwise from DB
-                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']);  // Ocprop
+                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']); // Ocprop
                 $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type'];
                 if (!isset($_POST['size'])) {
                     if ($cache_type == 4 || $cache_type == 5) {
@@ -153,15 +153,15 @@ 
                 $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date(
                     'd',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date(
                     'm',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date(
                     'Y',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
 
                 if (is_null($cache_record['date_activate'])) {
                     $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d');
@@ -187,11 +187,11 @@ 
                     );
                 }
 
-                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty'];  // Ocprop
-                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain'];  // Ocprop
-                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country'];  // Ocprop
+                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop
+                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop
+                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop
                 $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
-                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status'];  // Ocprop
+                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop
                 $status_old = $cache_record['status'];
                 $search_time = isset($_POST['search_time']) ? $_POST['search_time'] : $cache_record['search_time'];
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
@@ -253,7 +253,7 @@ 
 
                 $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw'];
                 // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc'];  // Ocprop
+                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop
                 $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0;
                 $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0;
 
@@ -265,12 +265,12 @@ 
 
                 if (isset($_POST['latNS'])) {
                     //get coords from post-form
-                    $coords_latNS = $_POST['latNS'];  // Ocprop
-                    $coords_lonEW = $_POST['lonEW'];  // Ocprop
-                    $coords_lat_h = $_POST['lat_h'];  // Ocprop
-                    $coords_lon_h = $_POST['lon_h'];  // Ocprop
-                    $coords_lat_min = $_POST['lat_min'];  // Ocprop
-                    $coords_lon_min = $_POST['lon_min'];  // Ocprop
+                    $coords_latNS = $_POST['latNS']; // Ocprop
+                    $coords_lonEW = $_POST['lonEW']; // Ocprop
+                    $coords_lat_h = $_POST['lat_h']; // Ocprop
+                    $coords_lon_h = $_POST['lon_h']; // Ocprop
+                    $coords_lat_min = $_POST['lat_min']; // Ocprop
+                    $coords_lon_min = $_POST['lon_min']; // Ocprop
                 } else {
                     //get coords from DB
                     $coords_lon = $cache_record['longitude'];
@@ -457,7 +457,7 @@ 
                             $activation_date = 'NULL';
                         } elseif ($publish == 'later') {
                             $status = 5;
-                            $activation_date = "'" . sql_escape(
+                            $activation_date = "'".sql_escape(
                                     date(
                                         'Y-m-d H:i:s',
                                         mktime(
@@ -469,7 +469,7 @@ 
                                             $cache_activate_year
                                         )
                                     )
-                                ) . "'";
+                                )."'";
                         } elseif ($publish == 'notnow') {
                             $status = 5;
                             $activation_date = 'NULL';
@@ -564,7 +564,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -585,25 +585,25 @@ 
 
                         // update cache attributes
                         $attriblist = "999";
-                        for ($i = 0; $i < count($cache_attribs); $i ++) {
+                        for ($i = 0; $i < count($cache_attribs); $i++) {
                             if ($cache_attribs[$i] + 0 > 0) {
                                 sql(
                                     "INSERT IGNORE INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES('&1', '&2')",
                                     $cache_id,
                                     $cache_attribs[$i] + 0
                                 );
-                                $attriblist .= "," . ($cache_attribs[$i] + 0);
+                                $attriblist .= ",".($cache_attribs[$i] + 0);
                             }
                         }
 
                         sql(
-                            "DELETE FROM `caches_attributes` WHERE `cache_id`='&1' AND `attrib_id` NOT IN (" . $attriblist . ")",
+                            "DELETE FROM `caches_attributes` WHERE `cache_id`='&1' AND `attrib_id` NOT IN (".$attriblist.")",
                             // SQL injections in $attriblist prevented by adding 0 above
                             $cache_id
                         );
 
                         //call eventhandler
-                        require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
+                        require_once $opt['rootpath'].'lib/eventhandler.inc.php';
                         event_edit_cache($cache_id, $usr['userid'] + 0);
 
                         // if old status is not yet published and new status is published => notify-event
@@ -612,7 +612,7 @@ 
                         }
 
                         //display cache-page
-                        tpl_redirect('viewcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('viewcache.php?cacheid='.urlencode($cache_id));
                         // Ocprop: Location:\s*$viewcacheUrl\?cacheid=([0-9]+)
                         // (s.a. tpl_redirect() in common.inc.php
                         exit;
@@ -654,15 +654,15 @@ 
 
                 while ($record = sql_fetch_assoc($rs)) {
                     $sSelected = ($record['short'] == $cache_country) ? ' selected="selected"' : '';
-                    $countriesoptions .= '<option value="' . htmlspecialchars(
+                    $countriesoptions .= '<option value="'.htmlspecialchars(
                             $record['short'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '"' . $sSelected . '>' . htmlspecialchars(
+                        ).'"'.$sSelected.'>'.htmlspecialchars(
                             $record['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>' . "\n";
+                        ).'</option>'."\n";
                 }
                 tpl_set_var('countryoptions', $countriesoptions);
                 sql_free_result($rs);
@@ -719,7 +719,7 @@ 
                         $line = mb_ereg_replace('{name}', escape_javascript($record['name']), $line);
                         $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
                         $group_line .= $line;
-                        $nLineAttrCount ++;
+                        $nLineAttrCount++;
 
                         $line = $cache_attrib_js;
                         $line = mb_ereg_replace('{id}', $record['id'], $line);
@@ -776,11 +776,11 @@ 
 
                 //difficulty
                 $difficulty_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_difficulty == $i) {
-                        $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                        $difficulty_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
                     } else {
-                        $difficulty_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                        $difficulty_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
                     }
                     $difficulty_options .= "\n";
                 }
@@ -788,11 +788,11 @@ 
 
                 //build terrain options
                 $terrain_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_terrain == $i) {
-                        $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
+                        $terrain_options .= '<option value="'.$i.'" selected="selected">'.$i / 2.'</option>';
                     } else {
-                        $terrain_options .= '<option value="' . $i . '">' . $i / 2 . '</option>';
+                        $terrain_options .= '<option value="'.$i.'">'.$i / 2.'</option>';
                     }
                     $terrain_options .= "\n";
                 }
@@ -805,16 +805,16 @@ 
                                                         FROM `cache_type`
                                              LEFT JOIN `sys_trans` ON `cache_type`.`trans_id`=`sys_trans`.`id`
                                              LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                 ORDER BY `cache_type`.`ordinal` ASC"
                 );
                 while ($rType = sql_fetch_assoc($rsTypes)) {
                     $sSelected = ($rType['id'] == $cache_type) ? ' selected="selected"' : '';
-                    $types .= '<option value="' . $rType['id'] . '"' . $sSelected . '>' . htmlspecialchars(
+                    $types .= '<option value="'.$rType['id'].'"'.$sSelected.'>'.htmlspecialchars(
                             $rType['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 sql_free_result($rsTypes);
                 tpl_set_var('typeoptions', $types);
@@ -826,16 +826,16 @@ 
                                                         FROM `cache_size`
                                              LEFT JOIN `sys_trans` ON `cache_size`.`trans_id`=`sys_trans`.`id`
                                              LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                 `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                 ORDER BY `cache_size`.`ordinal` ASC"
                 );
                 while ($rSize = sql_fetch_assoc($rsSizes)) {
                     $sSelected = ($rSize['id'] == $sel_size) ? ' selected="selected"' : '';
-                    $sizes .= '<option value="' . $rSize['id'] . '"' . $sSelected . '>' . htmlspecialchars(
+                    $sizes .= '<option value="'.$rSize['id'].'"'.$sSelected.'>'.htmlspecialchars(
                             $rSize['name'],
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 sql_free_result($rsSizes);
                 tpl_set_var('sizeoptions', $sizes);
@@ -846,14 +846,14 @@ 
                 $gc_com_refs = false;
                 foreach ($desclangs AS $desclang) {
                     if (count($desclangs) > 1) {
-                        $remove_url = 'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode(
+                        $remove_url = 'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode(
                                 $desclang
                             );
-                        $removedesc = '&nbsp;[<a href="' . htmlspecialchars(
+                        $removedesc = '&nbsp;[<a href="'.htmlspecialchars(
                                 $remove_url,
                                 ENT_COMPAT,
                                 'UTF-8'
-                            ) . '">' . $remove . '</a>]';
+                            ).'">'.$remove.'</a>]';
                     } else {
                         $removedesc = '';
                     }
@@ -869,17 +869,17 @@ 
                     }
                     sql_free_result($resp);
 
-                    $edit_url = 'editdesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang);
+                    $edit_url = 'editdesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang);
 
-                    $cache_descs .= '<tr><td colspan="2">' . htmlspecialchars(
+                    $cache_descs .= '<tr><td colspan="2">'.htmlspecialchars(
                             db_LanguageFromShort($desclang),
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . ' [<a href="' . htmlspecialchars(
+                        ).' [<a href="'.htmlspecialchars(
                             $edit_url,
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '">' . $edit . '</a>]' . $removedesc . '</td></tr>';
+                        ).'">'.$edit.'</a>]'.$removedesc.'</td></tr>';
                 }
                 tpl_set_var('cache_descs', $cache_descs);
 
@@ -899,33 +899,33 @@ 
                                                              FROM `cache_status`
                                                   LEFT JOIN `sys_trans` ON `cache_status`.`trans_id`=`sys_trans`.`id`
                                                   LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND
-                                                                      `sys_trans_text`.`lang`='" . sql_escape($locale) . "'
+                                                                      `sys_trans_text`.`lang`='" . sql_escape($locale)."'
                                                           WHERE `cache_status`.`id` NOT IN (4, 5, 7) OR `cache_status`.`id`='" . sql_escape(
                             $status_old + 0
-                        ) . "'
+                        )."'
                                                      ORDER BY `cache_status`.`id` ASC"
                     );
                     while ($rStatus = sql_fetch_assoc($rsStatus)) {
                         $sSelected = ($rStatus['id'] == $status) ? ' selected="selected"' : '';
                         if ($sSelected != '' || $status_old == 5) {
-                            $statusoptions .= '<option value="' . htmlspecialchars(
+                            $statusoptions .= '<option value="'.htmlspecialchars(
                                     $rStatus['id'],
                                     ENT_COMPAT,
                                     'UTF-8'
-                                ) . '"' . $sSelected . '>' . htmlspecialchars(
+                                ).'"'.$sSelected.'>'.htmlspecialchars(
                                     $rStatus['name'],
                                     ENT_COMPAT,
                                     'UTF-8'
-                                ) . '</option>';
+                                ).'</option>';
                         }
                     }
                     sql_free_result($rsStatus);
                 } else {
-                    $statusoptions .= '<option value="7" selected="selected">' . htmlspecialchars(
+                    $statusoptions .= '<option value="7" selected="selected">'.htmlspecialchars(
                             t("Locked, invisible"),
                             ENT_COMPAT,
                             'UTF-8'
-                        ) . '</option>';
+                        ).'</option>';
                 }
                 tpl_set_var('statusoptions', $statusoptions);
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
@@ -955,11 +955,11 @@ 
                     $tmp = mb_ereg_replace('{publish_notnow_checked}', ($publish == 'notnow') ? 'checked' : '', $tmp);
 
                     $activation_hours = '';
-                    for ($i = 0; $i <= 23; $i ++) {
+                    for ($i = 0; $i <= 23; $i++) {
                         if ($cache_activate_hour == $i) {
-                            $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
+                            $activation_hours .= '<option value="'.$i.'" selected="selected">'.$i.'</option>';
                         } else {
-                            $activation_hours .= '<option value="' . $i . '">' . $i . '</option>';
+                            $activation_hours .= '<option value="'.$i.'">'.$i.'</option>';
                         }
                         $activation_hours .= "\n";
                     }
@@ -983,7 +983,7 @@ 
                         $cache_id
                     );
 
-                    for ($i = 0; $i < mysql_num_rows($rspictures); $i ++) {
+                    for ($i = 0; $i < mysql_num_rows($rspictures); $i++) {
                         $tmpline = ($i == 0 ? $pictureline0 : $pictureline);
                         $pic_record = sql_fetch_array($rspictures);
 
@@ -1058,7 +1058,7 @@ 
                 $st_hours = floor($search_time);
                 $st_minutes = sprintf('%02.0F', ($search_time - $st_hours) * 60);
 
-                tpl_set_var('search_time', $st_hours . ':' . $st_minutes);
+                tpl_set_var('search_time', $st_hours.':'.$st_minutes);
 
                 tpl_set_var('way_length', $way_length);
                 tpl_set_var('log_pw', htmlspecialchars($log_pw, ENT_COMPAT, 'UTF-8'));
@@ -1066,7 +1066,7 @@ 
                 tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : '');
                 tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : '');
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

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

@@ -844,7 +844,7 @@
                 $desclangs = mb_split(',', $cache_record['desc_languages']);
                 $cache_descs = '';
                 $gc_com_refs = false;
-                foreach ($desclangs AS $desclang) {
+                foreach ($desclangs as $desclang) {
                     if (count($desclangs) > 1) {
                         $remove_url = 'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode(
                                 $desclang

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

Indentation +34 added lines, -34 removed lines

@@ -14,40 +14,40 @@
  * set template specific language variables
  ****************************************************************************/
 
- $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
-
- $submit = t('Submit cache');
- $default_country = t('EN');
- $default_lang = t('EN');
- $show_all = t('Show all');
- $default_NS = 'N';
- $default_EW = 'E';
- $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.');
-
- $sel_message = t('Select');
-
- $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
- $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
-
- $cache_attrib_group =
+    $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
+
+    $submit = t('Submit cache');
+    $default_country = t('EN');
+    $default_lang = t('EN');
+    $show_all = t('Show all');
+    $default_NS = 'N';
+    $default_EW = 'E';
+    $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.');
+
+    $sel_message = t('Select');
+
+    $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
+    $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
+
+    $cache_attrib_group =
     '<div class="attribgroup"><table cellspacing="0" style="display:inline;border-spacing:0px;">
          <tr><td bgcolor="{color}" style="line-height:9px;padding-top:2px;margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-top:1px solid gray;"><font size="1">{name}</font></td></tr>
          <tr><td bgcolor="#F8F8F8" style="margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-bottom:1px solid gray;">{attribs}</td></tr>

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

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
         
  ****************************************************************************/
 
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
- $removed_message_end = '---';
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
+    $removed_message_end = '---';
  
 
 function removed_log_subject($lang)

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/removedesc.inc.php

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@
      
  ****************************************************************************/
  
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
 
- $commit = t('the cache description has been deleted');
- $commit_title = t('delete this cache-description');
+    $commit = t('the cache description has been deleted');
+    $commit_title = t('delete this cache-description');

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

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 $error_suffix = '</span>';
 
 $htmlnotice =
- '<tr><td class="spacer" colspan="2"></td></tr>
+    '<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') . '" />

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

htdocs/lang/de/expressions.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 //common vars
 $dateformat = $opt['locale'][$locale]['format']['date'];
-$reset = t('Reset');  // obsolete
+$reset = t('Reset'); // obsolete
 $yes = t('Yes');
 $no = t('No');
 

htdocs/ocstats.php

Braces +2 added lines, -1 removed lines

@@ -17,8 +17,9 @@
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
-if (!isset($opt['locale'][$lang]))
+if (!isset($opt['locale'][$lang])) {
     $lang = $opt['template']['locale'];
+}
 
 $filename = GetFilename($userid, $lang);
 

Spacing +6 added lines, -6 removed lines

@@ -7,11 +7,11 @@ 
  *  Create / redirect to statpic
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 // Parameter
 $jpeg_qualitaet = 80;
-$fontfile = $opt['rootpath'] . 'resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
+$fontfile = $opt['rootpath'].'resource2/'.$opt['template']['style'].'/fonts/dejavu/ttf/DejaVuSans.ttf';
 
 // get userid and style from URL
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
@@ -66,10 +66,10 @@ 
 
     if (sql_num_rows($rs) == 1) {
         $record = sql_fetch_array($rs);
-        $tplpath = $opt['rootpath'] . $record['tplpath'];
+        $tplpath = $opt['rootpath'].$record['tplpath'];
         $maxtextwidth = $record['maxtextwidth'];
     } else {
-        $tplpath = $opt['rootpath'] . 'images/ocstats1.gif';
+        $tplpath = $opt['rootpath'].'images/ocstats1.gif';
         $maxtextwidth = 60;
         $logo = 1;
     }
@@ -170,11 +170,11 @@ 
 }
 
 // Redirect auf das gespeicherte Bild
-$tpl->redirect('images/statpics/statpic' . $userid . $lang . '.jpg');
+$tpl->redirect('images/statpics/statpic'.$userid.$lang.'.jpg');
 
 function GetFilename($userid, $lang)
 {
     global $opt;
 
-    return $opt['rootpath'] . 'images/statpics/statpic' . $userid . $lang . '.jpg';
+    return $opt['rootpath'].'images/statpics/statpic'.$userid.$lang.'.jpg';
 }

htdocs/util2/cron/modules/purge_logs.class.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 class purge_logs
 {
     public $name = 'purge_logs';
-    public $interval = 86400;    // daily
+    public $interval = 86400; // daily
 
     public function run()
     {