Completed
Push — master ( 598c1e...182b8c )
by Thomas
15:55 queued 08:34
created
htdocs/util/watchlist/settings-dist.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@
 block discarded – undo
5 5
     $maildomain = 'opencaching.de';
6 6
 }
7 7
 
8
-$mailfrom = 'noreply@' . $maildomain;
8
+$mailfrom = 'noreply@'.$maildomain;
9 9
 
10 10
 $debug = false;
11 11
 $debug_mailto = '[email protected]';
12 12
 
13
-$watchpid = $rootpath . 'cache/watch.pid';
13
+$watchpid = $rootpath.'cache/watch.pid';
Please login to merge, or discard this patch.
htdocs/util/change_owner/cache.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,9 +10,9 @@  discard block
 block discarded – undo
10 10
 
11 11
 header('Content-type: text/html; charset=utf-8');
12 12
 
13
-$rootpath = __DIR__ . '/../../';
14
-require_once $rootpath . 'lib/common.inc.php';
15
-require_once $rootpath . 'lib/eventhandler.inc.php';
13
+$rootpath = __DIR__.'/../../';
14
+require_once $rootpath.'lib/common.inc.php';
15
+require_once $rootpath.'lib/eventhandler.inc.php';
16 16
 
17 17
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
18 18
 
@@ -54,15 +54,15 @@  discard block
 block discarded – undo
54 54
     echo 'Besitzer geändert';
55 55
 
56 56
     // logentry($module, $eventid, $userid, $objectid1, $objectid2, $logtext, $details)
57
-    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed ' . $cacheid, '');
57
+    logentry('approving', 4, 0, $cacheid, 0, 'Owner changed '.$cacheid, '');
58 58
 
59 59
     exit;
60 60
 } elseif ($action == 'showcache') {
61 61
     $wp = isset($_REQUEST['waypoint']) ? $_REQUEST['waypoint'] : 0;
62 62
     $newusername = isset($_REQUEST['newusername']) ? $_REQUEST['newusername'] : 0;
63 63
 
64
-    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='" . sql_escape($wp) . "'", 0);
65
-    $userid = sqlValue("SELECT user_id FROM user WHERE username='" . sql_escape($newusername) . "'", '');
64
+    $cacheid = sqlValue("SELECT cache_id FROM caches WHERE wp_oc='".sql_escape($wp)."'", 0);
65
+    $userid = sqlValue("SELECT user_id FROM user WHERE username='".sql_escape($newusername)."'", '');
66 66
 
67 67
     if ($cacheid == 0) {
68 68
         die('Cache nicht gefunden!');
Please login to merge, or discard this patch.
htdocs/oconly81.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
-require __DIR__ . '/lib2/web.inc.php';
9
-require __DIR__ . '/lib2/logic/oconly81.inc.php';
8
+require __DIR__.'/lib2/web.inc.php';
9
+require __DIR__.'/lib2/logic/oconly81.inc.php';
10 10
 
11 11
 $showall = (@$_REQUEST['showall'] == 1);
12 12
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     INNER JOIN &oconly81 ON &oconly81.`user_id`=`user`.`user_id`
47 47
     GROUP BY `user`.`user_id`
48 48
     ORDER BY `count` DESC, `username` ASC " .
49
-    ($showall ? "" : "LIMIT " . sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
49
+    ($showall ? "" : "LIMIT ".sql_escape($opt['logic']['oconly81']['default_maxusers'] + 1))
50 50
 );
51 51
 
52 52
 $tpl->assign_rs('users', $rs);
Please login to merge, or discard this patch.
htdocs/index.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
 
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
 $tpl->caching = true;
19 19
 $tpl->cache_lifetime = 300;
20
-$tpl->cache_id = $sUserCountry . '|' . $opt['page']['protocol'];
20
+$tpl->cache_id = $sUserCountry.'|'.$opt['page']['protocol'];
21 21
 
22 22
 if (!$tpl->is_cached()) {
23 23
     // welcome message
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
         }
117 117
 
118 118
         // build static maps url by inserting api key
119
-        $url = $opt['page']['protocol'] . strstr($opt['logic']['minimapurl'], '://');
119
+        $url = $opt['page']['protocol'].strstr($opt['logic']['minimapurl'], '://');
120 120
         $url = mb_ereg_replace('{gmkey}', $gmkey, $url);
121 121
 
122 122
         // put into template
Please login to merge, or discard this patch.
htdocs/xml/csv/cache.php 1 patch
Spacing   +8 added lines, -8 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
-$opt['rootpath'] = __DIR__ . '/../../';
9
-require_once $opt['rootpath'] . 'lib2/web.inc.php';
10
-require_once $opt['rootpath'] . 'lib2/logic/cache.class.php';
8
+$opt['rootpath'] = __DIR__.'/../../';
9
+require_once $opt['rootpath'].'lib2/web.inc.php';
10
+require_once $opt['rootpath'].'lib2/logic/cache.class.php';
11 11
 
12 12
 header('Content-type: text/html; charset=utf-8');
13 13
 
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
     } else {
36 36
         echo $cache->getCacheId();
37 37
         echo ';';
38
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getName()) . '"';
38
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getName()).'"';
39 39
         echo ';';
