OpencachingDeutschland / oc-server3

htdocs/src/Oc/SmartyPlugins/block.nocache.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if (!isset($counter[$name])) {
             $counter[$name] = 0;
         }
-        $counter[$name] ++;
+        $counter[$name]++;
 
         if ($smarty->_cache_including) {
             $param = isset($smarty->_cache_info['cached_vars'][$name][$counter[$name]]) ? $smarty->_cache_info['cached_vars'][$name][$counter[$name]] : [];

htdocs/src/Oc/SmartyPlugins/function.season.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     ];
 
     $nTimestamp = time();
-    for ($nIndex = 0; $nIndex < count($seasons); $nIndex ++) {
+    for ($nIndex = 0; $nIndex < count($seasons); $nIndex++) {
         if (strtotime($seasons[$nIndex][0]) > $nTimestamp) {
             return $params['winter'];
         } //'';

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

Spacing +42 added lines, -42 removed lines

@@ -132,8 +132,8 @@ 
 
 */
 
-require __DIR__ . '/lib2/web.inc.php';
-require_once __DIR__ . '/lib2/logic/labels.inc.php';
+require __DIR__.'/lib2/web.inc.php';
+require_once __DIR__.'/lib2/logic/labels.inc.php';
 
 $tpl->name = 'restorecaches';
 $tpl->menuitem = MNU_ADMIN_RESTORE;
@@ -308,12 +308,12 @@ 
 
 function get_archive_data($caches)
 {
-    $cachelist = "(" . implode(",", $caches) . ")";
+    $cachelist = "(".implode(",", $caches).")";
     $data = array();
     $admins = array();
 
     // make waypoint index
-    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT `cache_id`, `wp_oc` FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $wp_oc[$r['cache_id']] = $r['wp_oc'];
     }
@@ -328,7 +328,7 @@ 
             `latitude`,
             `restored_by`
         FROM `cache_coordinates`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_created` ASC"
     );
     // order is relevant, because multiple changes per day possible
@@ -336,7 +336,7 @@ 
     while ($r = sql_fetch_assoc($rs)) {
         $coord = new coordinate($r['latitude'], $r['longitude']);
         $coord = $coord->getDecimalMinutes();
-        $coord = $coord['lat'] . " " . $coord['lon'];
+        $coord = $coord['lat']." ".$coord['lon'];
         if (isset($lastcoord[$r['cache_id']]) && $coord != $lastcoord[$r['cache_id']]) {
             // the database contains lots of old coord records with unchanged coords, wtf?
             append_data($data, $admins, $wp_oc, $r, "coord", $lastcoord[$r['cache_id']], $coord);
@@ -348,7 +348,7 @@ 
     // cache country
     $rs = sql("SELECT `cache_id`, LEFT(`date_created`,10) AS `date_modified`, `country`, `restored_by`
                FROM `cache_countries`
-                         WHERE `cache_id` IN " . $cachelist . "
+                         WHERE `cache_id` IN " . $cachelist."
                          ORDER BY `date_created` ASC");
     // order is relevant, because multiple changes per day possible
     $lastcountry = array();
@@ -364,17 +364,17 @@ 
     // all other cache data
     // first the current data ...
     $nextcd = array();
-    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN " . $cachelist);
+    $rs = sql("SELECT * FROM `caches` WHERE `cache_id` IN ".$cachelist);
     while ($r = sql_fetch_assoc($rs)) {
         $nextcd[$r['wp_oc']] = $r;
-        $user_id = $r['user_id'];     // is used later for logs
+        $user_id = $r['user_id']; // is used later for logs
     }
     sql_free_result($rs);
 
     // .. and then the changes
     $rs = sql(
         "SELECT * FROM `caches_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     while ($r = sql_fetch_assoc($rs)) {
@@ -417,8 +417,8 @@ 
                 $wp_oc,
                 $r,
                 "time",
-                $r['search_time'] . ' h',
-                $nextcd[$wp]['search_time'] . ' h'
+                $r['search_time'].' h',
+                $nextcd[$wp]['search_time'].' h'
             );
         }
         if ($r['way_length'] != $nextcd[$wp]['way_length']) {
@@ -428,8 +428,8 @@ 
                 $wp_oc,
                 $r,
                 "way",
-                $r['way_length'] . ' km',
-                $nextcd[$wp]['way_length'] . ' km'
+                $r['way_length'].' km',
+                $nextcd[$wp]['way_length'].' km'
             );
         }
         if ($r['wp_gc'] != $nextcd[$wp]['wp_gc']) {
@@ -465,9 +465,9 @@ 
     // attributes
     $rs = sql(
         "SELECT * FROM `caches_attributes_modified`
-         WHERE `cache_id` IN " . $cachelist . "  /* OConly attrib is shown, but not restorable */
+         WHERE `cache_id` IN " . $cachelist."  /* OConly attrib is shown, but not restorable */
          ORDER BY `date_modified` ASC"
-    );   // order doesn't matter as long it is date only
+    ); // order doesn't matter as long it is date only
     while ($r = sql_fetch_assoc($rs)) {
         append_data(
             $data,
@@ -475,7 +475,7 @@ 
             $wp_oc,
             $r,
             "attrib",
-            ($r['was_set'] ? "-" : "+") . labels::getLabelValue('cache_attrib', $r['attrib_id']),
+            ($r['was_set'] ? "-" : "+").labels::getLabelValue('cache_attrib', $r['attrib_id']),
             ''
         );
     }
