OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cache.class.php

Spacing +3 added lines, -3 removed lines

@@ -521,7 +521,7 @@ 
                 if (!$newcoord) {
                     $newcoord = $coords[$coordpos];
                 }
-                ++ $coordpos;
+                ++$coordpos;
             }
             if ($newcoord) {
                 $distance = geomath::calcDistance(
@@ -554,7 +554,7 @@ 
             $original = count($coords) - 1;
             $lastlogdate = $logs[count($logs) - 1]['order_date'];
             while ($original > 0 && $coords[$original - 1]['date'] < $lastlogdate) {
-                -- $original;
+                --$original;
             }
             $coord = new coordinate($coords[$original]['latitude'], $coords[$original]['longitude']);
             $logs[] = [
@@ -955,7 +955,7 @@ 
             $logTypes[$i]['selected'] = ($logtype == $defaultLogType) ? true : false;
             $logTypes[$i]['name'] = $logtypeNames[$logtype];
             $logTypes[$i]['id'] = $logtype;
-            $i ++;
+            $i++;
         }
 
         // return

htdocs/lib2/logic/cracklib.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
     // min. 4 different chars
     $chars = array();
-    for ($i = 0; $i < mb_strlen($pw); $i ++) {
+    for ($i = 0; $i < mb_strlen($pw); $i++) {
         $chars[mb_substr($pw, $i, 1)] = true;
     }
 

htdocs/lib2/logic/mailcheck.class.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
     public $sFrom = 'postmaster@somehost.org';
 
     public $nConnectTimeout = 15; // (sec)
-    public $nReadTimeout = 25;   // (sec)
+    public $nReadTimeout = 25; // (sec)
 
     /* check if the mailserver of $sAddress
      * explicit says that the user does not exist
@@ -50,7 +50,7 @@ 
 
         // sort MX records
         $mxs = [];
-        for ($i = 0; $i < count($mx_records); $i ++) {
+        for ($i = 0; $i < count($mx_records); $i++) {
             $mxs[$i] = [
                 'mx' => $mx_records[$i],
                 'prio' => $mx_weight[$i]
@@ -60,7 +60,7 @@ 
         reset($mxs);
 
         // check address with each MX until one mailserver can be connected
-        for ($i = 0; $i < count($mxs); $i ++) {
+        for ($i = 0; $i < count($mxs); $i++) {
             $retval = $this->pCheckAddress($sAddress, $mxs[$i]['mx']);
             if ($retval != CA_ERROR_CONNECT) {
                 return $retval;
@@ -169,7 +169,7 @@ 
         $s = "";
         stream_set_timeout($fp, $this->nReadTimeout);
 
-        for ($i = 0; $i < 2; $i ++) {
+        for ($i = 0; $i < 2; $i++) {
             $s .= fgets($fp, 1024);
         }
 
@@ -183,5 +183,5 @@ 
         return 0;
     }
 
-    return (($a['prio'] + 0) < ($b['prio'] + 0)) ? - 1 : 1;
+    return (($a['prio'] + 0) < ($b['prio'] + 0)) ? -1 : 1;
 }

htdocs/lib2/RSSParser.class.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
                                     'description' => $item->description
                                 );
                                 // increment counter
-                                $i ++;
+                                $i++;
                                 // htmlspecialchars_decode() works around inconsistent HTML encoding
                                 // e.g. in SMF Forum Threads
                             } elseif (!in_array(htmlspecialchars_decode($item->title), $headlines) &&
@@ -80,7 +80,7 @@ 
                                 );
                                 $headlines[] = "" . htmlspecialchars_decode($item->title);
                                 // increment counter
-                                $i ++;
+                                $i++;
                             }
                         }
                     }

htdocs/lib2/translate.class.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function t($message, $style, $resource_name, $line, $plural = '', $count = 1, $lang = null)
     {
-        global $opt, $locale;    // $locale is for lib1 compatibility
+        global $opt, $locale; // $locale is for lib1 compatibility
 
         if ($message == '') {
             return '';

htdocs/lib2/Net/IDNA2.php

Spacing +43 added lines, -47 removed lines

@@ -272,16 +272,16 @@ 
      * @access private
      */
     private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
+        array(0x80, 0x9F),
+        array(0x2060, 0x206F),
+        array(0x1D173, 0x1D17A),
+        array(0xE000, 0xF8FF),
+        array(0xF0000, 0xFFFFD),
         array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
+        array(0xFDD0, 0xFDEF),
+        array(0xD800, 0xDFFF),
+        array(0x2FF0, 0x2FFB),
+        array(0xE0020, 0xE007F)
     );
 
     /**
@@ -2282,7 +2282,7 @@ 
                     break;
 
                 default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    throw new InvalidArgumentException('Set Parameter: Unknown parameter ' . $v . ' for option ' . $k);
                 }
 
                 break;
@@ -2299,7 +2299,7 @@ 
                 if (in_array($v, array('2003', '2008'))) {
                     $this->_version = $v;
                 } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
+                    throw new InvalidArgumentException('Set Parameter: Invalid parameter ' . $v . ' for option ' . $k);
                 }
                 break;
 
@@ -2328,8 +2328,7 @@ 
         // Forcing conversion of input to UCS4 array
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
+        case 'utf8' : $decoded = $this->_utf8_to_ucs4($decoded);
             break;
         case 'ucs4_string':
             $decoded = $this->_ucs4_string_to_ucs4($decoded);
@@ -2349,7 +2348,7 @@ 
 
         foreach ($decoded as $k => $v) {
             // Make sure to use just the plain dot
-            switch($v) {
+            switch ($v) {
             case 0x3002:
             case 0xFF0E:
             case 0xFF61:
@@ -2370,11 +2369,11 @@ 
                 // Skip first char
                 if ($k) {
                     $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     if ($encoded) {
                         $output .= $encoded;
                     } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k) - $last_begin)));
                     }
                     $output .= chr($decoded[$k]);
                 }
@@ -2385,11 +2384,11 @@ 
         if ($last_begin) {
             $inp_len = sizeof($decoded);
             $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             if ($encoded) {
                 $output .= $encoded;
             } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len) - $last_begin)));
             }
             return $output;
         }
@@ -2421,7 +2420,7 @@ 
             case 'ucs4_array':
                 break;
             default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
+                throw new InvalidArgumentException('Unknown encoding ' . $one_time_encoding);
             }
         }
         // Make sure to drop any newline characters around
@@ -2473,8 +2472,7 @@ 
         // The output is UTF-8 by default, other output formats need conversion here
         // If one time encoding is given, use this, else the objects property
         switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
+        case 'utf8' : return $return;
             break;
         case 'ucs4_string':
             return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
@@ -2629,9 +2627,8 @@ 
                     $delta++;
                 } else if ($decoded[$i] == $cur_code) {
                     for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+                        $t = ($k <= $bias) ?
+                            $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
 
                         if ($q < $t) {
                             break;
@@ -2699,14 +2696,13 @@ 
         $idx      = 0;
         $char     = $this->_initial_n;
 
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1; $k += $this->_base) {
                 $digit = $this->_decodeDigit($encoded{$enco_idx++});
                 $idx += $digit * $w;
 
                 $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+                    $this->_tmin : (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
 
                 if ($digit < $t) {
                     break;
@@ -2717,7 +2713,7 @@ 
 
             $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
             $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
+            $char     += (int)($idx / ($deco_len + 1));
             $idx      %= ($deco_len + 1);
 
             if ($deco_len > 0) {
@@ -2745,14 +2741,14 @@ 
      */
     private function _adapt($delta, $npoints, $is_first)
     {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
+        $delta = (int)($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int)($delta / $npoints);
 
         for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+            $delta = (int)($delta / ($this->_base - $this->_tmin));
         }
 
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+        return (int)($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
     }
 
     /**
@@ -2779,7 +2775,7 @@ 
     private function _decodeDigit($cp)
     {
         $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
     }
 
     /**
@@ -2862,7 +2858,7 @@ 
                     // Rewind the for loop by one, since there can be more possible compositions
                     $i--;
                     $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+                    $last_class = ($i == $last_starter) ? 0 : $this->_getCombiningClass($output[$i - 1]);
 
                     continue;
                 }
@@ -2899,7 +2895,7 @@ 
 
         $result   = array();
         $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
+        $result[] = (int)($this->_lbase + $sindex / $this->_ncount);
         $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
 
         if ($T != $this->_tbase) {
@@ -2985,7 +2981,7 @@ 
      */
     private function _getCombiningClass($char)
     {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+        return isset(self::$_np_norm_combcls[$char]) ? self::$_np_norm_combcls[$char] : 0;
     }
 
     /**
@@ -3119,7 +3115,7 @@ 
                 $output[$out_len] = $v;
                 ++$out_len;
                 if ('add' == $mode) {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                 }
                 continue;
             }
@@ -3143,10 +3139,10 @@ 
                     $next_byte = 4;
                     $v = ($v - 252) << 30;
                 } else {
-                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte ' . $k);
                 }
                 if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
+                    $output[$out_len] = (int)$v;
                     ++$out_len;
                     continue;
                 }
@@ -3155,7 +3151,7 @@ 
                 if (!$this->_allow_overlong && $test == 'range') {
                     $test = 'none';
                     if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte ' . $k);
                     }
                 }
                 if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
@@ -3163,7 +3159,7 @@ 
                     $output[($out_len - 1)] += $v;
                     --$next_byte;
                 } else {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte ' . $k);
                 }
                 if ($next_byte < 0) {
                     $mode = 'next';
@@ -3205,14 +3201,14 @@ 
                 // 4 bytes
                 $output .= chr(240 + ($v >> 18))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 26) {
                 // 5 bytes
                 $output .= chr(248 + ($v >> 24))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else if ($v < 1 << 31) {
                 // 6 bytes
@@ -3220,7 +3216,7 @@ 
                     . chr(128 + (($v >> 24) & 63))
                     . chr(128 + (($v >> 18) & 63))
                     . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + (($v >> 6) & 63))
                     . chr(128 + ($v & 63));
             } else {
                 throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
@@ -3280,7 +3276,7 @@ 
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4)));
         }
         return $output;
     }
@@ -3331,7 +3327,7 @@ 
         $return = '';
 
         for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
+            $return .= ($octet & (1 << $i)) ? '1' : '0';
         }
 
         return $return;

htdocs/lib2/errorhandler.inc.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
     $errorlog_dir = $opt['rootpath'] . 'var/errorlog';
     $errorlog_path = $errorlog_dir . "/errorlog-" . date("Y-m-d");
 
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
 
     // All errors which may happen here are ignored, to avoid error recursions.
 

htdocs/lib2/imagebmp.inc.php

Spacing +237 added lines, -237 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,72 +456,72 @@ 
 
 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";
-   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)
         {
-                return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
+                return chr($n & 255) . chr(($n >> 8) & 255) . chr(($n >> 16) & 255) . chr(($n >> 24) & 255);
         }
         function int_to_word($n)
         {
-                return chr($n & 255).chr(($n >> 8) & 255);
+                return chr($n & 255) . chr(($n >> 8) & 255);
         }
 
 
 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/OcSmarty.class.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public $main_template = 'sys_main';
     public $bench = null;
     public $compile_id = null;
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
     public $title = '';
     public $menuitem = null;
     public $nowpsearch = false;
@@ -385,7 +385,7 @@ 
 
         $args = func_get_args();
         unset($args[0]);
-        for ($i = 1; isset($args[$i]); $i ++) {
+        for ($i = 1; isset($args[$i]); $i++) {
             $this->assign('p' . $i, $args[$i]);
         }