40
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getUsername()) . '"';
40
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getUsername()).'"';
41 41
         echo ';';
42
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPOC()) . '"';
42
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPOC()).'"';
43 43
         echo ';';
44
-        echo '"' . mb_ereg_replace('"', '\"', $cache->getWPGC()) . '"';
44
+        echo '"'.mb_ereg_replace('"', '\"', $cache->getWPGC()).'"';
45 45
         echo ';';
46
-        echo '""';  // obsolete Navicache WP
46
+        echo '""'; // obsolete Navicache WP
47 47
     }
48 48
 }
Please login to merge, or discard this patch.
htdocs/editlog.php 2 patches
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -13,12 +13,12 @@  discard block
 block discarded – undo
13 13
  *  Unicode Reminder メモ
14 14
  *****************************************************************************/
15 15
 
16
-require_once __DIR__ . '/lib/consts.inc.php';
16
+require_once __DIR__.'/lib/consts.inc.php';
17 17
 $opt['gui'] = GUI_HTML;
18
-require_once __DIR__ . '/lib/common.inc.php';
19
-require_once __DIR__ . '/lib2/logic/logtypes.inc.php';
20
-require_once __DIR__ . '/lib/recommendation.inc.php';
21
-require_once __DIR__ . '/lib2/edithelper.inc.php';
18
+require_once __DIR__.'/lib/common.inc.php';
19
+require_once __DIR__.'/lib2/logic/logtypes.inc.php';
20
+require_once __DIR__.'/lib/recommendation.inc.php';
21
+require_once __DIR__.'/lib2/edithelper.inc.php';
22 22
 
23 23
 //Preprocessing
24 24
 if ($error == false) {
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         tpl_set_var('username', '');
35 35
         tpl_set_var('message_start', '');
36 36
         tpl_set_var('message_end', '');
37
-        tpl_set_var('target', 'editlog.php?logid=' . urlencode($log_id));
37
+        tpl_set_var('target', 'editlog.php?logid='.urlencode($log_id));
38 38
         tpl_set_var('message', $login_required);
39 39
         tpl_set_var('helplink', helppagelink('login'));
40 40
     } else {
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
         if (($log_record !== false && (($log_record['status'] != 6) || ($log_record['cache_user_id'] == $login->userid && $log_record['user_id'] == $login->userid)) &&
73 73
                 $log_record['status'] != 7) || $useradmin
74 74
         ) {
75
-            require $stylepath . '/editlog.inc.php';
76
-            require $stylepath . '/rating.inc.php';
75
+            require $stylepath.'/editlog.inc.php';
76
+            require $stylepath.'/rating.inc.php';
77 77
 
78 78
             if ($log_record['node'] != $oc_nodeid) {
79 79
                 tpl_errorMsg('editlog', $error_wrong_node);
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 
134 134
                 // check if user has exceeded his top 10% limit
135 135
                 $is_top = sqlValue(
136
-                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape(
136
+                    "SELECT COUNT(`cache_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape(
137 137
                         $usr['userid']
138
-                    ) . "' AND `cache_id`='" . sql_escape($log_record['cache_id']) . "'",
138
+                    )."' AND `cache_id`='".sql_escape($log_record['cache_id'])."'",
139 139
                     0
140 140
                 );
141 141
                 $user_founds = sqlValue(
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
                      LEFT JOIN `stat_user` ON `user`.`user_id`=`stat_user`.`user_id`
145 145
                      WHERE `user`.`user_id`='" . sql_escape(
146 146
                         $usr['userid']
147
-                    ) . "'",
147
+                    )."'",
148 148
                     0
149 149
                 );
