Completed
Push — master ( 659648...ab6422 )
by
unknown
16s
created
htdocs/api/user_inactivity.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/ping.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/register.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 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
 $tpl->name = 'event_attendance';
11 11
 $tpl->popup = true;
Please login to merge, or discard this patch.
htdocs/cachelists.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 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
 $tpl->name = 'event_attendance';
11 11
 $tpl->popup = true;
Please login to merge, or discard this patch.
htdocs/news.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 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
 $tpl->name = 'event_attendance';
11 11
 $tpl->popup = true;
Please login to merge, or discard this patch.
htdocs/remindemail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 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
 $tpl->name = 'event_attendance';
11 11
 $tpl->popup = true;
Please login to merge, or discard this patch.
htdocs/admins.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 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
 $tpl->name = 'event_attendance';
11 11
 $tpl->popup = true;
Please login to merge, or discard this patch.
htdocs/lib2/search/search.ov2.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * OVL search output for TOP25, TOP50 etc.
8 8
  ****************************************************************************/
9 9
 
10
-require_once $opt['rootpath'] . 'lib2/charset.inc.php';
10
+require_once $opt['rootpath'].'lib2/charset.inc.php';
11 11
 
12 12
 $search_output_file_download = true;
13 13
 $content_type_plain = 'application/ovl';
Please login to merge, or discard this patch.
htdocs/lib2/common.inc.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@
 block discarded – undo
277 277
     ) {
278 278
         return 'https' . strstr($url, '://');
279 279
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
280
-                  == $opt['page']['absolute_https_url']
280
+                    == $opt['page']['absolute_https_url']
281 281
               && !$opt['page']['https']['active']
282 282
     ) {
283 283
         return 'http' . strstr($url, '://');
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  *  TODO: accept-language des Browser auswerten
11 11
  ***************************************************************************/
12 12
 
13
-require_once __DIR__ . '/../vendor/autoload.php';
13
+require_once __DIR__.'/../vendor/autoload.php';
14 14
 
15 15
 function __autoload($class_name)
16 16
 {
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
         return;
21 21
     }
22 22
 
23
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
24
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
23
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
24
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
25 25
     if (file_exists($file1)) {
26 26
         require_once $file1;
27 27
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 mb_regex_encoding('UTF-8');
44 44
 
45 45
 // set options
46
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
47
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
48
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
46
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
47
+require_once $opt['rootpath'].'config2/settings.inc.php';
48
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
49 49
 
50 50
 foreach ($opt['page']['banned_user_agents'] as $ua) {
51 51
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
     }
70 70
 }
71 71
 
72
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
72
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
73 73
 configure_php();
74 74
 
75
-require $opt['rootpath'] . 'lib2/cookie.class.php';
75
+require $opt['rootpath'].'lib2/cookie.class.php';
76 76
 normalize_settings();
77 77
 set_language();
78 78
 set_usercountry();
@@ -85,30 +85,30 @@  discard block
 block discarded – undo
85 85
         $opt['template']['style'] = $opt['template']['default']['style'];
86 86
     }
87 87
 
88
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
88
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
89 89
         $opt['template']['style'] = $opt['template']['default']['style'];
90 90
     }
91 91
 } else {
92 92
     $opt['template']['style'] = $opt['template']['default']['style'];
93 93
 }
94
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
94
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
95 95
 
96 96
 check_useragent();
97 97
 
98 98
 /* setup smarty
99 99
  *
100 100
  */
101
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
101
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
102 102
 $tpl = new OcSmarty();
103 103
 
104 104
 // include all we need
105
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
106
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
107
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
108
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
109
-require_once $opt['rootpath'] . 'lib2/login.class.php';
110
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
111
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
105
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
106
+require_once $opt['rootpath'].'lib2/error.inc.php';
107
+require_once $opt['rootpath'].'lib2/util.inc.php';
108
+require_once $opt['rootpath'].'lib2/db.inc.php';
109
+require_once $opt['rootpath'].'lib2/login.class.php';
110
+require_once $opt['rootpath'].'lib2/menu.class.php';
111
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
112 112
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
113 113
 
114 114
 // apply post configuration
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     $login->userid > 0 &&
124 124
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
125 125
 ) {
126
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
126
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
127 127
     exit;
128 128
 }
129 129
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
151 151
         $opt['logic']['cachemaps']['wmsurl'] =
152
-            $opt['page']['protocol'] . strstr($opt['logic']['cachemaps']['wmsurl'], '://');
152
+            $opt['page']['protocol'].strstr($opt['logic']['cachemaps']['wmsurl'], '://');
153 153
     }
154 154
 }
155 155
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
235 235
     }
236 236
 
237
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
237
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
238 238
     set_php_locale();
239 239
     textdomain('messages');
240 240
 }
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
276 276
         && $opt['page']['https']['active']
277 277
     ) {
278
-        return 'https' . strstr($url, '://');
278
+        return 'https'.strstr($url, '://');
279 279
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
280 280
                   == $opt['page']['absolute_https_url']
281 281
               && !$opt['page']['https']['active']
282 282
     ) {
283
-        return 'http' . strstr($url, '://');
283
+        return 'http'.strstr($url, '://');
284 284
     } else {
285 285
         return $url;
286 286
     }
Please login to merge, or discard this patch.