Completed
Pull Request — master (#313)
by Thomas
18:52 queued 11:36
created
htdocs/translate.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@  discard block
 block discarded – undo
5 5
  *  Unicode Reminder メモ
6 6
  ***************************************************************************/
7 7
 
8
-require __DIR__ . '/lib2/web.inc.php';
9
-require_once __DIR__ . '/lib2/translate.class.php';
10
-require_once __DIR__ . '/lib2/translationHandler.class.php';
8
+require __DIR__.'/lib2/web.inc.php';
9
+require_once __DIR__.'/lib2/translate.class.php';
10
+require_once __DIR__.'/lib2/translationHandler.class.php';
11 11
 
12 12
 /* config section
13 13
  */
@@ -249,11 +249,11 @@  discard block
 block discarded – undo
249 249
 {
250 250
     global $opt;
251 251
 
252
-    if (!file_exists($opt['rootpath'] . '../sql/static-data/data.sql')) {
252
+    if (!file_exists($opt['rootpath'].'../sql/static-data/data.sql')) {
253 253
         return '';
254 254
     }
255 255
 
256
-    $content = file_get_contents($opt['rootpath'] . '../sql/static-data/data.sql');
256
+    $content = file_get_contents($opt['rootpath'].'../sql/static-data/data.sql');
257 257
 
258 258
     // at the end is an INSERT of the current checksum
259 259
     // to calculate this checksum, we have to trim the end before that statement and the linefeed before
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
     sql("DELETE FROM `sys_trans_text` WHERE `trans_id`='&1'", $id);
283 283
     sql("DELETE FROM `sys_trans_ref` WHERE `trans_id`='&1'", $id);
284 284
 
285
-    $tpl->redirect('translate.php?translang=' . $translang);
285
+    $tpl->redirect('translate.php?translang='.$translang);
286 286
 }
287 287
 
288 288
 function edit()
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
             );
312 312
         }
313 313
         sql_free_result($rs);
