OpencachingDeutschland / oc-server3

htdocs/lang/de/ocstyle/lib/menu.php

Braces +2 added lines, -1 removed lines

@@ -423,7 +423,8 @@
 {
     global $menu;
 
-    if ($mainmenuindex >= 0) { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
+    if ($mainmenuindex >= 0) {
+// is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
         echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8');
 
         if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) {

htdocs/picture.php

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/restorecaches.php

Braces +10 added lines, -5 removed lines

@@ -757,7 +757,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `latitude`='&1', `longitude`='&2' WHERE `cache_id`='&3'",
@@ -790,7 +791,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `country`='&1'  WHERE `cache_id`='&2'",
@@ -827,7 +829,8 @@ 
             'wp_nc' => 'waypoints'
         ];
 
-        if ($r = sql_fetch_assoc($rs)) {// can be false
+        if ($r = sql_fetch_assoc($rs)) {
+// can be false
             $setfields = "";
             foreach ($fields as $field => $ropt) {
                 if (in_array($ropt, $roptions) && $r[$field] != $cache[$field]) {
@@ -896,13 +899,15 @@ 
 
             while ($r = sql_fetch_assoc($rs)) {
                 if (!$simulate) {
-                    if ($r['desc'] === null) { // was newly created -> delete
+                    if ($r['desc'] === null) {
+// was newly created -> delete
                         sql(
                             "DELETE FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'",
                             $cacheid,
                             $r['language']
                         );
-                    } else {// id, uuid, date_created and last_modified are set automatically
+                    } else {
+// id, uuid, date_created and last_modified are set automatically
                         sql(
                             "INSERT INTO `cache_desc`
                             (`node`, `cache_id`, `language`, `desc`, `desc_html`, `desc_htmledit`, `hint`, `short_desc`)

htdocs/util2/gns/gns_import.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt ++ == 0) {
+// skip first line
             continue;
         }
 

htdocs/util2/cron/modules/picture_cleanup.class.php

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
             }
 
             for ($n = 1; $n < count($instances); ++ $n) {
-                if ($instances[$n]['filesize'] !== false) {// ensure that pic is stored locally
+                if ($instances[$n]['filesize'] !== false) {
+// ensure that pic is stored locally
                     for ($nn = $n - 1; $nn >= 0; -- $nn) {
                         if ($instances[$nn]['filesize'] === $instances[$n]['filesize']) {
                             if (file_get_contents($instances[$nn]['pic']->getFilename())

htdocs/lib2/imagebmp.inc.php

Braces +129 added lines, -130 removed lines

@@ -36,7 +36,9 @@ 
 $IsTransparent=$Transparent!=-1;
 
 
-if($IsTransparent) $ColorCount--;
+if($IsTransparent) {
+    $ColorCount--;
+}
 
 if($ColorCount==0) {$ColorCount=0; $BitCount=24;};
 if(($ColorCount>0)and($ColorCount<=2)) {$ColorCount=2; $BitCount=1;};
@@ -49,7 +51,9 @@ 
 
                 $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
 
-                if($BitCount<24) $palsize=pow(2,$BitCount)*4;
+                if($BitCount<24) {
+                    $palsize=pow(2,$BitCount)*4;
+                }
 
                 $size=(floor($Width/(8/$BitCount))+$Zbytek)*$Height+54;
                 $size+=$palsize;
@@ -76,14 +80,16 @@ 
 
                 $CC=$ColorCount;
                 $sl1=strlen($ret);
-                if($CC==0) $CC=256;
-                if($BitCount<24)
-                   {
+                if($CC==0) {
+                    $CC=256;
+                }
+                if($BitCount<24) {
                     $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                     if($IsTransparent) {
+                         $ColorTotal--;
+                     }
 
-                     for($p=0;$p<$ColorTotal;$p++)
-                     {
+                     for($p=0;$p<$ColorTotal;$p++) {
                       $color=imagecolorsforindex($img,$p);
                        $ret.=inttobyte($color["blue"]);
                        $ret.=inttobyte($color["green"]);
@@ -92,8 +98,7 @@ 
                      };
 
                     $CT=$ColorTotal;
-                  for($p=$ColorTotal;$p<$CC;$p++)
-                       {
+                  for($p=$ColorTotal;$p<$CC;$p++) {
                       $ret.=inttobyte(0);
                       $ret.=inttobyte(0);
                       $ret.=inttobyte(0);
@@ -102,75 +107,63 @@ 
                    };
 
 
-if($BitCount<=8)
-{
+if($BitCount<=8) {
 
- for($y=$Height-1;$y>=0;$y--)
- {
+ for($y=$Height-1;$y>=0;$y--) {
   $bWrite="";
-  for($x=0;$x<$Width;$x++)
-   {
+  for($x=0;$x<$Width;$x++) {
    $color=imagecolorat($img,$x,$y);
    $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
-    {
+   if(strlen($bWrite)==8) {
      $retd.=inttobyte(bindec($bWrite));
      $bWrite="";
     };
    };
 
-  if((strlen($bWrite)<8)and(strlen($bWrite)!=0))
-    {
+  if((strlen($bWrite)<8)and(strlen($bWrite)!=0)) {
      $sl=strlen($bWrite);
-     for($t=0;$t<8-$sl;$t++)
-      $sl.="0";
+     for($t=0;$t<8-$sl;$t++) {
+           $sl.="0";
+     }
      $retd.=inttobyte(bindec($bWrite));
     };
- for($z=0;$z<$Zbytek;$z++)
-   $retd.=inttobyte(0);
+ for($z=0;$z<$Zbytek;$z++) {
+    $retd.=inttobyte(0);
+ }
  };
 };
 
-if(($RLE==1)and($BitCount==8))
-{
- for($t=0;$t<strlen($retd);$t+=4)
-  {
-   if($t!=0)
-   if(($t)%$Width==0)
+if(($RLE==1)and($BitCount==8)) {
+ for($t=0;$t<strlen($retd);$t+=4) {
+   if($t!=0) {
+      if(($t)%$Width==0)
     $ret.=chr(0).chr(0);
+   }
 
-   if(($t+5)%$Width==0)
-   {
+   if(($t+5)%$Width==0) {
      $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
      $t+=1;
    }
-   if(($t+6)%$Width==0)
-    {
+   if(($t+6)%$Width==0) {
      $ret.=chr(0).chr(6).substr($retd,$t,6);
      $t+=2;
-    }
-    else
-    {
+    } else {
      $ret.=chr(0).chr(4).substr($retd,$t,4);
     };
   };
   $ret.=chr(0).chr(1);
-}
-else
-{
+} else {
 $ret.=$retd;
 };
 
 
-                if($BitCount==24)
-                {
-                for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                if($BitCount==24) {
+                for($z=0;$z<$Zbytek;$z++) {
+                                 $Dopl.=chr(0);
+                }
 
-                for($y=$Height-1;$y>=0;$y--)
-                 {
-                 for($x=0;$x<$Width;$x++)
-                        {
+                for($y=$Height-1;$y>=0;$y--) {
+                 for($x=0;$x<$Width;$x++) {
                            $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
                            $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
                         }
@@ -179,15 +172,12 @@ 
 
                  };
 
-  if($file!="")
-   {
+  if($file!="") {
     $r=($f=fopen($file,"w"));
     $r=$r and fwrite($f,$ret);
     $r=$r and fclose($f);
     return $r;
-   }
-  else
-  {
+   } else {
    echo $ret;
   };
 };
@@ -211,8 +201,7 @@ 
 $f=fopen($file,"r");
 $Header=fread($f,2);
 
-if($Header=="BM")
-{
+if($Header=="BM") {
  $Size=freaddword($f);
  $Reserved1=freadword($f);
  $Reserved2=freadword($f);
@@ -230,12 +219,10 @@ 
  $NumberOfPalettesUsed=freaddword($f);
  $NumberOfImportantColors=freaddword($f);
 
-if($biBitCount<24)
- {
+if($biBitCount<24) {
   $img=imagecreate($Width,$Height);
   $Colors=pow(2,$biBitCount);
-  for($p=0;$p<$Colors;$p++)
-   {
+  for($p=0;$p<$Colors;$p++) {
     $B=freadbyte($f);
     $G=freadbyte($f);
     $R=freadbyte($f);
@@ -246,35 +233,34 @@ 
 
 
 
-if($RLECompression==0)
-{
+if($RLECompression==0) {
    $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
 
-for($y=$Height-1;$y>=0;$y--)
-    {
+for($y=$Height-1;$y>=0;$y--) {
      $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
+     for($x=0;$x<$Width;$x++) {
          $C=freadbits($f,$biBitCount);
        imagesetpixel($img,$x,$y,$Palette[$C]);
       };
     if($CurrentBit!=0) {freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
-     freadbyte($f);
+    for($g=0;$g<$Zbytek;$g++) {
+         freadbyte($f);
+    }
      };
 
  };
 };
 
 
-if($RLECompression==1) //$BI_RLE8
+if($RLECompression==1) {
+    //$BI_RLE8
 {
 $y=$Height;
+}
 
 $pocetb=0;
 
-while(true)
-{
+while(true) {
 $y--;
 $prefix=freadbyte($f);
 $suffix=freadbyte($f);
@@ -282,33 +268,38 @@ 
 
 $echoit=false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if($echoit) {
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
+}
+if(($prefix==0)and($suffix==1)) {
+    break;
+}
+if(feof($f)) {
+    break;
+}
 
-while(!(($prefix==0)and($suffix==0)))
-{
- if($prefix==0)
-  {
+while(!(($prefix==0)and($suffix==0))) {
+ if($prefix==0) {
    $pocet=$suffix;
    $Data.=fread($f,$pocet);
    $pocetb+=$pocet;
    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
   };
- if($prefix>0)
-  {
+ if($prefix>0) {
    $pocet=$prefix;
-   for($r=0;$r<$pocet;$r++)
-    $Data.=chr($suffix);
+   for($r=0;$r<$pocet;$r++) {
+       $Data.=chr($suffix);
+   }
   };
  $prefix=freadbyte($f);
  $suffix=freadbyte($f);
  $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
-};
+ if($echoit) {
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
+ }
+ };
 
-for($x=0;$x<strlen($Data);$x++)
- {
+for($x=0;$x<strlen($Data);$x++) {
   imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
  };
 $Data="";
@@ -318,15 +309,16 @@ 
 };
 
 
-if($RLECompression==2) //$BI_RLE4
+if($RLECompression==2) {
+    //$BI_RLE4
 {
 $y=$Height;
+}
 $pocetb=0;
 
 /*while(!feof($f))
  echo freadbyte($f)."_".freadbyte($f)."<BR>";*/
-while(true)
-{
+while(true) {
 //break;
 $y--;
 $prefix=freadbyte($f);
@@ -335,35 +327,37 @@ 
 
 $echoit=false;
 
-if($echoit)echo "Prefix: $prefix Suffix: $suffix<BR>";
-if(($prefix==0)and($suffix==1)) break;
-if(feof($f)) break;
+if($echoit) {
+    echo "Prefix: $prefix Suffix: $suffix<BR>";
+}
+if(($prefix==0)and($suffix==1)) {
+    break;
+}
+if(feof($f)) {
+    break;
+}
 
-while(!(($prefix==0)and($suffix==0)))
-{
- if($prefix==0)
-  {
+while(!(($prefix==0)and($suffix==0))) {
+ if($prefix==0) {
    $pocet=$suffix;
 
    $CurrentBit=0;
-   for($h=0;$h<$pocet;$h++)
-    $Data.=chr(freadbits($f,4));
-   if($CurrentBit!=0) freadbits($f,4);
+   for($h=0;$h<$pocet;$h++) {
+       $Data.=chr(freadbits($f,4));
+   }
+   if($CurrentBit!=0) {
+       freadbits($f,4);
+   }
    $pocetb+=ceil(($pocet/2));
    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
   };
- if($prefix>0)
-  {
+ if($prefix>0) {
    $pocet=$prefix;
    $i=0;
-   for($r=0;$r<$pocet;$r++)
-    {
-    if($i%2==0)
-     {
+   for($r=0;$r<$pocet;$r++) {
+    if($i%2==0) {
       $Data.=chr($suffix%16);
-     }
-     else
-     {
+     } else {
       $Data.=chr(floor($suffix/16));
      };
     $i++;
@@ -372,11 +366,12 @@ 
  $prefix=freadbyte($f);
  $suffix=freadbyte($f);
  $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
-};
+ if($echoit) {
+     echo "Prefix: $prefix Suffix: $suffix<BR>";
+ }
+ };
 
-for($x=0;$x<strlen($Data);$x++)
- {
+for($x=0;$x<strlen($Data);$x++) {
   imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
  };
 $Data="";
@@ -386,24 +381,24 @@ 
 };
 
 
- if($biBitCount==24)
-{
+ if($biBitCount==24) {
  $img=imagecreatetruecolor($Width,$Height);
  $Zbytek=$Width%4;
 
-   for($y=$Height-1;$y>=0;$y--)
-    {
-     for($x=0;$x<$Width;$x++)
-      {
+   for($y=$Height-1;$y>=0;$y--) {
+     for($x=0;$x<$Width;$x++) {
        $B=freadbyte($f);
        $G=freadbyte($f);
        $R=freadbyte($f);
        $color=imagecolorexact($img,$R,$G,$B);
-       if($color==-1) $color=imagecolorallocate($img,$R,$G,$B);
+       if($color==-1) {
+           $color=imagecolorallocate($img,$R,$G,$B);
+       }
        imagesetpixel($img,$x,$y,$color);
       }
-    for($z=0;$z<$Zbytek;$z++)
-     freadbyte($f);
+    for($z=0;$z<$Zbytek;$z++) {
+         freadbyte($f);
+    }
    };
 };
 return $img;
@@ -480,12 +475,9 @@ 
  $Byte=freadbyte($f);
  $LastCBit=$CurrentBit;
  $CurrentBit+=$count;
- if($CurrentBit==8)
-  {
+ if($CurrentBit==8) {
    $CurrentBit=0;
-  }
- else
-  {
+  } else {
    fseek($f,ftell($f)-1);
   };
  return RetBits($Byte,$LastCBit,$count);
@@ -494,10 +486,16 @@ 
 
 
 function RGBToHex($Red,$Green,$Blue)
-  {
-   $hRed=dechex($Red);if(strlen($hRed)==1) $hRed="0$hRed";
-   $hGreen=dechex($Green);if(strlen($hGreen)==1) $hGreen="0$hGreen";
-   $hBlue=dechex($Blue);if(strlen($hBlue)==1) $hBlue="0$hBlue";
+{
+   $hRed=dechex($Red);if(strlen($hRed)==1) {
+       $hRed="0$hRed";
+   }
+   $hGreen=dechex($Green);if(strlen($hGreen)==1) {
+       $hGreen="0$hGreen";
+   }
+   $hBlue=dechex($Blue);if(strlen($hBlue)==1) {
+       $hBlue="0$hBlue";
+   }
    return($hRed.$hGreen.$hBlue);
   };
 
@@ -520,8 +518,9 @@ 
 {
 $bin=decbin($d);
 $sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
+for($j=0;$j<$n-$sbin;$j++) {
  $bin="0$bin";
+}
 return $bin;
 };
 

htdocs/lib2/RSSParser.class.php

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
                                 // e.g. in SMF Forum Threads
                             } elseif (!in_array(htmlspecialchars_decode($item->title), $headlines) &&
                                 strpos($item->title, 'VERSCHOBEN') === false
-                            ) { // hack to exclude forum thread-move messages
+                            ) {
+// hack to exclude forum thread-move messages
                                 // fill array
                                 $rss[] = array(
                                     'pubDate' => date('Y-m-d', strtotime($item->pubDate)),

htdocs/lib2/search/search.map2.inc.php

Braces +2 added lines, -1 removed lines

@@ -67,7 +67,8 @@
     if (($rBounds = sql_fetch_assoc($rs)) && $rBounds['lat_min'] !== null /* >0 caches */) {
         if ($rBounds['lat_min'] == $rBounds['lat_max'] &&
             $rBounds['lon_min'] == $rBounds['lon_max']
-        ) { // 1 Cache
+        ) {
+// 1 Cache
             $halfwin = 0.02;
             $rBounds['lat_min'] -= $halfwin;
             $rBounds['lat_max'] += $halfwin;

htdocs/lib2/logic/cachelist.class.php

Braces +2 added lines, -1 removed lines

@@ -109,7 +109,8 @@
                 $this->getUserId(),
                 $this->getId(),
                 $name
-            )) {// $this->getId() is 0 when creating a new list -> condition has no effect
+            )) {
+// $this->getId() is 0 when creating a new list -> condition has no effect
                 return ERROR_DUPLICATE_LISTNAME;
             } elseif ($visibility >= 2 && strlen($name) < 10) {
                 return ERROR_BAD_LISTNAME;