OpencachingDeutschland / oc-server3

htdocs/lib2/imagebmp.inc.php

Spacing +234 added lines, -234 removed lines

@@ -26,164 +26,164 @@ 
 *           Returns: if $file specified - true if OK
                      if $file not specified - image data
 */
-function imagebmp($img,$file="",$RLE=0)
+function imagebmp($img, $file = "", $RLE = 0)
 {
 
 
-$ColorCount=imagecolorstotal($img);
+$ColorCount = imagecolorstotal($img);
 
-$Transparent=imagecolortransparent($img);
-$IsTransparent=$Transparent!=-1;
+$Transparent = imagecolortransparent($img);
+$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;};
-if(($ColorCount>2)and($ColorCount<=16)) { $ColorCount=16; $BitCount=4;};
-if(($ColorCount>16)and($ColorCount<=256)) { $ColorCount=0; $BitCount=8;};
+if ($ColorCount == 0) {$ColorCount = 0; $BitCount = 24; };
+if (($ColorCount > 0) and ($ColorCount <= 2)) {$ColorCount = 2; $BitCount = 1; };
+if (($ColorCount > 2) and ($ColorCount <= 16)) { $ColorCount = 16; $BitCount = 4; };
+if (($ColorCount > 16) and ($ColorCount <= 256)) { $ColorCount = 0; $BitCount = 8; };
 
 
-                $Width=imagesx($img);
-                $Height=imagesy($img);
+                $Width = imagesx($img);
+                $Height = imagesy($img);
 
-                $Zbytek=(4-($Width/(8/$BitCount))%4)%4;
+                $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;
-                $offset=54+$palsize;
+                $size = (floor($Width / (8 / $BitCount)) + $Zbytek) * $Height + 54;
+                $size += $palsize;
+                $offset = 54 + $palsize;
 
                 // Bitmap File Header
-                $ret = 'BM';                        // header (2b)
-                $ret .= int_to_dword($size);        // size of file (4b)
-                $ret .= int_to_dword(0);        // reserved (4b)
-                $ret .= int_to_dword($offset);        // byte location in the file which is first byte of IMAGE (4b)
+                $ret = 'BM'; // header (2b)
+                $ret .= int_to_dword($size); // size of file (4b)
+                $ret .= int_to_dword(0); // reserved (4b)
+                $ret .= int_to_dword($offset); // byte location in the file which is first byte of IMAGE (4b)
                 // Bitmap Info Header
-                $ret .= int_to_dword(40);        // Size of BITMAPINFOHEADER (4b)
-                $ret .= int_to_dword($Width);        // width of bitmap (4b)
-                $ret .= int_to_dword($Height);        // height of bitmap (4b)
-                $ret .= int_to_word(1);        // biPlanes = 1 (2b)
-                $ret .= int_to_word($BitCount);        // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
-                $ret .= int_to_dword($RLE);        // RLE COMPRESSION (4b)
-                $ret .= int_to_dword(0);        // width x height (4b)
-                $ret .= int_to_dword(0);        // biXPelsPerMeter (4b)
-                $ret .= int_to_dword(0);        // biYPelsPerMeter (4b)
-                $ret .= int_to_dword(0);        // Number of palettes used (4b)
-                $ret .= int_to_dword(0);        // Number of important colour (4b)
+                $ret .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
+                $ret .= int_to_dword($Width); // width of bitmap (4b)
+                $ret .= int_to_dword($Height); // height of bitmap (4b)
+                $ret .= int_to_word(1); // biPlanes = 1 (2b)
+                $ret .= int_to_word($BitCount); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b)
+                $ret .= int_to_dword($RLE); // RLE COMPRESSION (4b)
+                $ret .= int_to_dword(0); // width x height (4b)
+                $ret .= int_to_dword(0); // biXPelsPerMeter (4b)
+                $ret .= int_to_dword(0); // biYPelsPerMeter (4b)
+                $ret .= int_to_dword(0); // Number of palettes used (4b)
+                $ret .= int_to_dword(0); // Number of important colour (4b)
                 // image data
 
