Passed
Pull Request — master (#322)
by Mirko
08:41
created
htdocs/lib2/Net/IDNA2.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2340,7 +2340,9 @@  discard block
 block discarded – undo
2340 2340
         }
2341 2341
 
2342 2342
         // No input, no output, what else did you expect?
2343
-        if (empty($decoded)) return '';
2343
+        if (empty($decoded)) {
2344
+            return '';
2345
+        }
2344 2346
 
2345 2347
         // Anchors for iteration
2346 2348
         $last_begin = 0;
@@ -2438,7 +2440,9 @@  discard block
 block discarded – undo
2438 2440
             $arr = explode('.', $input);
2439 2441
             foreach ($arr as $k => $v) {
2440 2442
                 $conv = $this->_decode($v);
2441
-                if ($conv) $arr[$k] = $conv;
2443
+                if ($conv) {
2444
+                    $arr[$k] = $conv;
2445
+                }
2442 2446
             }
2443 2447
             $return = $email_pref . '@' . join('.', $arr);
2444 2448
         } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
@@ -2452,7 +2456,9 @@  discard block
 block discarded – undo
2452 2456
                 $arr = explode('.', $parsed['host']);
2453 2457
                 foreach ($arr as $k => $v) {
2454 2458
                     $conv = $this->_decode($v);
2455
-                    if ($conv) $arr[$k] = $conv;
2459
+                    if ($conv) {
2460
+                        $arr[$k] = $conv;
2461
+                    }
2456 2462
                 }
2457 2463
                 $parsed['host'] = join('.', $arr);
2458 2464
                 if (isset($parsed['scheme'])) {
@@ -2463,7 +2469,9 @@  discard block
 block discarded – undo
2463 2469
                 $arr = explode('.', $input);
2464 2470
                 foreach ($arr as $k => $v) {
2465 2471
                     $conv = $this->_decode($v);
2466
-                    if ($conv) $arr[$k] = $conv;
2472
+                    if ($conv) {
2473
+                        $arr[$k] = $conv;
2474
+                    }
2467 2475
                 }
2468 2476
                 $return = join('.', $arr);
2469 2477
             }
Please login to merge, or discard this patch.
htdocs/lib2/imagebmp.inc.php 1 patch
Braces   +90 added lines, -48 removed lines patch added patch discarded remove patch
@@ -36,7 +36,9 @@  discard block
 block discarded – undo
36 36
 $IsTransparent=$Transparent!=-1;
37 37
 
38 38
 
39
-if($IsTransparent) $ColorCount--;
39
+if($IsTransparent) {
40
+    $ColorCount--;
41
+}
40 42
 
41 43
 if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
42 44
 if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
@@ -49,7 +51,9 @@  discard block
 block discarded – undo
49 51
 
50 52
                 $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
51 53
 
52
-                if($BitCount<24) $palsize=pow(2,$BitCount)*4;
54
+                if($BitCount<24) {
55
+                    $palsize=pow(2,$BitCount)*4;
56
+                }
53 57
 
54 58
                 $size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
55 59
                 $size+=$palsize;
@@ -76,11 +80,15 @@  discard block
 block discarded – undo
76 80
 
77 81
                 $CC=$ColorCount;
78 82
                 $sl1=strlen($ret);
79
-                if($CC==0) $CC=256;
83
+                if($CC==0) {
84
+                    $CC=256;
85
+                }
80 86
                 if($BitCount<24)
81 87
                    {
82 88
                     $ColorTotal=imagecolorstotal($img);
83
-                     if($IsTransparent) $ColorTotal--;
89
+                     if($IsTransparent) {
90
+                         $ColorTotal--;
91
+                     }
84 92
 
85 93
                      for($p=0;$p<$ColorTotal;$p++)
86 94
                      {
@@ -122,12 +130,14 @@  discard block
 block discarded – undo
122 130
   if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
123 131
     {
124 132
      $sl=strlen($bWrite);
125
-     for($t=0;$t<8-$sl;$t++)
126
-      $sl.="0";
133
+     for($t=0;$t<8-$sl;$t++) {
134
+           $sl.="0";
135
+     }
127 136
      $retd.=inttobyte(bindec($bWrite));
128 137
     };
129
- for($z=0;$z<$Zbytek;$z++)
130
-   $retd.=inttobyte(0);
138
+ for($z=0;$z<$Zbytek;$z++) {
139
+    $retd.=inttobyte(0);
140
+ }
131 141
  };
132 142
 };
133 143
 
@@ -135,9 +145,10 @@  discard block
 block discarded – undo
