OpencachingDeutschland / oc-server3

htdocs/restorecaches.php

Spacing +42 added lines, -42 removed lines

@@ -132,8 +132,8 @@ 
 
 */
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
 
 $tpl->name = 'restorecaches';
 $tpl->menuitem = MNU_ADMIN_RESTORE;
@@ -308,12 +308,12 @@ 
 
 function get_archive_data($caches)
 {
-    $cachelist = "(" . implode(",", $caches) . ")";
+    $cachelist = "(".implode(",", $caches).")";
     $data = array();
     $admins = array();
 
     // make waypoint index
-    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $wp_oc[$r['cache_id']] = $r['wp_oc'];
     }
@@ -328,7 +328,7 @@ 
             `latitude`,
             `restored_by`
         FROM `cache_coordinates`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_created` ASC"
     );
     // order is relevant, because multiple changes per day possible
@@ -336,7 +336,7 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $coord = new coordinate($r['latitude'], $r['longitude']);
         $coord = $coord->getDecimalMinutes();
-        $coord = $coord['lat'] . " " . $coord['lon'];
+        $coord = $coord['lat']." ".$coord['lon'];
         if (isset($lastcoord[$r['cache_id']]) && $coord != $lastcoord[$r['cache_id']]) {
             // the database contains lots of old coord records with unchanged coords, wtf?
             append_data($data, $admins, $wp_oc, $r, "coord", $lastcoord[$r['cache_id']], $coord);
@@ -348,7 +348,7 @@ 
     // cache country
     $rs = sql("SELECT `cache_id`, LEFT(`date_created`,10) AS `date_modified`, `country`, `restored_by`
                FROM `cache_countries`
-                         WHERE `cache_id` IN " . $cachelist . "
+                         WHERE `cache_id` IN " . $cachelist."
                          ORDER BY `date_created` ASC");
     // order is relevant, because multiple changes per day possible
     $lastcountry = array();
@@ -364,17 +364,17 @@ 
     // all other cache data
     // first the current data ...
     $nextcd = array();
-    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
     // .. and then the changes
     $rs = sql(
         "SELECT * FROM `caches_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     while ($r = sql_fetch_assoc($rs)) {
@@ -417,8 +417,8 @@ 
                 $wp_oc,
                 $r,
                 "time",
-                $r['search_time'] . ' h',
-                $nextcd[$wp]['search_time'] . ' h'
+                $r['search_time'].' h',
+                $nextcd[$wp]['search_time'].' h'
             );
         }
         if ($r['way_length'] != $nextcd[$wp]['way_length']) {
@@ -428,8 +428,8 @@ 
                 $wp_oc,
                 $r,
                 "way",
-                $r['way_length'] . ' km',
-                $nextcd[$wp]['way_length'] . ' km'
+                $r['way_length'].' km',
+                $nextcd[$wp]['way_length'].' km'
             );
         }
         if ($r['wp_gc'] != $nextcd[$wp]['wp_gc']) {
@@ -465,8 +465,8 @@ 
     // attributes
     $rs = sql(
         "SELECT * FROM `caches_attributes_modified`
-        WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
-        ORDER BY `date_modified` ASC");   // order doesn't matter as long it is date only
+        WHERE `cache_id` IN " . $cachelist."  /* OConly attrib is shown, but not restorable */
+        ORDER BY `date_modified` ASC"); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -474,7 +474,7 @@ 
             $wp_oc,
             $r,
             "attrib",
-            ($r['was_set'] ? "-" : "+") . labels::getLabelValue('cache_attrib', $r['attrib_id']),
+            ($r['was_set'] ? "-" : "+").labels::getLabelValue('cache_attrib', $r['attrib_id']),
             ''
         );
     }
