OpencachingDeutschland / oc-server3

htdocs/api/coord.ch/newest.php

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 
 header('Content-type: text/html; charset=utf-8');
 
-$opt['rootpath'] = __DIR__ . '/../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $bFirstRow = true;
 
@@ -52,5 +52,5 @@ 
 // renamed function from "str_getcsv" to avoid collision with PHP 5.3 str_getcsv()
 function strGetCsv($str)
 {
-    return '"' . mb_ereg_replace('"', '\"', $str) . '"';
+    return '"'.mb_ereg_replace('"', '\"', $str).'"';
 }

htdocs/removedesc.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/lib/common.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
 
 //Preprocessing
 if ($error == false) {
@@ -32,7 +32,7 @@ 
         tpl_set_var(
             'target',
             htmlspecialchars(
-                'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang),
+                'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang),
                 ENT_COMPAT,
                 'UTF-8'
             )
@@ -56,7 +56,7 @@ 
                 if (mysql_num_rows($desc_rs) == 1) {
                     $desc_record = sql_fetch_array($desc_rs);
                     mysql_free_result($desc_rs);
-                    require $stylepath . '/removedesc.inc.php';
+                    require $stylepath.'/removedesc.inc.php';
 
                     if ($desc_record['node'] != $oc_nodeid) {
                         tpl_errorMsg('removedesc', $error_wrong_node);
@@ -70,7 +70,7 @@ 
                         // do not use slave server for the next time ...
                         db_slave_exclude();
 
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                         exit;
                     } else {
                         //commit the removement

htdocs/editcache.php

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

Spacing +61 added lines, -61 removed lines

@@ -84,7 +84,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);
@@ -130,7 +130,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);
@@ -138,7 +138,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) {
@@ -152,15 +152,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');
@@ -186,11 +186,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'];
@@ -251,7 +251,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;
 
@@ -263,12 +263,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'];
@@ -454,7 +454,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(
@@ -466,7 +466,7 @@ 
                                             $cache_activate_year
                                         )
                                     )
-                                ) . "'";
+                                )."'";
                         } elseif ($publish == 'notnow') {
                             $status = 5;
                             $activation_date = 'NULL';
@@ -561,7 +561,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -582,25 +582,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
@@ -609,7 +609,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;
                     }
@@ -650,15 +650,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);
@@ -715,7 +715,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);
@@ -772,11 +772,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";
                 }
@@ -784,11 +784,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";
                 }
@@ -801,16 +801,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);
@@ -822,16 +822,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);
@@ -842,14 +842,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 = '';
                     }
@@ -865,17 +865,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);
 
@@ -895,33 +895,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));
@@ -951,11 +951,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";
                     }
@@ -979,7 +979,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);
 
@@ -1054,7 +1054,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'));
@@ -1062,7 +1062,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

Braces +12 added lines, -5 removed lines

@@ -76,7 +76,8 @@ 
 if ($error == false) {
     //cacheid
     $cache_id = 0;
-    if (isset($_REQUEST['cacheid'])) { // Ocprop
+    if (isset($_REQUEST['cacheid'])) {
+// Ocprop
         $cache_id = $_REQUEST['cacheid'];
     }
 
@@ -196,7 +197,8 @@ 
                 $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)
@@ -226,12 +228,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;
+                }
                     }
                 }
 
@@ -437,7 +441,8 @@ 
                 }
 
                 //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;
@@ -927,9 +932,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}',

