OpencachingDeutschland / oc-server3

htdocs/restorecaches.php

Indentation +1 added lines, -1 removed lines

@@ -1011,7 +1011,7 @@
                             }
                             $logs_restored = true;
                         }
-                       // if it was not already restored by a later restore operation ...
+                        // if it was not already restored by a later restore operation ...
                     } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) {
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore

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/okapi_settings.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                            => !$opt['php']['semaphores'],  # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@ 
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     );
 }

htdocs/lib2/logic/logpics.class.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         global $login;
 
         $fields =
-          "`pics`.`uuid` AS `pic_uuid`,
+            "`pics`.`uuid` AS `pic_uuid`,
            `pics`.`url` AS `pic_url`,
            `pics`.`title`,
            `pics`.`date_created`,

htdocs/lib2/imagebmp.inc.php

Indentation +189 added lines, -189 removed lines

@@ -78,83 +78,83 @@ 
                 $sl1=strlen($ret);
                 if($CC==0) $CC=256;
                 if($BitCount<24)
-                   {
+                    {
                     $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                        if($IsTransparent) $ColorTotal--;
 
-                     for($p=0;$p<$ColorTotal;$p++)
-                     {
-                      $color=imagecolorsforindex($img,$p);
-                       $ret.=inttobyte($color["blue"]);
-                       $ret.=inttobyte($color["green"]);
-                       $ret.=inttobyte($color["red"]);
-                       $ret.=inttobyte(0); //RESERVED
-                     };
+                        for($p=0;$p<$ColorTotal;$p++)
+                        {
+                        $color=imagecolorsforindex($img,$p);
+                        $ret.=inttobyte($color["blue"]);
+                        $ret.=inttobyte($color["green"]);
+                        $ret.=inttobyte($color["red"]);
+                        $ret.=inttobyte(0); //RESERVED
+                        };
 
                     $CT=$ColorTotal;
-                  for($p=$ColorTotal;$p<$CC;$p++)
-                       {
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0); //RESERVED
-                     };
-                   };
+                    for($p=$ColorTotal;$p<$CC;$p++)
+                        {
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0);
+                        $ret.=inttobyte(0); //RESERVED
+                        };
+                    };
 
 
 if($BitCount<=8)
 {
 
- for($y=$Height-1;$y>=0;$y--)
- {
-  $bWrite="";
-  for($x=0;$x<$Width;$x++)
-   {
-   $color=imagecolorat($img,$x,$y);
-   $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
+    for($y=$Height-1;$y>=0;$y--)
+    {
+    $bWrite="";
+    for($x=0;$x<$Width;$x++)
     {
-     $retd.=inttobyte(bindec($bWrite));
-     $bWrite="";
+    $color=imagecolorat($img,$x,$y);
+    $bWrite.=decbinx($color,$BitCount);
+    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";
-     $retd.=inttobyte(bindec($bWrite));
+        $sl=strlen($bWrite);
+        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)
+    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)
-   {
-     $ret.=chr(0).chr(5).substr($retd,$t,5).chr(0);
-     $t+=1;
-   }
-   if(($t+6)%$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)
     {
-     $ret.=chr(0).chr(6).substr($retd,$t,6);
-     $t+=2;
+        $ret.=chr(0).chr(6).substr($retd,$t,6);
+        $t+=2;
     }
     else
     {
-     $ret.=chr(0).chr(4).substr($retd,$t,4);
+        $ret.=chr(0).chr(4).substr($retd,$t,4);
+    };
     };
-  };
-  $ret.=chr(0).chr(1);
+    $ret.=chr(0).chr(1);
 }
 else
 {
@@ -165,31 +165,31 @@ 
                 if($BitCount==24)
                 {
                 for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                    $Dopl.=chr(0);
 
                 for($y=$Height-1;$y>=0;$y--)
-                 {
-                 for($x=0;$x<$Width;$x++)
+                    {
+                    for($x=0;$x<$Width;$x++)
                         {
-                           $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
-                           $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
+                            $color=imagecolorsforindex($img,ImageColorAt($img,$x,$y));
+                            $ret.=chr($color["blue"]).chr($color["green"]).chr($color["red"]);
                         }
-                 $ret.=$Dopl;
-                 };
+                    $ret.=$Dopl;
+                    };
 
-                 };
+                    };
 
-  if($file!="")
-   {
+    if($file!="")
+    {
     $r=($f=fopen($file,"w"));
     $r=$r and fwrite($f,$ret);
     $r=$r and fclose($f);
     return $r;
-   }
-  else
-  {
-   echo $ret;
-  };
+    }
+    else
+    {
+    echo $ret;
+    };
 };
 
 