150 150
                 $user_tops = sqlValue(
151
-                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='" . sql_escape($usr['userid']) . "'",
151
+                    "SELECT COUNT(`user_id`) FROM `cache_rating` WHERE `user_id`='".sql_escape($usr['userid'])."'",
152 152
                     0
153 153
                 );
154 154
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                     $rating_msg = mb_ereg_replace(
157 157
                         '{chk_sel}',
158 158
                         ($is_top ? 'checked' : ''),
159
-                        $rating_allowed . '<br />' . $rating_stat
159
+                        $rating_allowed.'<br />'.$rating_stat
160 160
                     );
161 161
                     $rating_msg = mb_ereg_replace('{max}', floor($user_founds * rating_percentage / 100), $rating_msg);
162 162
                     $rating_msg = mb_ereg_replace('{curr}', $user_tops, $rating_msg);
@@ -169,14 +169,14 @@  discard block
 block discarded – undo
169 169
                     }
170 170
 
171 171
                     if ($user_tops) {
172
-                        $rating_msg .= '<br />' . $rating_maywithdraw;
172
+                        $rating_msg .= '<br />'.$rating_maywithdraw;
173 173
                     }
174 174
                 }
175 175
 
176 176
                 tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl));
177 177
 
178 178
                 if (isset($_POST['descMode'])) {
179
-                    $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
179
+                    $descMode = $_POST['descMode'] + 0; // Ocprop: 2
180 180
                     if (($descMode < 1) || ($descMode > 3)) {
181 181
                         $descMode = 3;
182 182
                     }
@@ -325,14 +325,14 @@  discard block
 block discarded – undo
325 325
                     if (is_latest_log($log_record['cache_id'], $log_record['log_id'])) {
326 326
                         $newstatus = sqlValue(
327 327
                             "SELECT `cache_status` FROM `log_types`
328
-                             WHERE `id`='" . sql_escape($log_type) . "'",
328
+                             WHERE `id`='" . sql_escape($log_type)."'",
329 329
                             false
330 330
                         );
331 331
                         if ($newstatus && $newstatus != $log_record['status']) {
332 332
                             sql("SET @STATUS_CHANGE_USER_ID='&1'", $login->userid);
333 333
                             sql(
334
-                                "UPDATE `caches` SET `status`='" . sql_escape($newstatus) . "'
335
-                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id']) . "'"
334
+                                "UPDATE `caches` SET `status`='".sql_escape($newstatus)."'
335
+                                 WHERE `cache_id`='" . sql_escape($log_record['cache_id'])."'"
336 336
                             );
337 337
                         }
338 338
                     }
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
                     //update user-stat if type changed
341 341
                     if ($log_record['logtype'] != $log_type) {
342 342
                         //call eventhandler
343
-                        require_once $opt['rootpath'] . 'lib/eventhandler.inc.php';
343
+                        require_once $opt['rootpath'].'lib/eventhandler.inc.php';
344 344
                         event_change_log_type($log_record['cache_id'], $usr['userid'] + 0);
345 345
                     }
346 346
 
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 
382 382
                     //display cache page
383 383
                     tpl_redirect(
384
-                        'viewcache.php?cacheid=' . urlencode($log_record['cache_id']) . '&log=A#log' . urlencode(
384
+                        'viewcache.php?cacheid='.urlencode($log_record['cache_id']).'&log=A#log'.urlencode(
385 385
                             $log_id
386 386
                         )
387 387
                     );
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
                 $logtypeoptions = '';
404 404
                 foreach ($allowed_logtypes as $logtype) {
405 405
                     $selected = ($log_record['logtype'] == $logtype ? ' selected="selected"' : '');
406
-                    $logtypeoptions .= '<option value="' . $logtype . '"' . $selected . '>';
406
+                    $logtypeoptions .= '<option value="'.$logtype.'"'.$selected.'>';
407 407
                     $logtypeoptions .= htmlspecialchars($logtype_names[$logtype], ENT_COMPAT, 'UTF-8');
408
-                    $logtypeoptions .= '</option>' . "\n";
408
+                    $logtypeoptions .= '</option>'."\n";
409 409
                 }
410 410
                 $disable_typechange = $disable_statuschange && $log_record['is_status_log'];
411 411
                 tpl_set_var('type_edit_disabled', $disable_typechange ? $type_edit_disabled : '');
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
                 tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
435 435
                 tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
436 436
                 tpl_set_var('cacheid', $log_record['cache_id']);
437
-                tpl_set_var('reset', $reset);  // obsolete
437
+                tpl_set_var('reset', $reset); // obsolete
438 438
                 tpl_set_var('submit', $submit);
439 439
                 tpl_set_var('logid', $log_id);
440 440
                 tpl_set_var('date_message', !$date_ok ? $date_message : '');
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
                 // Text / normal HTML / HTML editor
449 449
                 tpl_set_var('use_tinymce', (($descMode == 3) ? 1 : 0));
450 450
 
451
-                $headers = tpl_get_var('htmlheaders') . "\n";
451
+                $headers = tpl_get_var('htmlheaders')."\n";
452 452
                 if ($descMode == 1) {
453 453
                     tpl_set_var('descMode', 1);
454 454
                 } else {
@@ -456,15 +456,15 @@  discard block
 block discarded – undo
456 456
                         tpl_set_var('descMode', 2);
457 457
                     } else {
458 458
                         // TinyMCE
459
-                        $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
460
-                        $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/log.js.php?logid=0&lang=' .
459
+                        $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
460
+                        $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/log.js.php?logid=0&lang='.
461 461
                             strtolower(
462 462
                                 $locale
463
-                            ) . '"></script>' . "\n";
463
+                            ).'"></script>'."\n";
464 464
                         tpl_set_var('descMode', 3);
465 465
                     }
466 466
                 }