314
-        $tpl->redirect('translate.php?translang=' . $translang . '&action=edit&id=' . $id);
314
+        $tpl->redirect('translate.php?translang='.$translang.'&action=edit&id='.$id);
315 315
     } else {
316 316
         if (isset($_REQUEST['submit'])) {
317 317
             $transText = isset($_REQUEST['transText']) ? $_REQUEST['transText'] : '';
@@ -347,14 +347,14 @@  discard block
 block discarded – undo
347 347
 
348 348
     // built sql string to search for texts with little difference (levensthein() would be better, but not available in MYSQL)
349 349
     $sWhereSql =
350
-        "SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans`.`text`)
351
-         OR SOUNDEX('" . sql_escape($r['text']) . "')=SOUNDEX(`sys_trans_text`.`text`)";
350
+        "SOUNDEX('".sql_escape($r['text'])."')=SOUNDEX(`sys_trans`.`text`)
351
+         OR SOUNDEX('" . sql_escape($r['text'])."')=SOUNDEX(`sys_trans_text`.`text`)";
352 352
 
353 353
     $trans = sql(
354 354
         "SELECT DISTINCT `sys_trans`.`id`, `sys_trans`.`text`
355 355
          FROM `sys_trans`
356 356
          INNER JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id`
357
-         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql . ")",
357
+         WHERE `sys_trans`.`id`!='&1' AND (" . $sWhereSql.")",
358 358
         $id
359 359
     );
360 360
     $tpl->assign_rs('trans', $trans);
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 
388 388
     $translationHandler->createMessageFiles();
389 389
 
390
-    $tpl->redirect('translate.php?translang=' . $translang);
390
+    $tpl->redirect('translate.php?translang='.$translang);
391 391
 }
392 392
 
393 393
 function unlinkFiles($relbasedir, $ext)
@@ -398,12 +398,12 @@  discard block
 block discarded – undo
398 398
         $relbasedir .= '/';
399 399
     }
400 400
 
401
-    if ($opt['rootpath'] . $relbasedir) {
402
-        if ($dh = opendir($opt['rootpath'] . $relbasedir)) {
401
+    if ($opt['rootpath'].$relbasedir) {
402
+        if ($dh = opendir($opt['rootpath'].$relbasedir)) {
403 403
             while (($file = readdir($dh)) !== false) {
404
-                if ($file != '.' && $file != '..' && is_file($opt['rootpath'] . $relbasedir . $file)) {
405
-                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.' . $ext) {
406
-                        unlink($opt['rootpath'] . $relbasedir . $file);
404
+                if ($file != '.' && $file != '..' && is_file($opt['rootpath'].$relbasedir.$file)) {
405
+                    if (substr($file, - (strlen($ext) + 1), strlen($ext) + 1) == '.'.$ext) {
406
+                        unlink($opt['rootpath'].$relbasedir.$file);
407 407
                     }
408 408
                 }
409 409
             }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
     $lastId = sql_value("SELECT MAX(`id`) FROM `sys_trans`", 0);
479 479
     sql("ALTER TABLE `sys_trans` AUTO_INCREMENT = &1", $lastId + 1);
480 480
 
481
-    $tpl->redirect('translate.php?translang=' . $translang);
481
+    $tpl->redirect('translate.php?translang='.$translang);
482 482
 }
483 483
 
484 484
 function useId($freeId)
@@ -500,9 +500,9 @@  discard block
 block discarded – undo
500 500
 
501 501
     foreach ($transIdCols as $col) {
502 502
         sql(
503
-            "UPDATE `" . $col['table'] . "`
504
-             SET `" . $col['trans_id'] . "`='&1'
505
-             WHERE `" . $col['trans_id'] . "`='&2'",
503
+            "UPDATE `".$col['table']."`
504
+             SET `" . $col['trans_id']."`='&1'
505
+             WHERE `" . $col['trans_id']."`='&2'",
506 506
             $newId,
507 507
             $oldId
508 508
         );
@@ -513,9 +513,9 @@  discard block
 block discarded – undo
513 513
 {
514 514
     global $opt, $tpl, $translang;
515 515
 
516
-    $structure = enumSqlFiles($opt['rootpath'] . '../sql/tables');
516
+    $structure = enumSqlFiles($opt['rootpath'].'../sql/tables');
517 517
     foreach ($structure AS $sTable) {
518
-        sql_export_structure_to_file($opt['rootpath'] . '../sql/tables/' . $sTable . '.sql', $sTable);
518
+        sql_export_structure_to_file($opt['rootpath'].'../sql/tables/'.$sTable.'.sql', $sTable);
519 519
     }
520 520
 
521 521
     // static data tables
@@ -551,21 +551,21 @@  discard block
 block discarded – undo
551 551
     $stab[] = 'towns';
552 552
     $stab[] = 'watches_waitingtypes';
553 553
 
554
-    sql_export_tables_to_file($opt['rootpath'] . '../sql/static-data/data.sql', $stab);
554
+    sql_export_tables_to_file($opt['rootpath'].'../sql/static-data/data.sql', $stab);
555 555
 
556 556
     $checksum = calcDataSqlChecksum(false);
557
-    $f = fopen($opt['rootpath'] . '../sql/static-data/data.sql', 'a');
557
+    $f = fopen($opt['rootpath'].'../sql/static-data/data.sql', 'a');
558 558
     fwrite(
559 559
         $f,
560 560
         "INSERT INTO `sysconfig` (`name`, `value`)"
561
-        . " VALUES ('datasql_checksum', '" . sql_escape($checksum) . "')"
562
-        . " ON DUPLICATE KEY UPDATE `value`='" . sql_escape($checksum) . "';\n"
561
+        . " VALUES ('datasql_checksum', '".sql_escape($checksum)."')"
562
+        . " ON DUPLICATE KEY UPDATE `value`='".sql_escape($checksum)."';\n"
563 563
     );
564 564
     fclose($f);
565 565
 
566 566
     setSysConfig('datasql_checksum', $checksum);
567 567
 
568
-    $tpl->redirect('translate.php?translang=' . $translang);
568
+    $tpl->redirect('translate.php?translang='.$translang);
569 569
 }
570 570
 
571 571
 function enumSqlFiles($dir)
@@ -594,9 +594,9 @@  discard block
 block discarded – undo
594 594
         $hDir = opendir($dir);
595 595
         if ($hDir !== false) {
596 596
             while (($file = readdir($hDir)) !== false) {
597
-                if (is_file($dir . '/' . $file)) {
597
+                if (is_file($dir.'/'.$file)) {
598 598
                     if ((substr($file, - 4) == '.tpl') || (substr($file, - 4) == '.php')) {
599
-                        $files[] = $dir . '/' . $file;
599
+                        $files[] = $dir.'/'.$file;
600 600
                     }
601 601
                 }
602 602
             }
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
         $writer->writeAttribute('id', $r['id']);
691 691
 
692 692
         $writer->writeElement('code', $r['text']);
693
-        for ($n = 0; $n < count($lang); $n ++) {
693
+        for ($n = 0; $n < count($lang); $n++) {
694 694
             $writer->writeElement(
695 695
                 $lang[$n],
696 696
                 sql_value(
@@ -712,9 +712,9 @@  discard block
 block discarded – undo
712 712
         while ($rUsage = sql_fetch_assoc($rsUsage)) {
713 713
             $line = '';
714 714
             if ($rUsage['line'] != 0) {
715
-                $line = ' (' . $rUsage['line'] . ')';
715
+                $line = ' ('.$rUsage['line'].')';
716 716
             }
717
-            $writer->writeElement('usage', $rUsage['resource_name'] . $line);
717
+            $writer->writeElement('usage', $rUsage['resource_name'].$line);
718 718
         }
719 719
         sql_free_result($rsUsage);
720 720
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 
739 739
     $scanlang = [];
740 740
     foreach ($opt['locale'] AS $k => $v) {
741
-        if (isset($_REQUEST['lang' . $k]) && ($_REQUEST['lang' . $k] == '1')) {
741
+        if (isset($_REQUEST['lang'.$k]) && ($_REQUEST['lang'.$k] == '1')) {
742 742
             $scanlang[] = $k;
743 743
         }
744 744
     }
@@ -818,15 +818,15 @@  discard block
 block discarded – undo
818 818
 
819 819
     $nCount = isset($_REQUEST['count']) ? $_REQUEST['count'] + 0 : 0;
820 820
 
821
-    for ($nIndex = 1; $nIndex <= $nCount; $nIndex ++) {
822
-        if (isset($_REQUEST['useitem' . $nIndex]) && ($_REQUEST['useitem' . $nIndex] == '1')) {
823
-            $sCode = base64_decode($_REQUEST['code' . $nIndex]);
821
+    for ($nIndex = 1; $nIndex <= $nCount; $nIndex++) {
822
+        if (isset($_REQUEST['useitem'.$nIndex]) && ($_REQUEST['useitem'.$nIndex] == '1')) {
823
+            $sCode = base64_decode($_REQUEST['code'.$nIndex]);
824 824
             $transId = sql_value("SELECT `id` FROM `sys_trans` WHERE `text`='&1'", 0, $sCode);
825 825
 
826 826
             if ($transId != 0) {
827 827
                 foreach ($opt['locale'] AS $k => $v) {
828
-                    if (isset($_REQUEST[$k . $nIndex . 'new'])) {
829
-                        $sText = base64_decode($_REQUEST[$k . $nIndex . 'new']);
828
+                    if (isset($_REQUEST[$k.$nIndex.'new'])) {
829
+                        $sText = base64_decode($_REQUEST[$k.$nIndex.'new']);
830 830
 
831 831
                         sql(
832 832
                             "INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`)
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
         }
843 843
     }