@@ -213,57 +213,57 @@ 
 
 if($Header=="BM")
 {
- $Size=freaddword($f);
- $Reserved1=freadword($f);
- $Reserved2=freadword($f);
- $FirstByteOfImage=freaddword($f);
-
- $SizeBITMAPINFOHEADER=freaddword($f);
- $Width=freaddword($f);
- $Height=freaddword($f);
- $biPlanes=freadword($f);
- $biBitCount=freadword($f);
- $RLECompression=freaddword($f);
- $WidthxHeight=freaddword($f);
- $biXPelsPerMeter=freaddword($f);
- $biYPelsPerMeter=freaddword($f);
- $NumberOfPalettesUsed=freaddword($f);
- $NumberOfImportantColors=freaddword($f);
+    $Size=freaddword($f);
+    $Reserved1=freadword($f);
+    $Reserved2=freadword($f);
+    $FirstByteOfImage=freaddword($f);
+
+    $SizeBITMAPINFOHEADER=freaddword($f);
+    $Width=freaddword($f);
+    $Height=freaddword($f);
+    $biPlanes=freadword($f);
+    $biBitCount=freadword($f);
+    $RLECompression=freaddword($f);
+    $WidthxHeight=freaddword($f);
+    $biXPelsPerMeter=freaddword($f);
+    $biYPelsPerMeter=freaddword($f);
+    $NumberOfPalettesUsed=freaddword($f);
+    $NumberOfImportantColors=freaddword($f);
 
 if($biBitCount<24)
- {
-  $img=imagecreate($Width,$Height);
-  $Colors=pow(2,$biBitCount);
-  for($p=0;$p<$Colors;$p++)
-   {
+    {
+    $img=imagecreate($Width,$Height);
+    $Colors=pow(2,$biBitCount);
+    for($p=0;$p<$Colors;$p++)
+    {
     $B=freadbyte($f);
     $G=freadbyte($f);
     $R=freadbyte($f);
     $Reserved=freadbyte($f);
     $Palette[]=imagecolorallocate($img,$R,$G,$B);
-   };
+    };
 
 
 
 
 if($RLECompression==0)
 {
-   $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
+    $Zbytek=(4-ceil(($Width/(8/$biBitCount)))%4)%4;
 
 for($y=$Height-1;$y>=0;$y--)
     {
-     $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
-      {
-         $C=freadbits($f,$biBitCount);
-       imagesetpixel($img,$x,$y,$Palette[$C]);
-      };
+        $CurrentBit=0;
+        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);
-     };
+        freadbyte($f);
+        };
 
- };
+    };
 };
 
 
@@ -288,29 +288,29 @@ 
 
 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)
-  {
-   $pocet=$prefix;
-   for($r=0;$r<$pocet;$r++)
+    if($prefix==0)
+    {
+    $pocet=$suffix;
+    $Data.=fread($f,$pocet);
+    $pocetb+=$pocet;
+    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+    };
+    if($prefix>0)
+    {
+    $pocet=$prefix;
+    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>";
+    };
+    $prefix=freadbyte($f);
+    $suffix=freadbyte($f);
+    $pocetb+=2;
+    if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
 for($x=0;$x<strlen($Data);$x++)
- {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
- };
+    {
+    imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+    };
 $Data="";
 
 };
@@ -341,44 +341,44 @@ 
 
 while(!(($prefix==0)and($suffix==0)))
 {
- if($prefix==0)
-  {
-   $pocet=$suffix;
+    if($prefix==0)
+    {
+    $pocet=$suffix;
 
-   $CurrentBit=0;
-   for($h=0;$h<$pocet;$h++)
+    $CurrentBit=0;
+    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)
-  {
-   $pocet=$prefix;
-   $i=0;
-   for($r=0;$r<$pocet;$r++)
+    if($CurrentBit!=0) freadbits($f,4);
+    $pocetb+=ceil(($pocet/2));
+    if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+    };
+    if($prefix>0)
+    {
+    $pocet=$prefix;
+    $i=0;
+    for($r=0;$r<$pocet;$r++)
     {
     if($i%2==0)
-     {
-      $Data.=chr($suffix%16);
-     }
-     else
-     {
-      $Data.=chr(floor($suffix/16));
-     };
+        {
+        $Data.=chr($suffix%16);
+        }
+        else
+        {
+        $Data.=chr(floor($suffix/16));
+        };
     $i++;
     };
-  };
- $prefix=freadbyte($f);
- $suffix=freadbyte($f);
- $pocetb+=2;
- if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
+    };
+    $prefix=freadbyte($f);
+    $suffix=freadbyte($f);
+    $pocetb+=2;
+    if($echoit) echo "Prefix: $prefix Suffix: $suffix<BR>";
 };
 
 for($x=0;$x<strlen($Data);$x++)
- {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
- };
+    {
+    imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+    };
 $Data="";
 
 };
@@ -386,25 +386,25 @@ 
 };
 
 