467
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
467
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
468 468
                 tpl_set_var('htmlheaders', $headers);
469 469
 
470 470
                 if ($use_log_pw == true && $log_pw != '') {
@@ -485,12 +485,12 @@  discard block
 block discarded – undo
485 485
                             $tmp_smiley = $smiley_link;
486 486
                             $tmp_smiley = mb_ereg_replace('{smiley_image}', $smiley['image'][$i], $tmp_smiley);
487 487
                             $tmp_smiley = mb_ereg_replace('{smiley_symbol}', $smiley['text'][$i], $tmp_smiley);
488
-                            $smilies = $smilies . '&nbsp;' .
488
+                            $smilies = $smilies.'&nbsp;'.
489 489
                                 mb_ereg_replace(
490 490
                                     '{smiley_file}',
491 491
                                     $smiley['file'][$i],
492 492
                                     $tmp_smiley
493
-                                ) . '&nbsp;';
493
+                                ).'&nbsp;';
494 494
                         }
495 495
                     }
496 496
                     tpl_set_var('smileypath', $opt['template']['smiley']);
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
     $lastest_log_id = sqlValue(
518 518
         "
519 519
         SELECT `id` FROM `cache_logs`
520
-        WHERE `cache_id`='" . sql_escape($cache_id) . "'
520
+        WHERE `cache_id`='" . sql_escape($cache_id)."'
521 521
         ORDER BY `order_date` DESC, `date_created` DESC, `id` DESC
522 522
         LIMIT 1",
523 523
         0,
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@  discard block
 block discarded – undo
24 24
 if ($error == false) {
25 25
     //logid
26 26
     $log_id = 0;
27
-    if (isset($_REQUEST['logid'])) { // Ocprop
27
+    if (isset($_REQUEST['logid'])) {
28
+// Ocprop
28 29
         $log_id = $_REQUEST['logid'];
29 30
     }
30 31
 
@@ -273,7 +274,8 @@  discard block
 block discarded – undo
273 274
                 }
274 275
 
275 276
                 //store?
276
-                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) { // Ocprop
277
+                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) {
278
+// Ocprop
277 279
                     // 00:00:01 = "00:00 was logged"
278 280
                     // 00:00:00 = "no time was logged"
279 281
                     if ("$log_time_hour$log_time_minute" != "" &&
Please login to merge, or discard this patch.
htdocs/newcaches.php 1 patch
Spacing   +11 added lines, -12 removed lines patch added patch discarded remove patch
@@ -5,15 +5,14 @@  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
 $tpl->name = 'newcaches';
11 11
 $tpl->menuitem = MNU_START_NEWCACHES;
12 12
 $tpl->change_country_inpage = true;
13 13
 
14 14
 $startat = isset($_REQUEST['startat']) ? floor($_REQUEST['startat'] + 0) : 0;
15
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
16
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
15
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : '');
17 16
 $cachetype = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] + 0 : 0;
18 17
 $bEvents = ($cachetype == 6);
19 18
 
@@ -24,14 +23,14 @@  discard block
 block discarded – undo
24 23
 }