-                $CC=$ColorCount;
-                $sl1=strlen($ret);
-                if($CC==0) $CC=256;
-                if($BitCount<24)
+                $CC = $ColorCount;
+                $sl1 = strlen($ret);
+                if ($CC == 0) $CC = 256;
+                if ($BitCount < 24)
                    {
-                    $ColorTotal=imagecolorstotal($img);
-                     if($IsTransparent) $ColorTotal--;
+                    $ColorTotal = imagecolorstotal($img);
+                     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"]);
-                       $ret.=inttobyte($color["red"]);
-                       $ret.=inttobyte(0); //RESERVED
+                      $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++)
+                    $CT = $ColorTotal;
+                  for ($p = $ColorTotal; $p < $CC; $p++)
                        {
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0);
-                      $ret.=inttobyte(0); //RESERVED
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0);
+                      $ret .= inttobyte(0); //RESERVED
                      };
                    };
 
 
-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++)
+  $bWrite = "";
+  for ($x = 0; $x < $Width; $x++)
    {
-   $color=imagecolorat($img,$x,$y);
-   $bWrite.=decbinx($color,$BitCount);
-   if(strlen($bWrite)==8)
+   $color = imagecolorat($img, $x, $y);
+   $bWrite .= decbinx($color, $BitCount);
+   if (strlen($bWrite) == 8)
     {
-     $retd.=inttobyte(bindec($bWrite));
-     $bWrite="";
+     $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))
+if (($RLE == 1) and ($BitCount == 8))
 {
- for($t=0;$t<strlen($retd);$t+=4)
+ for ($t = 0; $t < strlen($retd); $t += 4)
   {
-   if($t!=0)
-   if(($t)%$Width==0)
-    $ret.=chr(0).chr(0);
+   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;
+     $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;
+     $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
 {
-$ret.=$retd;
+$ret .= $retd;
 };
 
 
-                if($BitCount==24)
+                if ($BitCount == 24)
                 {
-                for($z=0;$z<$Zbytek;$z++)
-                 $Dopl.=chr(0);
+                for ($z = 0; $z < $Zbytek; $z++)
+                 $Dopl .= chr(0);
 
-                for($y=$Height-1;$y>=0;$y--)
+                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);
+    $r = ($f = fopen($file, "w"));
+    $r = $r and fwrite($f, $ret);
+    $r = $r and fclose($f);
     return $r;
    }
   else
@@ -208,58 +208,58 @@ 
 {
 global  $CurrentBit, $echoMode;
 
-$f=fopen($file,"r");
-$Header=fread($f,2);
+$f = fopen($file, "r");
+$Header = fread($f, 2);
 
-if($Header=="BM")
+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);
-
-if($biBitCount<24)
+ $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);
+    $B = freadbyte($f);
+    $G = freadbyte($f);
+    $R = freadbyte($f);
+    $Reserved = freadbyte($f);
+    $Palette[] = imagecolorallocate($img, $R, $G, $B);
    };
 
 
 
 
-if($RLECompression==0)
+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--)
+for ($y = $Height - 1; $y >= 0; $y--)
     {
-     $CurrentBit=0;
-     for($x=0;$x<$Width;$x++)
+     $CurrentBit = 0;
+     for ($x = 0; $x < $Width; $x++)
       {
-         $C=freadbits($f,$biBitCount);
-       imagesetpixel($img,$x,$y,$Palette[$C]);
+         $C = freadbits($f, $biBitCount);
+       imagesetpixel($img, $x, $y, $Palette[$C]);
       };
-    if($CurrentBit!=0) {freadbyte($f);};
-    for($g=0;$g<$Zbytek;$g++)
+    if ($CurrentBit != 0) {freadbyte($f); };
+    for ($g = 0; $g < $Zbytek; $g++)
      freadbyte($f);
      };
 
@@ -267,142 +267,142 @@ 
 };
 
 