@@ -512,7 +512,7 @@ 
             LENGTH(`short_desc`) AS `sdl`,
             `restored_by`
         FROM `cache_desc_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     // order doesn't matter as long only one change per day is recorded
@@ -534,8 +534,8 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "desc(" . $r['language'] . ")",
-                $r['dl'] + 0, $next['dl'] + 0 . " bytes"
+                "desc(".$r['language'].")",
+                $r['dl'] + 0, $next['dl'] + 0." bytes"
             );
         }
         if ($r['hl'] + 0 != $next['hl'] + 0) {
@@ -544,9 +544,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "hint(" . $r['language'] . ")",
+                "hint(".$r['language'].")",
                 $r['hl'] + 0,
-                $next['hl'] + 0 . " bytes"
+                $next['hl'] + 0." bytes"
             );
         }
         if ($r['sdl'] + 0 != $next['sdl'] + 0) {
@@ -555,9 +555,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "shortdesc(" . $r['language'] . ")",
+                "shortdesc(".$r['language'].")",
                 $r['sdl'] + 0,
-                $next['sdl'] + 0 . " bytes"
+                $next['sdl'] + 0." bytes"
             );
         }
 
@@ -580,7 +580,7 @@ 
               (SELECT 1 AS `op`, `deletion_date` AS `date_modified`, `cache_id`,
                     `user_id`, `type`, `date`, `restored_by`
                    FROM `cache_logs_archived`
-                  WHERE `cache_id` IN " . $cachelist . "AND `deleted_by`='&1' AND `user_id`<>'&1'
+                  WHERE `cache_id` IN " . $cachelist."AND `deleted_by`='&1' AND `user_id`<>'&1'
                   UNION
                   SELECT 2 AS `op`, `date_modified`, `cache_id`,
                        (SELECT `user_id` FROM `cache_logs_archived` WHERE `id`=`original_id`),
@@ -588,7 +588,7 @@ 
                        (SELECT `date` FROM `cache_logs_archived` WHERE `id`=`original_id`),
                        `restored_by`
                  FROM `cache_logs_restored`
-                  WHERE `cache_id` IN " . $cachelist . ") `logs`
+                  WHERE `cache_id` IN " . $cachelist.") `logs`
                 INNER JOIN `user` ON `user`.`user_id`=`logs`.`user_id`
               ORDER BY `logs`.`date_modified` ASC",
         // order may not be exact when redoing reverts, because delete and insert
@@ -602,7 +602,7 @@ 
             $wp_oc,
             $r,
             $r["op"] == 1 ? "dellog" : "restorelog",
-            "<a href='viewprofile.php?userid=" . $r['user_id'] . "' target='_blank'>" . $r['username'] . "</a>/" . $r['date'],
+            "<a href='viewprofile.php?userid=".$r['user_id']."' target='_blank'>".$r['username']."</a>/".$r['date'],
             ''
         );
     }
@@ -618,9 +618,9 @@ 
 
     $piccacheid = "IF(`object_type`=2, `object_id`, IF(`object_type`=1, IFNULL((SELECT `cache_id` FROM `cache_logs` WHERE `id`=`object_id`),(SELECT `cache_id` FROM `cache_logs_archived` WHERE `id`=`object_id`)), 0))";
     $rs = sql(
-        "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
-        WHERE " . $piccacheid . " IN " . $cachelist . "
-        ORDER BY `date_modified` ASC");  // order is relevant for the case of restore-reverts
+        "SELECT *, ".$piccacheid."AS `cache_id` FROM `pictures_modified`
+        WHERE " . $piccacheid." IN ".$cachelist."
+        ORDER BY `date_modified` ASC"); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -642,14 +642,14 @@ 
                 $picchange .= "-cache";
                 break;
         }
-        append_data($data, $admins, $wp_oc, $r, $picchange . "pic", $r['title'], '');
+        append_data($data, $admins, $wp_oc, $r, $picchange."pic", $r['title'], '');
     }
     sql_free_result($rs);
 
     // admins
     foreach ($admins as $adate => $adata) {
         foreach ($adata as $awp => $alist) {
-            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> " . implode(',', $alist);
+            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> ".implode(',', $alist);
         }
     }
 
@@ -698,9 +698,9 @@ 
     } else {
         $text .= " class='userchange'";
     }
-    $text .= ">$field</strong>: $oldvalue" . ($newvalue != "" ? " &rarr; $newvalue" : "");
+    $text .= ">$field</strong>: $oldvalue".($newvalue != "" ? " &rarr; $newvalue" : "");
     if (isset($data[$mdate][$wp])) {
-        $data[$mdate][$wp] .= ", " . $text;
+        $data[$mdate][$wp] .= ", ".$text;
     } else {
         $data[$mdate][$wp] = $text;
     }
@@ -713,8 +713,8 @@ 
             $admins[$mdate][$wp] = [];
         }
         $admins[$mdate][$wp][$r['restored_by'] + 0]
-            = "<a href='viewprofile.php?userid=" . $r['restored_by'] . "' target='_blank'>" .
-            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']) .
+            = "<a href='viewprofile.php?userid=".$r['restored_by']."' target='_blank'>".
+            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']).
             "</a>";
     }
 }
@@ -724,7 +724,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -834,12 +834,12 @@ 
                     if ($setfields != "") {
                         $setfields .= ",";
                     }
-                    $setfields .= "`$field`='" . sql_escape($r[$field]) . "'";
+                    $setfields .= "`$field`='".sql_escape($r[$field])."'";
                     $restored[$wp][$field] = true;
                 }
             }
             if ($setfields != "" && !$simulate) {
-                sql("UPDATE `caches` SET " . $setfields . " WHERE `cache_id`='&1'", $cacheid);
+                sql("UPDATE `caches` SET ".$setfields." WHERE `cache_id`='&1'", $cacheid);
             }
         }
         sql_free_result($rs);
@@ -1016,7 +1016,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1068,7 +1068,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1202,7 +1202,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture '.$r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

htdocs/api/email_problems.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -16,7 +16,7 @@ 
 ) {
     $rs = sql('SELECT `user_id`, `email_problems` FROM `user` WHERE `email_problems`');
     while ($r = sql_fetch_assoc($rs)) {
-        echo $r['user_id'] . ' ' . $r['email_problems'] . "\n";
+        echo $r['user_id'].' '.$r['email_problems']."\n";
     }
     sql_free_result($rs);
 }

htdocs/api/hidden_caches.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  *  replicated system than the XML interface.
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 header('Content-type: text/plain; charset=utf-8');
 
@@ -24,5 +24,5 @@ 
 );
 $wp_ocs = sql_fetch_column($rs);
 foreach ($wp_ocs as $wp_oc) {
-    echo $wp_oc . "\n";
+    echo $wp_oc."\n";
 }

htdocs/api/gc2oc.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  *
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+$opt['rootpath'] = __DIR__.'/../';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if (isset($_REQUEST['report']) && $_REQUEST['report']) {
     header('Content-type: text/plain');

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

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

htdocs/translate.php

Spacing +48 added lines, -48 removed lines

@@ -5,9 +5,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/translate.class.php';
-require_once __DIR__ . '/lib2/translationHandler.class.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/translate.class.php';
+require_once __DIR__.'/lib2/translationHandler.class.php';
 
 /* config section
  */
@@ -249,11 +249,11 @@ 
 {
     global $opt;
 
-    if (!file_exists($opt['rootpath'] . '../sql/static-data/data.sql')) {
+    if (!file_exists($opt['rootpath'].'../sql/static-data/data.sql')) {
         return '';
     }
 
-    $content = file_get_contents($opt['rootpath'] . '../sql/static-data/data.sql');
+    $content = file_get_contents($opt['rootpath'].'../sql/static-data/data.sql');
 
     // at the end is an INSERT of the current checksum
     // to calculate this checksum, we have to trim the end before that statement and the linefeed before
@@ -282,7 +282,7 @@ 
     sql("DELETE FROM `sys_trans_text` WHERE `trans_id`='&1'", $id);
     sql("DELETE FROM `sys_trans_ref` WHERE `trans_id`='&1'", $id);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function edit()
@@ -311,7 +311,7 @@ 
             );
         }
         sql_free_result($rs);
-        $tpl->redirect('translate.php?translang=' . $translang . '&action=edit&id=' . $id);
+        $tpl->redirect('translate.php?translang='.$translang.'&action=edit&id='.$id);
     } else {
         if (isset($_REQUEST['submit'])) {
             $transText = isset($_REQUEST['transText']) ? $_REQUEST['transText'] : '';
@@ -347,14 +347,14 @@ 
 
     // built sql string to search for texts with little difference (levensthein() would be better, but not available in MYSQL)
     $sWhereSql =
-        "SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans`.`text`)
-         OR SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans_text`.`text`)";
+        "SOUNDEX('".sql_escape($r['text'])."')=SOUNDEX(`sys_trans`.`text`)
+         OR SOUNDEX('" . sql_escape($r['text'])."')=SOUNDEX(`sys_trans_text`.`text`)";
 
     $trans = sql(
         "SELECT DISTINCT `sys_trans`.`id`, `sys_trans`.`text`
          FROM `sys_trans`
          INNER JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
-         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql . ")",
+         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql.")",
         $id
     );
     $tpl->assign_rs('trans', $trans);
@@ -387,7 +387,7 @@ 
 
     $translationHandler->createMessageFiles();
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function unlinkFiles($relbasedir, $ext)
@@ -398,12 +398,12 @@ 
         $relbasedir .= '/';
     }
 
-    if ($opt['rootpath'] . $relbasedir) {
-        if ($dh = opendir($opt['rootpath'] . $relbasedir)) {
+    if ($opt['rootpath'].$relbasedir) {
+        if ($dh = opendir($opt['rootpath'].$relbasedir)) {
             while (($file = readdir($dh)) !== false) {
-                if ($file != '.' && $file != '..' && is_file($opt['rootpath'] . $relbasedir . $file)) {
-                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.' . $ext) {
-                        unlink($opt['rootpath'] . $relbasedir . $file);
+                if ($file != '.' && $file != '..' && is_file($opt['rootpath'].$relbasedir.$file)) {
+                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.'.$ext) {
+                        unlink($opt['rootpath'].$relbasedir.$file);
                     }
                 }
             }
@@ -478,7 +478,7 @@ 
     $lastId = sql_value("SELECT MAX(`id`) FROM `sys_trans`", 0);
     sql("ALTER TABLE `sys_trans` AUTO_INCREMENT = &1", $lastId + 1);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function useId($freeId)
@@ -500,9 +500,9 @@ 
 
     foreach ($transIdCols as $col) {
         sql(
-            "UPDATE `" . $col['table'] . "`
-             SET `" . $col['trans_id'] . "`='&1'
-             WHERE `" . $col['trans_id'] . "`='&2'",
+            "UPDATE `".$col['table']."`
+             SET `" . $col['trans_id']."`='&1'
+             WHERE `" . $col['trans_id']."`='&2'",
             $newId,
             $oldId
         );
@@ -513,9 +513,9 @@ 
 {
     global $opt, $tpl, $translang;
 
-    $structure = enumSqlFiles($opt['rootpath'] . '../sql/tables');
+    $structure = enumSqlFiles($opt['rootpath'].'../sql/tables');
     foreach ($structure AS $sTable) {
-        sql_export_structure_to_file($opt['rootpath'] . '../sql/tables/' . $sTable . '.sql', $sTable);
+        sql_export_structure_to_file($opt['rootpath'].'../sql/tables/'.$sTable.'.sql', $sTable);
     }
 
     // static data tables
@@ -551,21 +551,21 @@ 
     $stab[] = 'towns';
     $stab[] = 'watches_waitingtypes';
 
-    sql_export_tables_to_file($opt['rootpath'] . '../sql/static-data/data.sql', $stab);
+    sql_export_tables_to_file($opt['rootpath'].'../sql/static-data/data.sql', $stab);
 
     $checksum = calcDataSqlChecksum(false);
-    $f = fopen($opt['rootpath'] . '../sql/static-data/data.sql', 'a');
+    $f = fopen($opt['rootpath'].'../sql/static-data/data.sql', 'a');
     fwrite(
         $f,
         "INSERT INTO `sysconfig` (`name`, `value`)"
-        . " VALUES ('datasql_checksum', '" . sql_escape($checksum) . "')"
-        . " ON DUPLICATE KEY UPDATE `value`='" . sql_escape($checksum) . "';\n"
+        . " VALUES ('datasql_checksum', '".sql_escape($checksum)."')"
+        . " ON DUPLICATE KEY UPDATE `value`='".sql_escape($checksum)."';\n"
     );
     fclose($f);
 
     setSysConfig('datasql_checksum', $checksum);
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function enumSqlFiles($dir)
@@ -594,9 +594,9 @@ 
         $hDir = opendir($dir);
         if ($hDir !== false) {
             while (($file = readdir($hDir)) !== false) {
-                if (is_file($dir . '/' . $file)) {
+                if (is_file($dir.'/'.$file)) {
                     if ((substr($file, - 4) == '.tpl') || (substr($file, - 4) == '.php')) {
-                        $files[] = $dir . '/' . $file;
+                        $files[] = $dir.'/'.$file;
                     }
                 }
             }
@@ -690,7 +690,7 @@ 
         $writer->writeAttribute('id', $r['id']);
 
         $writer->writeElement('code', $r['text']);
-        for ($n = 0; $n < count($lang); $n ++) {
+        for ($n = 0; $n < count($lang); $n++) {
             $writer->writeElement(
                 $lang[$n],
                 sql_value(
@@ -712,9 +712,9 @@ 
         while ($rUsage = sql_fetch_assoc($rsUsage)) {
             $line = '';
             if ($rUsage['line'] != 0) {
-                $line = ' (' . $rUsage['line'] . ')';
+                $line = ' ('.$rUsage['line'].')';
             }
-            $writer->writeElement('usage', $rUsage['resource_name'] . $line);
+            $writer->writeElement('usage', $rUsage['resource_name'].$line);
         }
         sql_free_result($rsUsage);
 
@@ -738,7 +738,7 @@ 
 
     $scanlang = [];
     foreach ($opt['locale'] AS $k => $v) {
-        if (isset($_REQUEST['lang' . $k]) && ($_REQUEST['lang' . $k] == '1')) {
+        if (isset($_REQUEST['lang'.$k]) && ($_REQUEST['lang'.$k] == '1')) {
             $scanlang[] = $k;
         }
     }
@@ -818,15 +818,15 @@ 
 
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
 
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
-        if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
-            $sCode = base64_decode($_REQUEST['code' . $nIndex]);
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
+        if (isset($_REQUEST['useitem'.$nIndex]) && ($_REQUEST['useitem'.$nIndex] == '1')) {
+            $sCode = base64_decode($_REQUEST['code'.$nIndex]);
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
 
             if ($transId != 0) {
                 foreach ($opt['locale'] AS $k => $v) {
-                    if (isset($_REQUEST[$k . $nIndex . 'new'])) {
-                        $sText = base64_decode($_REQUEST[$k . $nIndex . 'new']);
+                    if (isset($_REQUEST[$k.$nIndex.'new'])) {
+                        $sText = base64_decode($_REQUEST[$k.$nIndex.'new']);
 
                         sql(
                             "INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`)