25 24
 
26 25
 $tpl->caching = true;
27
-$tpl->cache_id = $startat . "-" . $country . "-" . $cachetype;
26
+$tpl->cache_id = $startat."-".$country."-".$cachetype;
28 27
 $tpl->cache_lifetime = 300;
29 28
 if ($startat > 10 * $perpage) {
30 29
     $tpl->cache_lifetime = 3600;
31 30
 }
32 31
 
33 32
 if (!$tpl->is_cached()) {
34
-    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = " . sql_escape($cachetype) : "");
33
+    $cachetype_condition = ($cachetype ? " AND `caches`.`type` = ".sql_escape($cachetype) : "");
35 34
     if ($bEvents) {
36 35
         $cachetype_condition .= " AND `date_hidden` >= curdate()";
37 36
     }
@@ -50,14 +49,14 @@  discard block
 block discarded – undo
50 49
             INNER JOIN `user` ON `caches`.`user_id`=`user`.`user_id`
51 50
              LEFT JOIN `countries` ON `countries`.`short` = `caches`.`country`
52 51
              LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
53
-                       AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
52
+                       AND `sys_trans_text`.`lang` = '".sql_escape($opt['template']['locale'])."'
54 53
              LEFT JOIN `caches_attributes` `ca`
55 54
                   ON `ca`.`cache_id`=`caches`.`cache_id`
56 55
                   AND `ca`.`attrib_id`=6
57
-             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='" . sql_escape($country) . "'" : "") .
58
-        $cachetype_condition . "
56
+             WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='".sql_escape($country)."'" : "").
57
+        $cachetype_condition."
59 58
               ORDER BY `caches`.`$date_field` $sort_order
60
-                   LIMIT " . sprintf("%d", $startat) . ',
59
+                   LIMIT ".sprintf("%d", $startat).',
61 60
                    ' . ($perpage + 0)
62 61
     );
63 62
     // see also write_newcaches_urls() in sitemap.class.php
@@ -70,8 +69,8 @@  discard block
 block discarded – undo
70 69
     $startat = isset($_REQUEST['startat']) ? $_REQUEST['startat'] + 0 : 0;
71 70
     $cacheype_par = ($cachetype ? "&cachetype=$cachetype" : "");
72 71
     if ($country == '') {
73
-        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1" . $cachetype_condition, 0);
74
-        $pager = new pager("newcaches.php?startat={offset}" . $cacheype_par);
72
+        $count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1".$cachetype_condition, 0);
73
+        $pager = new pager("newcaches.php?startat={offset}".$cacheype_par);
75 74
     } else {
76 75
         $count = sql_value_slave(
77 76
             "SELECT COUNT(*)
@@ -81,7 +80,7 @@  discard block
 block discarded – undo
81 80
             0,
82 81
             $country
83 82
         );
84
-        $pager = new pager("newcaches.php?country=" . $country . "&startat={offset}" . $cacheype_par);
83
+        $pager = new pager("newcaches.php?country=".$country."&startat={offset}".$cacheype_par);
85 84
     }
86 85
     $pager->make_from_offset($startat, $count, 100);
87 86
 
Please login to merge, or discard this patch.
htdocs/a.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,4 +7,4 @@
 block discarded – undo
7 7
  *  Activation page shortcut to keep URLs in activation Emails short
8 8
  ***************************************************************************/
9 9
 
10
-require __DIR__ . '/activation.php';
10
+require __DIR__.'/activation.php';
Please login to merge, or discard this patch.
htdocs/log.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
 }
12 12
 
13 13
 // include librarys