135 145
 {
136 146
  for($t=0;$t<strlen($retd);$t+=4)
137 147
   {
138
-   if($t!=0)
139
-   if(($t)%$Width==0)
148
+   if($t!=0) {
149
+      if(($t)%$Width==0)
140 150
     $ret.=chr(0).chr(0);
151
+   }
141 152
 
142 153
    if(($t+5)%$Width==0)
143 154
    {
@@ -148,15 +159,13 @@  discard block
 block discarded – undo
148 159
     {
149 160
      $ret.=chr(0).chr(6).substr($retd,$t,6);
150 161
      $t+=2;
151
-    }
152
-    else
162
+    } else
153 163
     {
154 164
      $ret.=chr(0).chr(4).substr($retd,$t,4);
155 165
     };
156 166
   };
157 167
   $ret.=chr(0).chr(1);
158
-}
159
-else
168
+} else
160 169
 {
161 170
 $ret.=$retd;
162 171
 };
@@ -164,8 +173,9 @@  discard block
 block discarded – undo
164 173
 
165 174
                 if($BitCount==24)
166 175
                 {
167
-                for($z=0;$z<$Zbytek;$z++)
168
-                 $Dopl.=chr(0);
176
+                for($z=0;$z<$Zbytek;$z++) {
177
+                                 $Dopl.=chr(0);
178
+                }
169 179
 
170 180
                 for($y=$Height-1;$y>=0;$y--)
171 181
                  {
@@ -185,8 +195,7 @@  discard block
 block discarded – undo
185 195
     $r=$r and fwrite($f,$ret);
186 196
     $r=$r and fclose($f);
187 197
     return $r;
188
-   }
189
-  else
198
+   } else
190 199
   {
191 200
    echo $ret;
192 201
   };
@@ -259,17 +268,20 @@  discard block
 block discarded – undo
259 268
        imagesetpixel($img,$x,$y,$Palette[$C]);
260 269
       };
261 270
     if($CurrentBit!=0) {freadbyte($f);};
262
-    for($g=0;$g<$Zbytek;$g++)
263
-     freadbyte($f);
271
+    for($g=0;$g<$Zbytek;$g++) {
272
+         freadbyte($f);
273
+    }
264 274
      };
265 275
 
266 276
  };
267 277
 };
268 278
 
269 279
 
270
-if($RLECompression==1) //$BI_RLE8
280
+if($RLECompression==1) {
281
+    //$BI_RLE8
271 282
 {
272 283
 $y=$Height;
284
+}
273 285
 
274 286
 $pocetb=0;
275 287
 
@@ -282,9 +294,15 @@  discard block
 block discarded – undo
282 294
 
283 295
 $echoit=false;
284 296
 
285
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
286
-if(($prefix==0)and($suffix==1)) break;
287
-if(feof($f)) break;
297
+if($echoit) {
298
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
299
+}
300
+if(($prefix==0)and($suffix==1)) {
301
+    break;
302
+}
303
+if(feof($f)) {
304
+    break;
305
+}
288 306
 
289 307
 while(!(($prefix==0)and($suffix==0)))
290 308
 {
@@ -298,14 +316,17 @@  discard block
 block discarded – undo
298 316
  if($prefix>0)
299 317
   {
300 318
    $pocet=$prefix;
301
-   for($r=0;$r<$pocet;$r++)
302
-    $Data.=chr($suffix);
319
+   for($r=0;$r<$pocet;$r++) {
320
+       $Data.=chr($suffix);
321
+   }
303 322
   };
304 323
  $prefix=freadbyte($f);
305 324
  $suffix=freadbyte($f);
306 325
  $pocetb+=2;
307
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
308
-};
326
+ if($echoit) {
327
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
328
+ }
329
+ };
309 330
 
310 331
 for($x=0;$x<strlen($Data);$x++)
311 332
  {
@@ -318,9 +339,11 @@  discard block
 block discarded – undo
318 339
 };
319 340
 
320 341
 