-if($RLECompression==1) //$BI_RLE8
+if ($RLECompression == 1) //$BI_RLE8
 {
-$y=$Height;
+$y = $Height;
 
-$pocetb=0;
+$pocetb = 0;
 
-while(true)
+while (true)
 {
 $y--;
-$prefix=freadbyte($f);
-$suffix=freadbyte($f);
-$pocetb+=2;
+$prefix = freadbyte($f);
+$suffix = freadbyte($f);
+$pocetb += 2;
 
-$echoit=false;
+$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)))
+while (!(($prefix == 0) and ($suffix == 0)))
 {
- if($prefix==0)
+ if ($prefix == 0)
   {
-   $pocet=$suffix;
-   $Data.=fread($f,$pocet);
-   $pocetb+=$pocet;
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+   $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);
+   $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++)
+for ($x = 0; $x < strlen($Data); $x++)
  {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+  imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
  };
-$Data="";
+$Data = "";
 
 };
 
 };
 
 
-if($RLECompression==2) //$BI_RLE4
+if ($RLECompression == 2) //$BI_RLE4
 {
-$y=$Height;
-$pocetb=0;
+$y = $Height;
+$pocetb = 0;
 
 /*while(!feof($f))
  echo freadbyte($f)."_".freadbyte($f)."<BR>";*/
-while(true)
+while (true)
 {
 //break;
 $y--;
-$prefix=freadbyte($f);
-$suffix=freadbyte($f);
-$pocetb+=2;
+$prefix = freadbyte($f);
+$suffix = freadbyte($f);
+$pocetb += 2;
 
-$echoit=false;
+$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)))
+while (!(($prefix == 0) and ($suffix == 0)))
 {
- if($prefix==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);
-   $pocetb+=ceil(($pocet/2));
-   if($pocetb%2==1) {freadbyte($f); $pocetb++;};
+   $pocet = $suffix;
+
+   $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)
+ if ($prefix > 0)
   {
-   $pocet=$prefix;
-   $i=0;
-   for($r=0;$r<$pocet;$r++)
+   $pocet = $prefix;
+   $i = 0;
+   for ($r = 0; $r < $pocet; $r++)
     {
-    if($i%2==0)
+    if ($i % 2 == 0)
      {
-      $Data.=chr($suffix%16);
+      $Data .= chr($suffix % 16);
      }
      else
      {
-      $Data.=chr(floor($suffix/16));
+      $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++)
+for ($x = 0; $x < strlen($Data); $x++)
  {
-  imagesetpixel($img,$x,$y,$Palette[ord($Data[$x])]);
+  imagesetpixel($img, $x, $y, $Palette[ord($Data[$x])]);
  };
-$Data="";
+$Data = "";
 
 };
 
 };
 
 
- 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++)
+     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);
+       $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++)
+    for ($z = 0; $z < $Zbytek; $z++)
      freadbyte($f);
    };
 };
@@ -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,48 +456,48 @@ 
 
 function freaddword($f)
 {
- $b1=freadword($f);
- $b2=freadword($f);
- return $b2*65536+$b1;
+ $b1 = freadword($f);
+ $b2 = freadword($f);
+ return $b2 * 65536 + $b1;
 };
 
 
 
-function RetBits($byte,$start,$len)
+function RetBits($byte, $start, $len)
 {
-$bin=decbin8($byte);
-$r=bindec(substr($bin,$start,$len));
+$bin = decbin8($byte);
+$r = bindec(substr($bin, $start, $len));
 return $r;
 
 };
 
 
 
-$CurrentBit=0;
-function freadbits($f,$count)
+$CurrentBit = 0;
+function freadbits($f, $count)
 {
- global $CurrentBit,$SMode;
- $Byte=freadbyte($f);
- $LastCBit=$CurrentBit;
- $CurrentBit+=$count;
- if($CurrentBit==8)
+ global $CurrentBit, $SMode;
+ $Byte = freadbyte($f);
+ $LastCBit = $CurrentBit;
+ $CurrentBit += $count;
+ if ($CurrentBit == 8)
   {
-   $CurrentBit=0;
+   $CurrentBit = 0;
   }
  else
   {
-   fseek($f,ftell($f)-1);
+   fseek($f, ftell($f) - 1);
   };
- return RetBits($Byte,$LastCBit,$count);
+ return RetBits($Byte, $LastCBit, $count);
 };
 
 
 
-function RGBToHex($Red,$Green,$Blue)
+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);
   };
 
@@ -513,15 +513,15 @@ 
 
 function decbin8($d)
 {
-return decbinx($d,8);
+return decbinx($d, 8);
 };
 