@@ -842,7 +842,7 @@ 
         }
     }
 
-    $tpl->redirect('translate.php?translang=' . $translang);
+    $tpl->redirect('translate.php?translang='.$translang);
 }
 
 function textexport($translang, $all)
@@ -872,9 +872,9 @@ 
             $translang
         );
         if (($all) || (mb_strlen($translated) == 0)) {
-            $thisline = $r['id'] . "\r\n";
-            $thisline .= $r['text'] . "\r\n";
-            $thisline .= $translated . "\r\n";
+            $thisline = $r['id']."\r\n";
+            $thisline .= $r['text']."\r\n";
+            $thisline .= $translated."\r\n";
             $thisline .= "\r\n";
             echo($thisline);
         }
@@ -1010,8 +1010,8 @@ 
     }
 
     while (($file = readdir($hDir)) !== false) {
-        if ($file != '.' && $file != '..' && is_dir($basedir . $file)) {
-            addClassesDirectoriesToDirlist($basedir . $file);
+        if ($file != '.' && $file != '..' && is_dir($basedir.$file)) {
+            addClassesDirectoriesToDirlist($basedir.$file);
         }
     }
     closedir($hDir);
@@ -1026,9 +1026,9 @@ 
         if (!isset($col['verify']) || $col['verify']) {
             $rs = sql(
                 "SELECT
-                    `" . $col['text'] . "` `text`,
-                    `" . $col['trans_id'] . "` `trans_id`
-                 FROM `" . $col['table'] . "`"
+                    `" . $col['text']."` `text`,
+                    `" . $col['trans_id']."` `trans_id`
+                 FROM `" . $col['table']."`"
             );
             while ($r = sql_fetch_assoc($rs)) {
                 $st = sql_value(
@@ -1048,7 +1048,7 @@ 
                 if ($en != $r['text'] || $st != $r['text']) {
                     $inconsistencies[] = [
                         'id' => $r['trans_id'],
-                        'col' => $col['table'] . '.' . $col['text'],
+                        'col' => $col['table'].'.'.$col['text'],
                         'org_text' => $r['text'],
                         'sys_trans' => $st,
                         'en_text' => $en,

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