321
-if($RLECompression==2) //$BI_RLE4
342
+if($RLECompression==2) {
343
+    //$BI_RLE4
322 344
 {
323 345
 $y=$Height;
346
+}
324 347
 $pocetb=0;
325 348
 
326 349
 /*while(!feof($f))
@@ -335,9 +358,15 @@  discard block
 block discarded – undo
335 358
 
336 359
 $echoit=false;
337 360
 
338
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
339
-if(($prefix==0)and($suffix==1)) break;
340
-if(feof($f)) break;
361
+if($echoit) {
362
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
363
+}
364
+if(($prefix==0)and($suffix==1)) {
365
+    break;
366
+}
367
+if(feof($f)) {
368
+    break;
369
+}
341 370
 
342 371
 while(!(($prefix==0)and($suffix==0)))
343 372
 {
@@ -346,9 +375,12 @@  discard block
 block discarded – undo
346 375
    $pocet=$suffix;
347 376
 
348 377
    $CurrentBit=0;
349
-   for($h=0;$h<$pocet;$h++)
350
-    $Data.=chr(freadbits($f,4));
351
-   if($CurrentBit!=0) freadbits($f,4);
378
+   for($h=0;$h<$pocet;$h++) {
379
+       $Data.=chr(freadbits($f,4));
380
+   }
381
+   if($CurrentBit!=0) {
382
+       freadbits($f,4);
383
+   }
352 384
    $pocetb+=ceil(($pocet/2));
353 385
    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
354 386
   };
@@ -361,8 +393,7 @@  discard block
 block discarded – undo
361 393
     if($i%2==0)
362 394
      {
363 395
       $Data.=chr($suffix%16);
364
-     }
365
-     else
396
+     } else
366 397
      {
367 398
       $Data.=chr(floor($suffix/16));
368 399
      };
@@ -372,8 +403,10 @@  discard block
 block discarded – undo
372 403
  $prefix=freadbyte($f);
373 404
  $suffix=freadbyte($f);
374 405
  $pocetb+=2;
375
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
376
-};
406
+ if($echoit) {
407
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
408
+ }
409
+ };
377 410
 
378 411
 for($x=0;$x<strlen($Data);$x++)
379 412
  {
@@ -399,11 +432,14 @@  discard block
 block discarded – undo
399 432
        $G=freadbyte($f);
400 433
        $R=freadbyte($f);
401 434
        $color=imagecolorexact($img,$R,$G,$B);
402
-       if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
435
+       if($color==-1) {
436
+           $color=imagecolorallocate($img,$R,$G,$B);
437
+       }
403 438
        imagesetpixel($img,$x,$y,$color);
404 439
       }
405
-    for($z=0;$z<$Zbytek;$z++)
406
-     freadbyte($f);
440
+    for($z=0;$z<$Zbytek;$z++) {
441
+         freadbyte($f);
442
+    }
407 443
    };
408 444
 };
409 445
 return $img;
@@ -483,8 +519,7 @@  discard block
 block discarded – undo
483 519
  if($CurrentBit==8)
484 520
   {
485 521
    $CurrentBit=0;
486
-  }
487
- else
522
+  } else
488 523
   {
489 524
    fseek($f,ftell($f)-1);
490 525
   };
@@ -495,9 +530,15 @@  discard block
 block discarded – undo
495 530
 
496 531
 function RGBToHex($Red,$Green,$Blue)
497 532
   {
498
-   $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
499
-   $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
500
-   $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
533
+   $hRed=dechex($Red);if(strlen($hRed)==1) {
534
+       $hRed="0$hRed";
535
+   }
536
+   $hGreen=dechex($Green);if(strlen($hGreen)==1) {
537
+       $hGreen="0$hGreen";
538
+   }
539
+   $hBlue=dechex($Blue);if(strlen($hBlue)==1) {
540
+       $hBlue="0$hBlue";
541
+   }
501 542
    return($hRed.$hGreen.$hBlue);
502 543
   };
503 544
 
@@ -520,8 +561,9 @@  discard block
 block discarded – undo
520 561
 {
521 562
 $bin=decbin($d);
522 563
 $sbin=strlen($bin);
523
-for($j=0;$j<$n-$sbin;$j++)
564
+for($j=0;$j<$n-$sbin;$j++) {
524 565
  $bin="0$bin";
566
+}
525 567
 return $bin;
526 568
 };
527 569
 
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Braces   +10 added lines, -8 removed lines patch added patch discarded remove patch
@@ -145,10 +145,11 @@  discard block
 block discarded – undo
145 145
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
146 146
                         <td>
147 147
 <?php
148
-                            foreach ($opt['template']['locales'] AS $k => $lang)
149
-                                if ($lang['status'] == OC_LOCALE_ACTIVE)
148
+                            foreach ($opt['template']['locales'] AS $k => $lang) {
149
+                                                            if ($lang['status'] == OC_LOCALE_ACTIVE)
150 150
                                     echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
151
-?>
151
+                            }
152
+                            ?>
152 153
                         </td>
153 154
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
154 155
                         <td>
@@ -205,11 +206,12 @@  discard block
 block discarded – undo
205 206
                     <ul>
206 207
 <?php
207 208
                         // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
208
-                        if ($pageidx >= 0)
209
-                            mnu_EchoMainMenu($menu[$pageidx]['siteid']);
210
-                        else
211
-                            mnu_EchoMainMenu(-1);
212
-?>
209
+                        if ($pageidx >= 0) {
210
+                                                    mnu_EchoMainMenu($menu[$pageidx]['siteid']);
211
+                        } else {
212
+                                                    mnu_EchoMainMenu(-1);
213
+                        }
214
+                        ?>
213 215
                     </ul>
214 216
                 </div>
215 217
 
Please login to merge, or discard this patch.