- if($biBitCount==24)
+    if($biBitCount==24)
 {
- $img=imagecreatetruecolor($Width,$Height);
- $Zbytek=$Width%4;
+    $img=imagecreatetruecolor($Width,$Height);
+    $Zbytek=$Width%4;
 
-   for($y=$Height-1;$y>=0;$y--)
+    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);
-       imagesetpixel($img,$x,$y,$color);
-      }
+        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);
+        imagesetpixel($img,$x,$y,$color);
+        }
     for($z=0;$z<$Zbytek;$z++)
-     freadbyte($f);
-   };
+        freadbyte($f);
+    };
 };
 return $img;
 
@@ -438,14 +438,14 @@ 
 
 function freadbyte($f)
 {
- return ord(fread($f,1));
+    return ord(fread($f,1));
 };
 
 function freadword($f)
 {
- $b1=freadbyte($f);
- $b2=freadbyte($f);
- return $b2*256+$b1;
+    $b1=freadbyte($f);
+    $b2=freadbyte($f);
+    return $b2*256+$b1;
 };
 
 
@@ -456,9 +456,9 @@ 
 
 function freaddword($f)
 {
- $b1=freadword($f);
- $b2=freadword($f);
- return $b2*65536+$b1;
+    $b1=freadword($f);
+    $b2=freadword($f);
+    return $b2*65536+$b1;
 };
 
 
@@ -476,30 +476,30 @@ 
 $CurrentBit=0;
 function freadbits($f,$count)
 {
- global $CurrentBit,$SMode;
- $Byte=freadbyte($f);
- $LastCBit=$CurrentBit;
- $CurrentBit+=$count;
- if($CurrentBit==8)
-  {
-   $CurrentBit=0;
-  }
- else
-  {
-   fseek($f,ftell($f)-1);
-  };
- return RetBits($Byte,$LastCBit,$count);
+    global $CurrentBit,$SMode;
+    $Byte=freadbyte($f);
+    $LastCBit=$CurrentBit;
+    $CurrentBit+=$count;
+    if($CurrentBit==8)
+    {
+    $CurrentBit=0;
+    }
+    else
+    {
+    fseek($f,ftell($f)-1);
+    };
+    return RetBits($Byte,$LastCBit,$count);
 };
 
 
 
 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";
-   return($hRed.$hGreen.$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);
+    };
 
         function int_to_dword($n)
         {
@@ -521,7 +521,7 @@ 
 $bin=decbin($d);
 $sbin=strlen($bin);
 for($j=0;$j<$n-$sbin;$j++)
- $bin="0$bin";
+    $bin="0$bin";
 return $bin;
 };
 

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/error.inc.php

Indentation +27 added lines, -27 removed lines

@@ -7,34 +7,34 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);

htdocs/lang/de/ocstyle/newcache.inc.php

Indentation +34 added lines, -34 removed lines

@@ -14,40 +14,40 @@
  * set template specific language variables
  ****************************************************************************/
 
- $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
-
- $submit = t('Submit cache');
- $default_country = t('EN');
- $default_lang = t('EN');
- $show_all = t('Show all');
- $default_NS = 'N';
- $default_EW = 'E';
- $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
-
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
- $error_lat_not_ok = $error_long_not_ok . "<br />";
- $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
-
- $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
-
- $sel_message = t('Select');
-
- $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
- $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
-
- $cache_attrib_group =
+    $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
+
+    $submit = t('Submit cache');
+    $default_country = t('EN');
+    $default_lang = t('EN');
+    $show_all = t('Show all');
+    $default_NS = 'N';
+    $default_EW = 'E';
+    $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
+
+    $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
+    $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
+    $error_lat_not_ok = $error_long_not_ok . "<br />";
+    $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
+    $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
+    $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
+    $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
+    $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
+    $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
+    $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
+    $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
+    $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
+    $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
+    $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
+    $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
+
+    $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
+
+    $sel_message = t('Select');
+
+    $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
+    $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
+
+    $cache_attrib_group =
     '<div class="attribgroup"><table cellspacing="0" style="display:inline;border-spacing:0px;">
          <tr><td bgcolor="{color}" style="line-height:9px;padding-top:2px;margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-top:1px solid gray;"><font size="1">{name}</font></td></tr>
          <tr><td bgcolor="#F8F8F8" style="margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-bottom:1px solid gray;">{attribs}</td></tr>

htdocs/lang/de/ocstyle/removelog.inc.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
         
  ****************************************************************************/
 
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
- $removed_message_end = '---';
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
+    $removed_message_end = '---';
  
 
 function removed_log_subject($lang)

htdocs/lang/de/ocstyle/removedesc.inc.php

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@
      
  ****************************************************************************/
  
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
 
- $commit = t('the cache description has been deleted');
- $commit_title = t('delete this cache-description');
+    $commit = t('the cache description has been deleted');
+    $commit_title = t('delete this cache-description');

htdocs/lang/de/ocstyle/varset.inc.php

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 $error_suffix = '</span>';
 
 $htmlnotice =
- '<tr><td class="spacer" colspan="2"></td></tr>
+    '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
             <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />