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

htdocs/util2/geodb/make_searchindex.php

Spacing +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../';
-require_once __DIR__ . '/../../lib2/cli.inc.php';
-require_once __DIR__ . '/../../lib2/search/search.inc.php';
+require_once __DIR__.'/../../lib2/cli.inc.php';
+require_once __DIR__.'/../../lib2/search/search.inc.php';
 
 
 sql('DELETE FROM geodb_search');
@@ -30,7 +30,7 @@ 
     foreach ($simpletextsarray as $text) {
         if ($text != '') {
             if (nonalpha($text)) {
-                die($text . "\n");
+                die($text."\n");
             }
 
             $simpletext = search_text2simple($text);
@@ -50,7 +50,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;
         }