Completed
Branch master (7d3f82)
by Thomas
09:15
created
htdocs/editcache.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -76,10 +76,12 @@  discard block
 block discarded – undo
76 76
 if ($error == false) {
77 77
     //cacheid
78 78
     $cache_id = 0;
79
-    if (isset($_REQUEST['cacheid']))  // Ocprop
79
+    if (isset($_REQUEST['cacheid'])) {
80
+        // Ocprop
80 81
     {
81 82
         $cache_id = $_REQUEST['cacheid'];
82 83
     }
84
+    }
83 85
 
84 86
     if ($usr === false) {
85 87
         $tplname = 'login';
@@ -197,9 +199,11 @@  discard block
 block discarded – undo
197 199
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
198 200
 
199 201
                 if ($status_old == 5 && $status == 5) {
200
-                    if (isset($_POST['publish']))  // Ocprop
202
+                    if (isset($_POST['publish'])) {
203
+                        // Ocprop
201 204
                     {
202 205
                         $publish = $_POST['publish'];
206
+                    }
203 207
                         if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) {
204 208
                             // somebody messed up the POST-data, so we do not publish the cache, since he isn't published right now (status=5)
205 209
                             $publish = 'notnow';
@@ -228,12 +232,14 @@  discard block
 block discarded – undo
228 232
                     $status = $status_old;
229 233
                 }
230 234
 
231
-                if ($status_old == 7) // cache is locked
235
+                if ($status_old == 7) {
236
+                    // cache is locked
232 237
                 {
233 238
                     // only admins can change status of locked caches
234 239
                     if (($bAdmin & ADMIN_USER) != ADMIN_USER) {
235 240
                         // no status change allowed for normal user
236 241
                         $status = $status_old;
242
+                }
237 243
                     }
238 244
                 }
239 245
 
@@ -439,11 +445,13 @@  discard block
 block discarded – undo
439 445
                 }
440 446
 
441 447
                 //try to save to DB?
442
-                if (isset($_POST['submit']))  // Ocprop
448
+                if (isset($_POST['submit'])) {
449
+                    // Ocprop
443 450
                 {
444 451
                     //all validations ok?
445 452
                     if (!($hidden_date_not_ok || $lat_not_ok || $lon_not_ok || $name_not_ok || $time_not_ok || $way_length_not_ok || $size_not_ok || $activate_date_not_ok || $status_not_ok || $diff_not_ok || $attribs_not_ok || $wpgc_not_ok)) {
446 453
                         $cache_lat = $coords_lat_h + $coords_lat_min / 60;
454
+                }
447 455
                         if ($coords_latNS == 'S') {
448 456
                             $cache_lat = - $cache_lat;
449 457
                         }
@@ -931,9 +939,11 @@  discard block
 block discarded – undo
931 939
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
932 940
 
933 941
                 // show activation form?
934
-                if ($status_old == 5) // status = not yet published
942
+                if ($status_old == 5) {
943
+                    // status = not yet published
935 944
                 {
936 945
                     $tmp = $activation_form;
946
+                }
937 947
 
938 948
                     $tmp = mb_ereg_replace(
939 949
                         '{activate_day}',
Please login to merge, or discard this patch.
htdocs/ocstats.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,8 +17,9 @@
 block discarded – undo
17 17
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
18 18
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
19 19
 
20
-if (!isset($opt['locale'][$lang]))
20
+if (!isset($opt['locale'][$lang])) {
21 21
     $lang = $opt['template']['locale'];
22
+}
22 23
 
23 24
 $filename = GetFilename($userid, $lang);
24 25
 
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/maillog.class.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,8 @@  discard block
 block discarded – undo
112 112
                             $emailadr
113 113
                         );
114 114
                     } else {
115
-                        if ($bounced) // maximum one bounce per day is counted, to filter out temporary problems
115
+                        if ($bounced) {
116
+                            // maximum one bounce per day is counted, to filter out temporary problems
116 117
                         {
117 118
                             sql(
118 119
                                 "UPDATE `user` SET `email_problems`=`email_problems`+1, `last_email_problem`='&2'
@@ -121,6 +122,7 @@  discard block
 block discarded – undo
121 122
                                 $logentry['created']
122 123
                             );
123 124
                         }
125
+                        }
124 126
                     }
125 127
                 } else {
126 128
                     echo $this->name . ": no email address found for record ID " . $logentry['id'] . "\n";
Please login to merge, or discard this patch.
htdocs/coordinates.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,8 +88,9 @@
 block discarded – undo
88 88
     $tpl->assign('coordW3W2', $coord->getW3W($w3w_langs[1]));
89 89
     $lang2_name = sql_value("SELECT `name` FROM `languages` WHERE `short`='&1'", '', $w3w_langs[1]);
90 90
     $tpl->assign('W3Wlang2', $translate->t($lang2_name, '', '', 0));
91
-} else
91
+} else {
92 92
     $tpl->assign('coordW3W2', false);
93
+}
93 94
 
94 95
 // wp gesetzt?
95 96
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';
Please login to merge, or discard this patch.
htdocs/query.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -106,9 +106,9 @@
 block discarded – undo
106 106
             }
107 107
         } else {
108 108
             // save as
109
-            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0)
110
-                $tpl->assign('errorMustSelectQuery', true);
111
-            else {
109
+            if (sql_value("SELECT COUNT(*) FROM `queries` WHERE `id`='&1' AND `user_id`='&2'", 0, $saveas_queryid, $login->userid) == 0) {
110
+                            $tpl->assign('errorMustSelectQuery', true);
111
+            } else {
112 112
                 sql("UPDATE `queries` SET `options`='&1' WHERE `id`='&2'", $options, $saveas_queryid);
113 113
                 $tpl->redirect('query.php?action=view');
114 114
             }
Please login to merge, or discard this patch.