-function decbinx($d,$n)
+function decbinx($d, $n)
 {
-$bin=decbin($d);
-$sbin=strlen($bin);
-for($j=0;$j<$n-$sbin;$j++)
- $bin="0$bin";
+$bin = decbin($d);
+$sbin = strlen($bin);
+for ($j = 0; $j < $n - $sbin; $j++)
+ $bin = "0$bin";
 return $bin;
 };
 

htdocs/lib2/cookie.class.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
             if (isset($_REQUEST['SESSION']) && $_REQUEST['SESSION'] != '') {
                 $this->init_session();
             }
-        } elseif (isset($_COOKIE[$opt['session']['cookiename'] . 'data'])) {
+        } elseif (isset($_COOKIE[$opt['session']['cookiename'].'data'])) {
             //get the cookievars-array
-            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'] . 'data']);
+            $decoded = base64_decode($_COOKIE[$opt['session']['cookiename'].'data']);
 
             if ($decoded !== false) {
                 $this->values = @unserialize($decoded);
@@ -51,7 +51,7 @@ 
 
             if ($opt['session']['check_referer']) {
                 if (isset($_SERVER['REFERER'])) {
-                    if (strtolower(substr('http' + strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
+                    if (strtolower(substr('http' +strstr($_SERVER['REFERER'], '://'), 0, strlen($opt['page']['absolute_http_url']))) != strtolower($opt['page']['absolute_http_url'])) {
                         $this->createNewSession();
                     }
                 }
@@ -168,7 +168,7 @@ 
             if ($this->changed == true) {
                 if (count($this->values) == 0) {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         false,
                         time() + 31536000,
                         $opt['session']['path'],
@@ -177,7 +177,7 @@ 
                     );
                 } else {
                     setcookie(
-                        $opt['session']['cookiename'] . 'data',
+                        $opt['session']['cookiename'].'data',
                         base64_encode(serialize($this->values)),
                         time() + 31536000,
                         $opt['session']['path'],

htdocs/lib2/charset.inc.php

Spacing +6 added lines, -6 removed lines

@@ -9,9 +9,9 @@ 
 
 
 // replacement table for Unicode 0x100 to 0x1FF
-$utf_xlatin = "A a A a A a C c C c C c C c D d D d E e E e E e E e E e G g G g " .
-    "G g G g H h H h I i I i I i I i I i IJijJ j K k K L l L l L l L " .
-    "l L l N n N n N n n n n O o O o Ö ö OEoeR r R r R r S s S s S s " .
+$utf_xlatin = "A a A a A a C c C c C c C c D d D d E e E e E e E e E e G g G g ".
+    "G g G g H h H h I i I i I i I i I i IJijJ j K k K L l L l L l L ".
+    "l L l N n N n N n n n n O o O o Ö ö OEoeR r R r R r S s S s S s ".
     "S s T t T t T t U u U u U u U u Ü ü U u W w Y y Y Z z Z z Z z   ";
 
 // replacement table for Unicode 0x2000 to 0x203F
@@ -28,11 +28,11 @@ 
     $result = "";
 
     while ($pos < strlen($s)) {
-        $c1 = ord($s[$pos ++]);
+        $c1 = ord($s[$pos++]);
         if ($c1 < 0xC0) {
             $result .= chr($c1);
         } elseif ($pos < strlen($s)) {
-            $c2 = ord($s[$pos ++]);
+            $c2 = ord($s[$pos++]);
             if ($c1 < 0xE0) {
                 $code = 0x40 * ($c1 & 0x1F) + ($c2 & 0x3F);
                 if ($code < 0x100) {
@@ -46,7 +46,7 @@ 
                     $result .= "?";
                 }
             } elseif ($pos < strlen($s)) {
-                $c3 = ord($s[$pos ++]);
+                $c3 = ord($s[$pos++]);
                 $code = 0x1000 * ($c1 & 0x0F) + 0x40 * ($c2 & 0x3F) + ($c3 & 0x3F);
                 switch ($code) {
                     case 0x2026:

htdocs/lib2/const.inc.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  *  Constant definitions
  ***************************************************************************/
 
-require_once __DIR__ . '/../lib/consts-common.inc.php';
+require_once __DIR__.'/../lib/consts-common.inc.php';
 
 define('DEBUG_NO', 0);
 define('DEBUG_DEVELOPER', 1);

htdocs/lib2/translationHandler.class.php

Spacing +20 added lines, -20 removed lines

@@ -32,20 +32,20 @@ 
             return;
         }
 
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower)) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower);
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower)) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower);
         }
-        if (!is_dir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES')) {
-            mkdir($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES');
+        if (!is_dir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES')) {
+            mkdir($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES');
         }
 
-        $f = fopen($opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po', 'w');
+        $f = fopen($opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po', 'w');
 
-        fwrite($f, 'msgid ""' . "\n");
-        fwrite($f, 'msgstr ""' . "\n");
-        fwrite($f, '"MIME-Version: 1.0\n"' . "\n");
-        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"' . "\n");
-        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"' . "\n");
+        fwrite($f, 'msgid ""'."\n");
+        fwrite($f, 'msgstr ""'."\n");
+        fwrite($f, '"MIME-Version: 1.0\n"'."\n");
+        fwrite($f, '"Content-Type: text/plain; charset=UTF-8\n"'."\n");
+        fwrite($f, '"Content-Transfer-Encoding: 8bit\n"'."\n");
         fwrite($f, "\n");
 
         // English texts in sys_trans_text are more up-to-date than the original translation
@@ -66,10 +66,10 @@ 
         );
 
         $variables = array();
-        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'] . '.txt', $language_lower);
+        $this->loadNodeTextFile($variables, $opt['logic']['node']['id'].'.txt', $language_lower);
         $this->loadNodeTextFile(
             $variables,
-            $opt['logic']['node']['id'] . '-' . $language_lower . '.txt',
+            $opt['logic']['node']['id'].'-'.$language_lower.'.txt',
             $language_lower
         );
 
@@ -78,8 +78,8 @@ 
             if ($trans !== null && $trans != $r['text']) {
                 $trans = $this->substitueVariables($variables, $language_lower, $trans);
 
-                fwrite($f, 'msgid "' . $this->escape_text($r['text']) . '"' . "\n");
-                fwrite($f, 'msgstr "' . $this->escape_text($trans) . '"' . "\n");
+                fwrite($f, 'msgid "'.$this->escape_text($r['text']).'"'."\n");
+                fwrite($f, 'msgstr "'.$this->escape_text($trans).'"'."\n");
                 fwrite($f, "\n");
             }
         }
@@ -89,10 +89,10 @@ 
 
         try {
             exec(
-                'msgfmt -o ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.mo'
-                ) . ' ' . escapeshellcmd(
-                    $opt['rootpath'] . 'cache2/translate/' . $language_lower . '/LC_MESSAGES/messages.po'
+                'msgfmt -o '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.mo'
+                ).' '.escapeshellcmd(
+                    $opt['rootpath'].'cache2/translate/'.$language_lower.'/LC_MESSAGES/messages.po'
                 )
             );
         } catch (Exception $e) {
@@ -189,7 +189,7 @@ 
             sqlf(
                 "INSERT IGNORE INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('&1', '&2', 0)",
                 $lastId,
-                'table:' . $table . ';field=' . $fname
+                'table:'.$table.';field='.$fname
             );
         }
         sql_free_result($rs);
@@ -211,7 +211,7 @@ 
         // generic load
         global $opt;
 
-        $filename = $opt['rootpath'] . '/config2/nodetext/' . $file;
+        $filename = $opt['rootpath'].'/config2/nodetext/'.$file;
         if (file_exists($filename)) {
             $fhandle = fopen($filename, 'r');
 

htdocs/lib2/edithelper.inc.php

Spacing +4 added lines, -4 removed lines

@@ -83,10 +83,10 @@ 
         $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
     } else {
         // convert smilies ...
-        for ($n = 0; $n < count($smiley['image']); $n ++) {
+        for ($n = 0; $n < count($smiley['image']); $n++) {
             $text = mb_ereg_replace(
-                "<img [^>]*?src=[^>]+?" . str_replace('.', '\.', $smiley['file'][$n]) . "[^>]+?>",
-                "[s![" . $smiley['text'][$n] . "]!s]",
+                "<img [^>]*?src=[^>]+?".str_replace('.', '\.', $smiley['file'][$n])."[^>]+?>",
+                "[s![".$smiley['text'][$n]."]!s]",
                 $text
             );
             // the [s[ ]s] is needed to protect the spaces around the smileys
@@ -118,5 +118,5 @@ 
 
 function editorJsPath()
 {
-    return 'resource2/ocstyle/js/editor.js?ft=' . filemtime('resource2/ocstyle/js/editor.js');
+    return 'resource2/ocstyle/js/editor.js?ft='.filemtime('resource2/ocstyle/js/editor.js');
 }

htdocs/lib2/translateAccess.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require_once __DIR__ . '/logic/const.inc.php';
+require_once __DIR__.'/logic/const.inc.php';
 
 class translateAccess
 {

htdocs/lib2/common.inc.php

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  *  TODO: accept-language des Browser auswerten
  ***************************************************************************/
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 function __autoload($class_name)
 {
@@ -20,8 +20,8 @@ 
         return;
     }
 
-    $file1 = $opt['rootpath'] . 'lib2/' . $class_name . '.class.php';
-    $file2 = $opt['rootpath'] . 'lib2/logic/' . $class_name . '.class.php';
+    $file1 = $opt['rootpath'].'lib2/'.$class_name.'.class.php';
+    $file2 = $opt['rootpath'].'lib2/logic/'.$class_name.'.class.php';
     if (file_exists($file1)) {
         require_once $file1;
     } elseif (file_exists($file2)) {
@@ -43,9 +43,9 @@ 
 mb_regex_encoding('UTF-8');
 
 // set options
-require_once $opt['rootpath'] . 'config2/settings-dist.inc.php';
-require_once $opt['rootpath'] . 'config2/settings.inc.php';
-require_once $opt['rootpath'] . 'config2/verify-settings.inc.php';
+require_once $opt['rootpath'].'config2/settings-dist.inc.php';
+require_once $opt['rootpath'].'config2/settings.inc.php';
+require_once $opt['rootpath'].'config2/verify-settings.inc.php';
 
 foreach ($opt['page']['banned_user_agents'] as $ua) {
     if (strpos($useragent, $ua) !== false) {
@@ -69,10 +69,10 @@ 
     }
 }
 
-require_once $opt['rootpath'] . 'lib2/errorhandler.inc.php';
+require_once $opt['rootpath'].'lib2/errorhandler.inc.php';
 configure_php();
 
-require $opt['rootpath'] . 'lib2/cookie.class.php';
+require $opt['rootpath'].'lib2/cookie.class.php';
 normalize_settings();
 set_language();
 set_usercountry();
@@ -85,30 +85,30 @@ 
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 
-    if (!is_dir($opt['rootpath'] . 'templates2/' . $opt['template']['style'])) {
+    if (!is_dir($opt['rootpath'].'templates2/'.$opt['template']['style'])) {
         $opt['template']['style'] = $opt['template']['default']['style'];
     }
 } else {
     $opt['template']['style'] = $opt['template']['default']['style'];
 }
-$opt['stylepath'] = $opt['rootpath'] . 'templates2/' . $opt['template']['style'] . '/';
+$opt['stylepath'] = $opt['rootpath'].'templates2/'.$opt['template']['style'].'/';
 
 check_useragent();
 
 /* setup smarty
  *
  */
-require $opt['rootpath'] . 'lib2/OcSmarty.class.php';
+require $opt['rootpath'].'lib2/OcSmarty.class.php';
 $tpl = new OcSmarty();
 
 // include all we need
-require_once $opt['rootpath'] . 'lib2/logic/const.inc.php';
-require_once $opt['rootpath'] . 'lib2/error.inc.php';
-require_once $opt['rootpath'] . 'lib2/util.inc.php';
-require_once $opt['rootpath'] . 'lib2/db.inc.php';
-require_once $opt['rootpath'] . 'lib2/login.class.php';
-require_once $opt['rootpath'] . 'lib2/menu.class.php';
-require_once $opt['rootpath'] . 'lib2/logic/labels.inc.php';
+require_once $opt['rootpath'].'lib2/logic/const.inc.php';
+require_once $opt['rootpath'].'lib2/error.inc.php';
+require_once $opt['rootpath'].'lib2/util.inc.php';
+require_once $opt['rootpath'].'lib2/db.inc.php';
+require_once $opt['rootpath'].'lib2/login.class.php';
+require_once $opt['rootpath'].'lib2/menu.class.php';
+require_once $opt['rootpath'].'lib2/logic/labels.inc.php';
 // require_once $opt['rootpath'] . 'lib2/throttle.inc.php';
 
 // apply post configuration
@@ -123,7 +123,7 @@ 
     $login->userid > 0 &&
     sql_value("SELECT `email_problems` FROM `user` WHERE `user_id`='&1'", 0, $login->userid) != 0
 ) {
-    header("Location: verifyemail.php?page=" . basename($_SERVER['REQUEST_URI']));
+    header("Location: verifyemail.php?page=".basename($_SERVER['REQUEST_URI']));
     exit;
 }
 
@@ -148,7 +148,7 @@ 
     }
 
     if (isset($opt['logic']['cachemaps']['wmsurl']) && strstr($opt['logic']['cachemaps']['wmsurl'], '://')) {
-        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'] . strstr(
+        $opt['logic']['cachemaps']['wmsurl'] = $opt['page']['protocol'].strstr(
                 $opt['logic']['cachemaps']['wmsurl'],
                 '://'
             );
@@ -236,7 +236,7 @@ 
         $cookie->set('locale', $opt['template']['locale'], $opt['template']['default']['locale']);
     }
 
-    bindtextdomain('messages', $opt['rootpath'] . 'cache2/translate');
+    bindtextdomain('messages', $opt['rootpath'].'cache2/translate');
     set_php_locale();
     textdomain('messages');
 }
@@ -277,13 +277,13 @@ 
     if (strtolower(substr($url, 0, strlen($opt['page']['absolute_http_url']))) == $opt['page']['absolute_http_url']
         && $opt['page']['https']['active']
     ) {
-        return 'https' . strstr($url, '://');
+        return 'https'.strstr($url, '://');
     } elseif (strtolower(
             substr($url, 0, strlen($opt['page']['absolute_https_url']))
         ) == $opt['page']['absolute_https_url']
         && !$opt['page']['https']['active']
     ) {
-        return 'http' . strstr($url, '://');
+        return 'http'.strstr($url, '://');
     } else {
         return $url;
     }

htdocs/lib2/sqldebugger.class.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
  *  This modules gives you a very usefull SQL debugger for MySQL ...
  ***************************************************************************/
 
-require_once $opt['rootpath'] . 'lib2/bench.inc.php';
+require_once $opt['rootpath'].'lib2/bench.inc.php';
 
 $sqldebugger = new sqldebugger();
 
@@ -48,7 +48,7 @@ 
         $command['mode'] = $db['mode'];
         $command['slave'] = $bQuerySlave;
         $command['server'] = $sServer;
-        $command['dblink'] = '' . $dblink;
+        $command['dblink'] = ''.$dblink;
 
         $bUseExplain = false;
         $sql = trim($sql);
@@ -74,11 +74,11 @@ 
                     break;
                 }
                 $command['result'][] = $r;
-                $c ++;
+                $c++;
             }
             sql_free_result($rs);
 
-            $rs = mysql_query('EXPLAIN EXTENDED ' . $sqlexplain, $dblink);
+            $rs = mysql_query('EXPLAIN EXTENDED '.$sqlexplain, $dblink);
             while ($r = sql_fetch_assoc($rs)) {
                 $command['explain'][] = $r;
             }
@@ -126,13 +126,13 @@ 
             return '';
         }
 
-        return 'SELECT * ' . substr($sql, $start);
+        return 'SELECT * '.substr($sql, $start);
     }
 
     public function insert_nocache($sql)
     {
         if (strtoupper(substr($sql, 0, 7)) == 'SELECT ') {
-            $sql = 'SELECT SQL_NO_CACHE ' . substr($sql, 7);
+            $sql = 'SELECT SQL_NO_CACHE '.substr($sql, 7);
         }
 
         return $sql;