@@ -513,7 +513,7 @@ 
             LENGTH(`short_desc`) AS `sdl`,
             `restored_by`
         FROM `cache_desc_modified`
-        WHERE `cache_id` IN " . $cachelist . "
+        WHERE `cache_id` IN " . $cachelist."
         ORDER BY `date_modified` DESC"
     );
     // order doesn't matter as long only one change per day is recorded
@@ -535,9 +535,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "desc(" . $r['language'] . ")",
+                "desc(".$r['language'].")",
                 $r['dl'] + 0,
-                ($next['dl'] + 0) . ' bytes'
+                ($next['dl'] + 0).' bytes'
             );
         }
         if ($r['hl'] + 0 != $next['hl'] + 0) {
@@ -546,9 +546,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "hint(" . $r['language'] . ")",
+                "hint(".$r['language'].")",
                 $r['hl'] + 0,
-                ($next['hl'] + 0) . ' bytes'
+                ($next['hl'] + 0).' bytes'
             );
         }
         if ($r['sdl'] + 0 != $next['sdl'] + 0) {
@@ -557,9 +557,9 @@ 
                 $admins,
                 $wp_oc,
                 $r,
-                "shortdesc(" . $r['language'] . ")",
+                "shortdesc(".$r['language'].")",
                 $r['sdl'] + 0,
-                ($next['sdl'] + 0) . ' bytes'
+                ($next['sdl'] + 0).' bytes'
             );
         }
 
@@ -582,7 +582,7 @@ 
               (SELECT 1 AS `op`, `deletion_date` AS `date_modified`, `cache_id`,
                     `user_id`, `type`, `date`, `restored_by`
                    FROM `cache_logs_archived`
-                  WHERE `cache_id` IN " . $cachelist . "AND `deleted_by`='&1' AND `user_id`<>'&1'
+                  WHERE `cache_id` IN " . $cachelist."AND `deleted_by`='&1' AND `user_id`<>'&1'
                   UNION
                   SELECT 2 AS `op`, `date_modified`, `cache_id`,
                        (SELECT `user_id` FROM `cache_logs_archived` WHERE `id`=`original_id`),
@@ -590,7 +590,7 @@ 
                        (SELECT `date` FROM `cache_logs_archived` WHERE `id`=`original_id`),
                        `restored_by`
                  FROM `cache_logs_restored`
-                  WHERE `cache_id` IN " . $cachelist . ") `logs`
+                  WHERE `cache_id` IN " . $cachelist.") `logs`
                 INNER JOIN `user` ON `user`.`user_id`=`logs`.`user_id`
               ORDER BY `logs`.`date_modified` ASC",
         // order may not be exact when redoing reverts, because delete and insert
@@ -604,7 +604,7 @@ 
             $wp_oc,
             $r,
             $r["op"] == 1 ? "dellog" : "restorelog",
-            "<a href='viewprofile.php?userid=" . $r['user_id'] . "' target='_blank'>" . $r['username'] . "</a>/" . $r['date'],
+            "<a href='viewprofile.php?userid=".$r['user_id']."' target='_blank'>".$r['username']."</a>/".$r['date'],
             ''
         );
     }
