Completed
Pull Request — master (#300)
by
unknown
07:10
created
htdocs/404.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  *  Unicode Reminder メモ
6 6
  ***************************************************************************/
7 7
 
8
-require __DIR__ . '/lib2/web.inc.php';
8
+require __DIR__.'/lib2/web.inc.php';
9 9
 
10 10
 $sUserCountry = $login->getUserCountry();
11 11
 
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 if ($isRedirect404) {
28 28
     // check length
29 29
     $uril = 70;
30
-    $uri = 'http://' . strtolower($_SERVER['SERVER_NAME']) . $_SERVER['REQUEST_URI'];
30
+    $uri = 'http://'.strtolower($_SERVER['SERVER_NAME']).$_SERVER['REQUEST_URI'];
31 31
     // limit to $uril
32 32
     if (strlen($uri) > $uril) {
33
-        $uri = substr($uri, 0, $uril - 3) . '...';
33
+        $uri = substr($uri, 0, $uril - 3).'...';
34 34
     }
35 35
 
36 36
     // assign uri
Please login to merge, or discard this patch.
htdocs/api/email_problems.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@  discard block
 block discarded – undo
5 5
  *  Unicode Reminder メモ
6 6
  ***************************************************************************/
7 7
 
8
-$opt['rootpath'] = __DIR__ . '/../';
9
-require $opt['rootpath'] . 'lib2/web.inc.php';
8
+$opt['rootpath'] = __DIR__.'/../';
9
+require $opt['rootpath'].'lib2/web.inc.php';
10 10
 
11 11
 header('Content-type: text/plain; charset=utf-8');
12 12
 
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 ) {
17 17
     $rs = sql('SELECT `user_id`, `email_problems` FROM `user` WHERE `email_problems`');
18 18
     while ($r = sql_fetch_assoc($rs)) {
19
-        echo $r['user_id'] . ' ' . $r['email_problems'] . "\n";
19
+        echo $r['user_id'].' '.$r['email_problems']."\n";
20 20
     }
21 21
     sql_free_result($rs);
22 22
 }
Please login to merge, or discard this patch.
htdocs/api/hidden_caches.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@  discard block
 block discarded – undo
9 9
  *  replicated system than the XML interface.
10 10
  ***************************************************************************/
11 11
 
12
-$opt['rootpath'] = __DIR__ . '/../';
13
-require $opt['rootpath'] . 'lib2/web.inc.php';
12
+$opt['rootpath'] = __DIR__.'/../';
13
+require $opt['rootpath'].'lib2/web.inc.php';
14 14
 
15 15
 header('Content-type: text/plain; charset=utf-8');
16 16
 
@@ -24,5 +24,5 @@  discard block
 block discarded – undo
24 24
 );
25 25
 $wp_ocs = sql_fetch_column($rs);
26 26
 foreach ($wp_ocs as $wp_oc) {
27
-    echo $wp_oc . "\n";
27
+    echo $wp_oc."\n";
28 28
 }
Please login to merge, or discard this patch.
htdocs/api/gc2oc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
  *
14 14
  ***************************************************************************/
15 15
 
16
-$opt['rootpath'] = __DIR__ . '/../';
17
-require $opt['rootpath'] . 'lib2/web.inc.php';
16
+$opt['rootpath'] = __DIR__.'/../';
17
+require $opt['rootpath'].'lib2/web.inc.php';
18 18
 
19 19
 if (isset($_REQUEST['report']) && $_REQUEST['report']) {
20 20
     header('Content-type: text/plain');
Please login to merge, or discard this patch.
htdocs/api/coord.ch/newest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
 
8 8
 header('Content-type: text/html; charset=utf-8');
9 9
 
10
-$opt['rootpath'] = __DIR__ . '/../../';
11
-require $opt['rootpath'] . 'lib2/web.inc.php';
10
+$opt['rootpath'] = __DIR__.'/../../';
11
+require $opt['rootpath'].'lib2/web.inc.php';
12 12
 
13 13
 $bFirstRow = true;
14 14
 
@@ -52,5 +52,5 @@  discard block
 block discarded – undo
52 52
 // renamed function from "str_getcsv" to avoid collision with PHP 5.3 str_getcsv()
53 53
 function strGetCsv($str)
54 54
 {
55
-    return '"' . mb_ereg_replace('"', '\"', $str) . '"';
55
+    return '"'.mb_ereg_replace('"', '\"', $str).'"';
56 56
 }
Please login to merge, or discard this patch.
htdocs/removedesc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  *  Unicode Reminder メモ
8 8
  ***************************************************************************/
9 9
 
10
-require_once __DIR__ . '/lib/common.inc.php';
10
+require_once __DIR__.'/lib/common.inc.php';
11 11
 
12 12
 //Preprocessing
13 13
 if ($error == false) {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         tpl_set_var(
33 33
             'target',
34 34
             htmlspecialchars(
35
-                'removedesc.php?cacheid=' . urlencode($cache_id) . '&desclang=' . urlencode($desclang),
35
+                'removedesc.php?cacheid='.urlencode($cache_id).'&desclang='.urlencode($desclang),
36 36
                 ENT_COMPAT,
37 37
                 'UTF-8'
38 38
             )
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
                 if (mysql_num_rows($desc_rs) == 1) {
57 57
                     $desc_record = sql_fetch_array($desc_rs);
58 58
                     mysql_free_result($desc_rs);
59
-                    require $stylepath . '/removedesc.inc.php';
59
+                    require $stylepath.'/removedesc.inc.php';
60 60
 
61 61
                     if ($desc_record['node'] != $oc_nodeid) {
62 62
                         tpl_errorMsg('removedesc', $error_wrong_node);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
                         // do not use slave server for the next time ...
71 71
                         db_slave_exclude();
72 72
 
73
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
73
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
74 74
                         exit;
75 75
                     } else {
76 76
                         //commit the removement
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.