htdocs/util2/stats/rank.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 $n = 1;
 $rs = sql('SELECT `user`.`username`, `stat_user`.`found`
@@ -18,7 +18,7 @@ 
            ORDER BY `stat_user`.`found` DESC
               LIMIT 100');
 while ($r = sql_fetch_assoc($rs)) {
-    echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
-    $n ++;
+    echo $n.' '.$r['username'].': '.$r['found']."\n";
+    $n++;
 }
 sql_free_result($rs);

htdocs/util2/stats/owner.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 header('Content-type: text/html; charset=utf-8');
 
 $opt['rootpath'] = '../../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 echo "<h2>Top-Owner</h2>\n";
 
@@ -28,7 +28,7 @@ 
         FROM `caches`
         LEFT JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
         LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
-        WHERE status=1 AND " . $condition . "
+        WHERE status=1 AND " . $condition."
         GROUP BY `caches`.`user_id`
         HAVING COUNT(*) >= $limit
         ORDER BY COUNT(*) DESC"
@@ -36,7 +36,7 @@ 
 
     $n = 1;
     while ($r = sql_fetch_assoc($rs)) {
-        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;" . ($n ++) . ".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>" . $r['count'] . "</td><td>&nbsp;&nbsp;" . $r['name'] . "</td></tr>\n";
+        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;".($n++).".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>".$r['count']."</td><td>&nbsp;&nbsp;".$r['name']."</td></tr>\n";
     }
     sql_free_result($rs);
 

htdocs/util2/license/process-old-disabled-users.php

Spacing +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/user.class.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/logic/user.class.php';
 
 $login->admin = ADMIN_USER;
 
@@ -24,7 +24,7 @@ 
 
 $n = 0;
 while ($r = sql_fetch_assoc($rs)) {
-    echo "purging content of user '" . $r['username'] . "'\n";
+    echo "purging content of user '".$r['username']."'\n";
 
     $user = new user($r['user_id']);
     $result = $user->disduelicense(true);
@@ -32,7 +32,7 @@ 
         die($result);
     }
 
-    ++ $n;
+    ++$n;
 }
 sql_free_result($rs);
 

htdocs/util2/gns/gns_import.php

Spacing +26 added lines, -26 removed lines

@@ -44,7 +44,7 @@ 
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt++ == 0) {// skip first line
             continue;
         }
 
@@ -52,31 +52,31 @@ 
 
         sql(
             "INSERT IGNORE INTO gns_locations SET
-                    rc = '" . sql_escape($gns[0]) . "',
-                    ufi = '" . sql_escape($gns[1]) . "',
-                    uni = '" . sql_escape($gns[2]) . "',
-                    lat = '" . sql_escape($gns[3]) . "',
-                    lon = '" . sql_escape($gns[4]) . "',
-                    dms_lat = '" . sql_escape($gns[5]) . "',
-                    dms_lon = '" . sql_escape($gns[6]) . "',
-                    utm = '" . sql_escape($gns[7]) . "',
-                    jog = '" . sql_escape($gns[8]) . "',
-                    fc = '" . sql_escape($gns[9]) . "',
-                    dsg = '" . sql_escape($gns[10]) . "',
-                    pc = '" . sql_escape($gns[11]) . "',
-                    cc1 = '" . sql_escape($gns[12]) . "',
-                    adm1 = '" . sql_escape($gns[13]) . "',
-                    adm2 = _utf8'" . sql_escape($gns[14]) . "',
-                    dim = '" . sql_escape($gns[15]) . "',
-                    cc2 = '" . sql_escape($gns[16]) . "',
-                    nt = '" . sql_escape($gns[17]) . "',
-                    lc = '" . sql_escape($gns[18]) . "',
-                    SHORT_FORM = _utf8'" . sql_escape($gns[19]) . "',
-                    GENERIC = _utf8'" . sql_escape($gns[20]) . "',
-                    SORT_NAME = _utf8'" . sql_escape($gns[21]) . "',
-                    FULL_NAME = _utf8'" . sql_escape($gns[22]) . "',
-                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23]) . "',
-                    MOD_DATE = '" . sql_escape($gns[24]) . "'"
+                    rc = '" . sql_escape($gns[0])."',
+                    ufi = '" . sql_escape($gns[1])."',
+                    uni = '" . sql_escape($gns[2])."',
+                    lat = '" . sql_escape($gns[3])."',
+                    lon = '" . sql_escape($gns[4])."',
+                    dms_lat = '" . sql_escape($gns[5])."',
+                    dms_lon = '" . sql_escape($gns[6])."',
+                    utm = '" . sql_escape($gns[7])."',
+                    jog = '" . sql_escape($gns[8])."',
+                    fc = '" . sql_escape($gns[9])."',
+                    dsg = '" . sql_escape($gns[10])."',
+                    pc = '" . sql_escape($gns[11])."',
+                    cc1 = '" . sql_escape($gns[12])."',
+                    adm1 = '" . sql_escape($gns[13])."',
+                    adm2 = _utf8'" . sql_escape($gns[14])."',
+                    dim = '" . sql_escape($gns[15])."',
+                    cc2 = '" . sql_escape($gns[16])."',
+                    nt = '" . sql_escape($gns[17])."',
+                    lc = '" . sql_escape($gns[18])."',
+                    SHORT_FORM = _utf8'" . sql_escape($gns[19])."',
+                    GENERIC = _utf8'" . sql_escape($gns[20])."',
+                    SORT_NAME = _utf8'" . sql_escape($gns[21])."',
+                    FULL_NAME = _utf8'" . sql_escape($gns[22])."',
+                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23])."',
+                    MOD_DATE = '" . sql_escape($gns[24])."'"
         );
     }
     fclose($file);

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt ++ == 0) {
+// skip first line
             continue;
         }
 