844 844
 
845
-    $tpl->redirect('translate.php?translang=' . $translang);
845
+    $tpl->redirect('translate.php?translang='.$translang);
846 846
 }
847 847
 
848 848
 function textexport($translang, $all)
@@ -872,9 +872,9 @@  discard block
 block discarded – undo
872 872
             $translang
873 873
         );
874 874
         if (($all) || (mb_strlen($translated) == 0)) {
875
-            $thisline = $r['id'] . "\r\n";
876
-            $thisline .= $r['text'] . "\r\n";
877
-            $thisline .= $translated . "\r\n";
875
+            $thisline = $r['id']."\r\n";
876
+            $thisline .= $r['text']."\r\n";
877
+            $thisline .= $translated."\r\n";
878 878
             $thisline .= "\r\n";
879 879
             echo($thisline);
880 880
         }
@@ -1010,8 +1010,8 @@  discard block
 block discarded – undo
1010 1010
     }
1011 1011
 
1012 1012
     while (($file = readdir($hDir)) !== false) {
1013
-        if ($file != '.' && $file != '..' && is_dir($basedir . $file)) {
1014
-            addClassesDirectoriesToDirlist($basedir . $file);
1013
+        if ($file != '.' && $file != '..' && is_dir($basedir.$file)) {
1014
+            addClassesDirectoriesToDirlist($basedir.$file);
1015 1015
         }
1016 1016
     }
1017 1017
     closedir($hDir);
@@ -1026,9 +1026,9 @@  discard block
 block discarded – undo
1026 1026
         if (!isset($col['verify']) || $col['verify']) {
1027 1027
             $rs = sql(
1028 1028
                 "SELECT
1029
-                    `" . $col['text'] . "` `text`,
1030
-                    `" . $col['trans_id'] . "` `trans_id`
1031
-                 FROM `" . $col['table'] . "`"
1029
+                    `" . $col['text']."` `text`,
1030
+                    `" . $col['trans_id']."` `trans_id`
1031
+                 FROM `" . $col['table']."`"
1032 1032
             );
1033 1033
             while ($r = sql_fetch_assoc($rs)) {
1034 1034
                 $st = sql_value(
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
1048 1048
                 if ($en != $r['text'] || $st != $r['text']) {
1049 1049
                     $inconsistencies[] = [
1050 1050
                         'id' => $r['trans_id'],
1051
-                        'col' => $col['table'] . '.' . $col['text'],
1051
+                        'col' => $col['table'].'.'.$col['text'],
1052 1052
                         'org_text' => $r['text'],
1053 1053
                         'sys_trans' => $st,
1054 1054
                         'en_text' => $en,
Please login to merge, or discard this patch.
htdocs/util2/stats/rank.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 header('Content-type: text/html; charset=utf-8');
9 9
 
10 10
 $opt['rootpath'] = '../../';
11
-require $opt['rootpath'] . 'lib2/web.inc.php';
11
+require $opt['rootpath'].'lib2/web.inc.php';
12 12
 
13 13
 $n = 1;
14 14
 $rs = sql('SELECT `user`.`username`, `stat_user`.`found`
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
            ORDER BY `stat_user`.`found` DESC
19 19
               LIMIT 100');
20 20
 while ($r = sql_fetch_assoc($rs)) {
21
-    echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
22
-    $n ++;
21
+    echo $n.' '.$r['username'].': '.$r['found']."\n";
22
+    $n++;
23 23
 }
24 24
 sql_free_result($rs);
Please login to merge, or discard this patch.
htdocs/util2/stats/owner.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 header('Content-type: text/html; charset=utf-8');
9 9
 
10 10
 $opt['rootpath'] = '../../';
11
-require $opt['rootpath'] . 'lib2/web.inc.php';
11
+require $opt['rootpath'].'lib2/web.inc.php';
12 12
 
13 13
 echo "<h2>Top-Owner</h2>\n";
14 14
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         FROM `caches`
29 29
         LEFT JOIN `user` ON `user`.`user_id`=`caches`.`user_id`
30 30
         LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
31
-        WHERE status=1 AND " . $condition . "
31
+        WHERE status=1 AND " . $condition."
32 32
         GROUP BY `caches`.`user_id`
33 33
         HAVING COUNT(*) >= $limit
34 34
         ORDER BY COUNT(*) DESC"
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
     $n = 1;
38 38
     while ($r = sql_fetch_assoc($rs)) {
39
-        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";
39
+        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";
40 40
     }
41 41
     sql_free_result($rs);
42 42
 
Please login to merge, or discard this patch.
htdocs/util2/license/process-old-disabled-users.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  ***************************************************************************/
13 13
 
14 14
 $opt['rootpath'] = '../../';
15
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
16
-require_once $opt['rootpath'] . 'lib2/logic/user.class.php';
15
+require_once $opt['rootpath'].'lib2/cli.inc.php';
16
+require_once $opt['rootpath'].'lib2/logic/user.class.php';
17 17
 
18 18
 $login->admin = ADMIN_USER;
19 19
 
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 $n = 0;
26 26
 while ($r = sql_fetch_assoc($rs)) {
27
-    echo "purging content of user '" . $r['username'] . "'\n";
27
+    echo "purging content of user '".$r['username']."'\n";
28 28
 
29 29
     $user = new user($r['user_id']);
30 30
     $result = $user->disduelicense(true);
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         die($result);
33 33
     }
34 34
 
35
-    ++ $n;
35
+    ++$n;
36 36
 }
37 37
 sql_free_result($rs);
38 38
 
Please login to merge, or discard this patch.
htdocs/util2/gns/gns_import.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     $file = fopen($filename, "r");
45 45
     $cnt = 0;
46 46
     while ($line = fgets($file, 4096)) {
47
-        if ($cnt ++ == 0) {// skip first line
47
+        if ($cnt++ == 0) {// skip first line
48 48
             continue;
49 49
         }
50 50
 
@@ -52,31 +52,31 @@  discard block
 block discarded – undo
52 52
 
53 53
         sql(
54 54
             "INSERT IGNORE INTO gns_locations SET
55
-                    rc = '" . sql_escape($gns[0]) . "',
56
-                    ufi = '" . sql_escape($gns[1]) . "',
57
-                    uni = '" . sql_escape($gns[2]) . "',
58
-                    lat = '" . sql_escape($gns[3]) . "',
59
-                    lon = '" . sql_escape($gns[4]) . "',
60
-                    dms_lat = '" . sql_escape($gns[5]) . "',
61
-                    dms_lon = '" . sql_escape($gns[6]) . "',
62
-                    utm = '" . sql_escape($gns[7]) . "',
63
-                    jog = '" . sql_escape($gns[8]) . "',
64
-                    fc = '" . sql_escape($gns[9]) . "',
65
-                    dsg = '" . sql_escape($gns[10]) . "',
66
-                    pc = '" . sql_escape($gns[11]) . "',
67
-                    cc1 = '" . sql_escape($gns[12]) . "',
68
-                    adm1 = '" . sql_escape($gns[13]) . "',
69
-                    adm2 = _utf8'" . sql_escape($gns[14]) . "',
70
-                    dim = '" . sql_escape($gns[15]) . "',
71
-                    cc2 = '" . sql_escape($gns[16]) . "',
72
-                    nt = '" . sql_escape($gns[17]) . "',
73
-                    lc = '" . sql_escape($gns[18]) . "',
74
-                    SHORT_FORM = _utf8'" . sql_escape($gns[19]) . "',
75
-                    GENERIC = _utf8'" . sql_escape($gns[20]) . "',
76
-                    SORT_NAME = _utf8'" . sql_escape($gns[21]) . "',
77
-                    FULL_NAME = _utf8'" . sql_escape($gns[22]) . "',
78
-                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23]) . "',
79
-                    MOD_DATE = '" . sql_escape($gns[24]) . "'"
55
+                    rc = '" . sql_escape($gns[0])."',
56
+                    ufi = '" . sql_escape($gns[1])."',
57
+                    uni = '" . sql_escape($gns[2])."',
58
+                    lat = '" . sql_escape($gns[3])."',
59
+                    lon = '" . sql_escape($gns[4])."',
60
+                    dms_lat = '" . sql_escape($gns[5])."',
61
+                    dms_lon = '" . sql_escape($gns[6])."',
62
+                    utm = '" . sql_escape($gns[7])."',
63
+                    jog = '" . sql_escape($gns[8])."',
64
+                    fc = '" . sql_escape($gns[9])."',
65
+                    dsg = '" . sql_escape($gns[10])."',
66
+                    pc = '" . sql_escape($gns[11])."',
67
+                    cc1 = '" . sql_escape($gns[12])."',
68
+                    adm1 = '" . sql_escape($gns[13])."',
69
+                    adm2 = _utf8'" . sql_escape($gns[14])."',
70
+                    dim = '" . sql_escape($gns[15])."',
71
+                    cc2 = '" . sql_escape($gns[16])."',
72
+                    nt = '" . sql_escape($gns[17])."',
73
+                    lc = '" . sql_escape($gns[18])."',
74
+                    SHORT_FORM = _utf8'" . sql_escape($gns[19])."',
75
+                    GENERIC = _utf8'" . sql_escape($gns[20])."',
76
+                    SORT_NAME = _utf8'" . sql_escape($gns[21])."',
77
+                    FULL_NAME = _utf8'" . sql_escape($gns[22])."',
78
+                    FULL_NAME_ND = _utf8'" . sql_escape($gns[23])."',
79
+                    MOD_DATE = '" . sql_escape($gns[24])."'"
80 80
         );
81 81
     }
82 82
     fclose($file);
Please login to merge, or discard this patch.
htdocs/util2/gns/mksearchindex.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
  ***************************************************************************/
11 11
 
12 12
 $opt['rootpath'] = '../../';
13
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
14
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
13
+require_once $opt['rootpath'].'lib2/cli.inc.php';
14
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
15 15
 
16 16
 
17 17
 $doubleindex['sankt'] = 'st';
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     foreach ($simpletextsarray as $text) {
28 28
         if ($text != '') {
29 29
             if (nonalpha($text)) {
30
-                die($r['uni'] . ' ' . $text . "\n");// obsolete for the same reason as above
30
+                die($r['uni'].' '.$text."\n"); // obsolete for the same reason as above
31 31
             }
32 32
 
33 33
             $simpletext = search_text2simple($text);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 function nonalpha($str)
61 61
 {
62
-    for ($i = 0; $i < mb_strlen($str); $i ++) {
62
+    for ($i = 0; $i < mb_strlen($str); $i++) {
63 63
         if (!((ord(mb_substr($str, $i, 1)) >= ord('a')) && (ord(mb_substr($str, $i, 1)) <= ord('z')))) {
64 64
             return true;
65 65
         }
Please login to merge, or discard this patch.
htdocs/util2/gns/mkadmtxt.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
  ***************************************************************************/
11 11
 
12 12
 $opt['rootpath'] = '../../';
13
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
14
-require_once $opt['rootpath'] . 'lib2/search/search.inc.php';
13
+require_once $opt['rootpath'].'lib2/cli.inc.php';
14
+require_once $opt['rootpath'].'lib2/search/search.inc.php';
15 15
 
16 16
 
17 17
 $rsLocations = sql("SELECT `uni`, `lat`, `lon`, `rc`, `cc1`, `adm1` FROM `gns_locations` WHERE `dsg` LIKE 'PPL%'");
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     $maxlon = geomath::getMaxLon($rLocations['lon'], $rLocations['lat'], 10, 1);
23 23
 
24 24
     // den nächsgelegenen Ort in den geodb ermitteln
25
-    $sql = 'SELECT ' . geomath::getSqlDistanceFormula(
25
+    $sql = 'SELECT '.geomath::getSqlDistanceFormula(
26 26
             $rLocations['lon'],
27 27
             $rLocations['lat'],
28 28
             10,
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
30 30
             'lon',
31 31
             'lat',
32 32
             'geodb_coordinates'
33
-        ) . ' `distance`,
33
+        ).' `distance`,
34 34
                             `geodb_coordinates`.`loc_id` `loc_id`
35 35
                       FROM `geodb_coordinates`
36
-                      WHERE `lon` > ' . $minlon . ' AND
37
-                            `lon` < ' . $maxlon . ' AND
38
-                            `lat` > ' . $minlat . ' AND
39
-                            `lat` < ' . $maxlat . '
36
+                      WHERE `lon` > ' . $minlon.' AND
37
+                            `lon` < ' . $maxlon.' AND
38
+                            `lat` > ' . $minlat.' AND
39
+                            `lat` < ' . $maxlat.'
40 40
                       HAVING `distance` < 10
41 41
                       ORDER BY `distance` ASC
42 42
                       LIMIT 1';
Please login to merge, or discard this patch.
htdocs/util2/geodb/make_searchindex.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
  ***************************************************************************/
11 11
 
12 12
 $opt['rootpath'] = '../../';
13
-require_once __DIR__ . '/../../lib2/cli.inc.php';
14
-require_once __DIR__ . '/../../lib2/search/search.inc.php';
13
+require_once __DIR__.'/../../lib2/cli.inc.php';
14
+require_once __DIR__.'/../../lib2/search/search.inc.php';
15 15
 
16 16
 
17 17
 sql('DELETE FROM geodb_search');
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     foreach ($simpletextsarray as $text) {
31 31
         if ($text != '') {
32 32
             if (nonalpha($text)) {
33
-                die($text . "\n");
33
+                die($text."\n");
34 34
             }
35 35
 
36 36
             $simpletext = search_text2simple($text);
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 function nonalpha($str)
52 52
 {
53
-    for ($i = 0; $i < mb_strlen($str); $i ++) {
53
+    for ($i = 0; $i < mb_strlen($str); $i++) {
54 54
         if (!((ord(mb_substr($str, $i, 1)) >= ord('a')) && (ord(mb_substr($str, $i, 1)) <= ord('z')))) {
55 55
             return true;
56 56
         }
Please login to merge, or discard this patch.
htdocs/util2/google-earth/caches.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
 header('Content-type: text/html; charset=utf-8');
11 11
 
12 12
 $opt['rootpath'] = '../../';
13
-require $opt['rootpath'] . 'lib2/web.inc.php';
14
-require $opt['rootpath'] . 'templates2/ocstyle/search.tpl.inc.php';
13
+require $opt['rootpath'].'lib2/web.inc.php';
14
+require $opt['rootpath'].'templates2/ocstyle/search.tpl.inc.php';
15 15
 
16 16
 $bbox = isset($_REQUEST['BBOX']) ? $_REQUEST['BBOX'] : '0,0,0,0';
17 17
 $abox = mb_split(',', $bbox);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 $kmlLine =
47 47
     '
48 48
 <Placemark>
49
-  <description><![CDATA[' . $t_by . ' {username}<br><br><a href="{urlbase}viewcache.php?cacheid={cacheid}">' . $t_showdesc . '</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>' . $t_type . ' {type}<br>' . $t_size . ' {size}</td></tr><tr><td colspan="2">' . $t_difficulty . '<br>' . $t_terrain . '</td></tr></table>]]></description>
49
+  <description><![CDATA[' . $t_by.' {username}<br><br><a href="{urlbase}viewcache.php?cacheid={cacheid}">'.$t_showdesc.'</a><br>&nbsp;<br><table cellspacing="0" cellpadding="0" border="0"><tr><td>{typeimgurl} </td><td>'.$t_type.' {type}<br>'.$t_size.' {size}</td></tr><tr><td colspan="2">'.$t_difficulty.'<br>'.$t_terrain.'</td></tr></table>]]></description>
50 50
   <name>{name}</name>
51 51
   <LookAt>
52 52
     <longitude>{lon}</longitude>
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
         $nCount = $nCount + 1;
237 237
         $thisline = $kmlLine;
238 238
 
239
-        $typeimgurl = '<img src="' . $opt['page']['default_absolute_url'] . 'resource2/' . $opt['template']['style'] . '/images/cacheicon/' . $r['icon_large'] . '" alt="' . $r['typedesc'] . '" title="' . $r['typedesc'] . '" />';
239
+        $typeimgurl = '<img src="'.$opt['page']['default_absolute_url'].'resource2/'.$opt['template']['style'].'/images/cacheicon/'.$r['icon_large'].'" alt="'.$r['typedesc'].'" title="'.$r['typedesc'].'" />';
240 240
 
241 241
         $thisline = mb_ereg_replace('{icon}', $r['kml_name'], $thisline);
242 242
         $thisline = mb_ereg_replace('{typeimgurl}', $typeimgurl, $thisline);
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
313 313
     // prepare lines
314 314
     $sZoomIn = str_replace("\r", "", $sZoomIn);
315 315
     $sLines = mb_split("\n", $sZoomIn);
316
-    for ($i = 0; $i < count($sLines); $i ++) {
316
+    for ($i = 0; $i < count($sLines); $i++) {
317 317
         $sLines[$i] = str_pad($sLines[$i], ($nColumnsCount - 1), ' ');
318 318
     }
319 319
 
320 320
     $nDegreePerLine = ($lat_to - $lat_from) / count($sLines);
321 321
     $nDegreePerColumn = ($lon_to - $lon_from) / $nColumnsCount;
322 322
 
323
-    for ($nLine = 0; $nLine < count($sLines); $nLine ++) {
324
-        for ($nColumn = 0; $nColumn < $nColumnsCount; $nColumn ++) {
323
+    for ($nLine = 0; $nLine < count($sLines); $nLine++) {
324
+        for ($nColumn = 0; $nColumn < $nColumnsCount; $nColumn++) {
325 325
             if (substr($sLines[$nLine], $nColumn, 1) == '#') {
326 326
                 $nLat = $lat_to - $nDegreePerLine * $nLine;
327 327
                 $nLon = $lon_from + $nDegreePerColumn * $nColumn;
@@ -331,14 +331,14 @@  discard block
 block discarded – undo
331 331
                     <description><![CDATA[You have to zoom in to see the Geocaches]]></description>
332 332
                     <name></name>
333 333
                     <LookAt>
334
-                        <longitude>' . $nLon . '</longitude>
335
-                        <latitude>' . $nLat . '</latitude>
334
+                        <longitude>' . $nLon.'</longitude>
335
+                        <latitude>' . $nLat.'</latitude>
336 336
                         <range>5000</range>
337 337
                         <tilt>0</tilt>
338 338
                         <heading>3</heading>
339 339
                     </LookAt>
340 340
                     <Point>
341
-                        <coordinates>' . $nLon . ',' . $nLat . ',0</coordinates>
341
+                        <coordinates>' . $nLon.','.$nLat.',0</coordinates>
342 342
                     </Point>
343 343
                 </Placemark>
344 344
                 ';
Please login to merge, or discard this patch.