@@ -620,10 +620,10 @@ 
 
     $piccacheid = "IF(`object_type`=2, `object_id`, IF(`object_type`=1, IFNULL((SELECT `cache_id` FROM `cache_logs` WHERE `id`=`object_id`),(SELECT `cache_id` FROM `cache_logs_archived` WHERE `id`=`object_id`)), 0))";
     $rs = sql(
-        "SELECT *, " . $piccacheid . "AS `cache_id` FROM `pictures_modified`
-         WHERE " . $piccacheid . " IN " . $cachelist . "
+        "SELECT *, ".$piccacheid."AS `cache_id` FROM `pictures_modified`
+         WHERE " . $piccacheid." IN ".$cachelist."
          ORDER BY `date_modified` ASC"
-    );  // order is relevant for the case of restore-reverts
+    ); // order is relevant for the case of restore-reverts
     while ($r = sql_fetch_assoc($rs)) {
         $r['date_modified'] = substr($r['date_modified'], 0, 10);
         switch ($r['operation']) {
@@ -645,14 +645,14 @@ 
                 $picchange .= "-cache";
                 break;
         }
-        append_data($data, $admins, $wp_oc, $r, $picchange . "pic", $r['title'], '');
+        append_data($data, $admins, $wp_oc, $r, $picchange."pic", $r['title'], '');
     }
     sql_free_result($rs);
 
     // admins
     foreach ($admins as $adate => $adata) {
         foreach ($adata as $awp => $alist) {
-            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> " . implode(',', $alist);
+            $data[$adate][$awp] .= "<br /><strong class='adminrestore'>admins:</strong> ".implode(',', $alist);
         }
     }
 
@@ -701,9 +701,9 @@ 
     } else {
         $text .= " class='userchange'";
     }
-    $text .= ">$field</strong>: $oldvalue" . ($newvalue != "" ? " &rarr; $newvalue" : "");
+    $text .= ">$field</strong>: $oldvalue".($newvalue != "" ? " &rarr; $newvalue" : "");
     if (isset($data[$mdate][$wp])) {
-        $data[$mdate][$wp] .= ", " . $text;
+        $data[$mdate][$wp] .= ", ".$text;
     } else {
         $data[$mdate][$wp] = $text;
     }
@@ -716,8 +716,8 @@ 
             $admins[$mdate][$wp] = [];
         }
         $admins[$mdate][$wp][$r['restored_by'] + 0]
-            = "<a href='viewprofile.php?userid=" . $r['restored_by'] . "' target='_blank'>" .
-            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']) .
+            = "<a href='viewprofile.php?userid=".$r['restored_by']."' target='_blank'>".
+            sql_value("SELECT `username` FROM `user` WHERE `user_id`='&1'", "", $r['restored_by']).
             "</a>";
     }
 }
@@ -727,7 +727,7 @@ 
 {
     global $opt, $login;
 
-    sql("SET @restoredby='&1'", $login->userid);         // is evaluated by trigger functions
+    sql("SET @restoredby='&1'", $login->userid); // is evaluated by trigger functions
     sql_slave("SET @restoredby='&1'", $login->userid);
 
     $restored = array();
@@ -837,12 +837,12 @@ 
                     if ($setfields != "") {
                         $setfields .= ",";
                     }
-                    $setfields .= "`$field`='" . sql_escape($r[$field]) . "'";
+                    $setfields .= "`$field`='".sql_escape($r[$field])."'";
                     $restored[$wp][$field] = true;
                 }
             }
             if ($setfields != "" && !$simulate) {
-                sql("UPDATE `caches` SET " . $setfields . " WHERE `cache_id`='&1'", $cacheid);
+                sql("UPDATE `caches` SET ".$setfields." WHERE `cache_id`='&1'", $cacheid);
             }
         }
         sql_free_result($rs);
@@ -1019,7 +1019,7 @@ 
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore
                         $log = new cachelog();
-                        $log->setNode($r['node']);  // cachelog class currently does not initialize node field
+                        $log->setNode($r['node']); // cachelog class currently does not initialize node field
                         $log->setCacheId($r['cache_id']);
                         $log->setUserId($r['user_id']);
                         $log->setType($r['type'], true);