htdocs/util2/gns/mksearchindex.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
 
 
 $doubleindex['sankt'] = 'st';
@@ -27,7 +27,7 @@ 
     foreach ($simpletextsarray as $text) {
         if ($text != '') {
             if (nonalpha($text)) {
-                die($r['uni'] . ' ' . $text . "\n");// obsolete for the same reason as above
+                die($r['uni'].' '.$text."\n"); // obsolete for the same reason as above
             }
 
             $simpletext = search_text2simple($text);
@@ -59,7 +59,7 @@ 
 
 function nonalpha($str)
 {
-    for ($i = 0; $i < mb_strlen($str); $i ++) {
+    for ($i = 0; $i < mb_strlen($str); $i++) {
         if (!((ord(mb_substr($str, $i, 1)) >= ord('a')) && (ord(mb_substr($str, $i, 1)) <= ord('z')))) {
             return true;
         }

htdocs/util2/gns/mkadmtxt.php

Spacing +8 added lines, -8 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
 
 
 $rsLocations = sql("SELECT `uni`, `lat`, `lon`, `rc`, `cc1`, `adm1` FROM `gns_locations` WHERE `dsg` LIKE 'PPL%'");
@@ -22,7 +22,7 @@ 
     $maxlon = geomath::getMaxLon($rLocations['lon'], $rLocations['lat'], 10, 1);
 
     // den nächsgelegenen Ort in den geodb ermitteln
-    $sql = 'SELECT ' . geomath::getSqlDistanceFormula(
+    $sql = 'SELECT '.geomath::getSqlDistanceFormula(
             $rLocations['lon'],
             $rLocations['lat'],
             10,
@@ -30,13 +30,13 @@ 
             'lon',
             'lat',
             'geodb_coordinates'
-        ) . ' `distance`,
+        ).' `distance`,
                             `geodb_coordinates`.`loc_id` `loc_id`
                       FROM `geodb_coordinates`
-                      WHERE `lon` > ' . $minlon . ' AND
-                            `lon` < ' . $maxlon . ' AND
-                            `lat` > ' . $minlat . ' AND
-                            `lat` < ' . $maxlat . '
+                      WHERE `lon` > ' . $minlon.' AND
+                            `lon` < ' . $maxlon.' AND
+                            `lat` > ' . $minlat.' AND
+                            `lat` < ' . $maxlat.'
                       HAVING `distance` < 10
                       ORDER BY `distance` ASC
                       LIMIT 1';