14
-require __DIR__ . '/lib2/web.inc.php';
15
-require_once __DIR__ . '/lib2/logic/cache.class.php';
16
-require_once __DIR__ . '/lib2/logic/user.class.php';
17
-require_once __DIR__ . '/lib2/logic/cachelog.class.php';
18
-require_once __DIR__ . '/lib2/edithelper.inc.php';
14
+require __DIR__.'/lib2/web.inc.php';
15
+require_once __DIR__.'/lib2/logic/cache.class.php';
16
+require_once __DIR__.'/lib2/logic/user.class.php';
17
+require_once __DIR__.'/lib2/logic/cachelog.class.php';
18
+require_once __DIR__.'/lib2/edithelper.inc.php';
19 19
 
20 20
 // prepare template and menue
21 21
 $tpl->name = 'log_cache';
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
     // get logtext editormode (from form or from userprofile)
122 122
     // 1 = text; 2 = HTML; 3 = tinyMCE
123 123
     if (isset($_POST['descMode'])) {
124
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
124
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
125 125
         if (($descMode < 1) || ($descMode > 3)) {
126 126
             $descMode = 3;
127 127
         }
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
     if ($descMode == 3) {
147 147
         $tpl->add_header_javascript('resource2/tinymce/tiny_mce_gzip.js');
148 148
         $tpl->add_header_javascript(
149
-            'resource2/tinymce/config/log.js.php?lang=' . strtolower($opt['template']['locale'])
149
+            'resource2/tinymce/config/log.js.php?lang='.strtolower($opt['template']['locale'])
150 150
         );
151 151
     }
152 152
     $tpl->add_header_javascript(editorJsPath());
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     if (is_numeric($logDateMonth)
159 159
         && is_numeric($logDateDay)
160 160
         && is_numeric($logDateYear)
161
-        && ($logTimeHour . $logTimeMinute == "" || is_numeric($logTimeHour))
161
+        && ($logTimeHour.$logTimeMinute == "" || is_numeric($logTimeHour))
162 162
         && ($logTimeMinute == "" || is_numeric($logTimeMinute))
163 163
     ) {
164 164
         $validate['dateOk'] = checkdate($logDateMonth, $logDateDay, $logDateYear)
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
          * set seconds 00:00:01, means "00:00 was logged"
224 224
          * set seconds 00:00:00, means "no time was logged"
225 225
          */
226
-        $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
226
+        $logTimeSecond = ($logTimeHour.$logTimeMinute != ""
227 227
                 && $logTimeHour == 0
228 228
                 && $logTimeMinute == 0) + 0;
229 229
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
         }
280 280
 
281 281
         // finished, redirect to listing
282
-        $tpl->redirect('viewcache.php?cacheid=' . $cache->getCacheId());
282
+        $tpl->redirect('viewcache.php?cacheid='.$cache->getCacheId());
283 283
     }
284 284
 
285 285
     // assign values to template
Please login to merge, or discard this patch.
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,14 +24,16 @@  discard block
 block discarded – undo
24 24
 
25 25
 // check login
26 26
 $login->verify();
27
-if ($login->userid == 0)
27
+if ($login->userid == 0) {
28 28
     $tpl->redirect_login();
29
+}
29 30
 
30 31
 // get cache_id if not given
31 32
 $cacheId = 0;
32 33
 if (isset($_REQUEST['wp'])) {
33 34
     $cacheId = cache::cacheIdFromWP($_REQUEST['wp']);
34
-} elseif (isset($_REQUEST['cacheid'])) { // Ocprop
35
+} elseif (isset($_REQUEST['cacheid'])) {
36
+// Ocprop
35 37
     $cacheId = $_REQUEST['cacheid'];
36 38
 }
37 39
 
@@ -216,7 +218,8 @@  discard block
 block discarded – undo
216 218
     $validate['duplicateLog'] = true;
217 219
 
218 220
     // all checks done, no error => log
219
-    if (isset($_POST['submitform']) && $loggable)  // Ocprop
221
+    if (isset($_POST['submitform']) && $loggable) {
222
+        // Ocprop
220 223
     {
221 224
         /*
222 225
          * check if time is logged
@@ -226,6 +229,7 @@  discard block
 block discarded – undo
226 229
         $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
227 230
                 && $logTimeHour == 0
228 231
                 && $logTimeMinute == 0) + 0;
232
+    }
229 233
 
230 234
         // make time values database ready
231 235
         $logDate = date(
Please login to merge, or discard this patch.