@@ -1071,7 +1071,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error log ' + $r['id'] + "/" + $logid];
+                    $restored[$wp]['internal error - could not $error log ' +$r['id'] + "/" +$logid];
                 }
                 if ($logs_restored) {
                     $restored[$wp]['logs'] = true;
@@ -1203,7 +1203,7 @@ 
                 }  // not already processed
 
                 if ($error != "") {
-                    $restored[$wp]['internal error - could not $error picture ' . $r['id'] + "/" + $picid] = true;
+                    $restored[$wp]['internal error - could not $error picture '.$r['id'] + "/" +$picid] = true;
                 }
                 if ($pics_restored) {
                     $restored[$wp]['pictures'] = true;

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'],
     );
 }

Spacing +11 added lines, -11 removed lines

@@ -16,24 +16,24 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
-    require $opt['rootpath'] . 'config2/settings-dist.inc.php';
-    require $opt['rootpath'] . 'config2/settings.inc.php';
+    require $opt['rootpath'].'lib2/const.inc.php'; # (into the *local* scope!)
+    require $opt['rootpath'].'config2/settings-dist.inc.php';
+    require $opt['rootpath'].'config2/settings.inc.php';
     
     return array(
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
         'ADMINS'           => array($opt['db']['warn']['mail'], 'rygielski@mimuw.edu.pl'),
         'FROM_FIELD'       => $opt['mail']['contact'],
-        'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
+        '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'],
@@ -43,16 +43,16 @@ 
         'TIMEZONE'         => $opt['php']['timezone'],
         'SITE_URL'         => $opt['page']['absolute_url'],
         'REGISTRATION_URL' => $opt['page']['https']['mode'] != HTTPS_DISABLED
-                                  ? 'https://' . $opt['page']['domain'] . '/register.php'
-                                  : $opt['page']['absolute_url'] . 'register.php',
+                                  ? 'https://'.$opt['page']['domain'].'/register.php'
+                                  : $opt['page']['absolute_url'].'register.php',
         'VAR_DIR'          => $opt['okapi']['var_dir'],
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/').'/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
-        'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'SITE_LOGO'        => $opt['page']['absolute_url'].'resource2/'.$opt['template']['default']['style'].'/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
-        'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
+        'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
                            => $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`,

Spacing +5 added lines, -5 removed lines

@@ -17,12 +17,12 @@ 
     const FOR_STARTPAGE_GALLERY = 1;
     const FOR_NEWPICS_GALLERY = 2;
     const FOR_USER_STAT = 3;
-    const FOR_USER_GALLERY = 4;   // params: userid
+    const FOR_USER_GALLERY = 4; // params: userid
     const FOR_MYHOME_GALLERY = 5;
-    const FOR_CACHE_STAT = 6;     // params: cacheid
-    const FOR_CACHE_GALLERY = 7;  // params: cacheid
+    const FOR_CACHE_STAT = 6; // params: cacheid
+    const FOR_CACHE_GALLERY = 7; // params: cacheid
 
-    const MAX_PICTURES_PER_GALLERY_PAGE = 48;   // must be multiple of 6
+    const MAX_PICTURES_PER_GALLERY_PAGE = 48; // must be multiple of 6
 
 
     public static function get($purpose, $userid = 0, $cacheid = 0)
@@ -232,7 +232,7 @@ 
         $pictures = self::get($purpose, $userid, $cacheid);
         $tpl->assign('pictures', array_slice($pictures, $startat, self::MAX_PICTURES_PER_GALLERY_PAGE));
 
-        $pager = new pager($url . "&startat={offset}");
+        $pager = new pager($url."&startat={offset}");
         $pager->make_from_offset($startat, count($pictures), self::MAX_PICTURES_PER_GALLERY_PAGE);
     }
 

htdocs/lib2/logic/gis.class.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         // number of points in the polygon
         $n = count($polygon);
         $poly1 = $polygon[0];
-        for ($i = 1; $i <= $n; $i ++) {
+        for ($i = 1; $i <= $n; $i++) {
             $poly1XY = explode(' ', $poly1);
             $poly1x = $poly1XY[0];
             $poly1y = $poly1XY[1];
@@ -44,7 +44,7 @@ 
                         if ($poly1y != $poly2y) {
                             $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x;
                             if ($poly1x == $poly2x || $px <= $xinters) {
-                                $counter ++;
+                                $counter++;
                             }
                         }
                     }

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/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;
 };
 

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/pager.class.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);
             $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);
 
-            for ($page = $from_page; $page <= $to_page; $page ++) {
+            for ($page = $from_page; $page <= $to_page; $page++) {
                 if ($page == $current_page) {
                     $pages[$page] = false;
                 } else {