OpencachingDeutschland / oc-server3

htdocs/okapi/views/tilestress.php

Braces +8 added lines, -7 removed lines

@@ -42,8 +42,7 @@ 
         $user_id = $_GET['u'];
         self::out("Yo. I'm $user_id.\n\n");
 
-        while (true)
-        {
+        while (true) {
             srand(floor(time() / 10));
             $mode2 = rand(0, 9) <= 7;
             if ($mode2) {
@@ -66,14 +65,16 @@ 
             }
 
             $tiles = array();
-            for ($xx=$x; $xx<$x+4; $xx++)
-                for ($yy=$y; $yy<$y+4; $yy++)
-                    $tiles[] = array($xx, $yy);
+            for ($xx=$x; $xx<$x+4; $xx++) {
+                            for ($yy=$y;
+            }
+            $yy<$y+4; $yy++) {
+                                    $tiles[] = array($xx, $yy);
+                }
             srand();
             shuffle($tiles);
 
-            foreach ($tiles as $tile)
-            {
+            foreach ($tiles as $tile) {
                 list($x, $y) = $tile;
                 self::out("Loading ".str_pad("($z, $x, $y)... ", 30));
                 $time_started = microtime(true);

htdocs/okapi/cronjobs.php

Braces +153 added lines, -115 removed lines

@@ -35,8 +35,7 @@ 
     public static function get_enabled_cronjobs()
     {
         static $cache = null;
-        if ($cache == null)
-        {
+        if ($cache == null) {
             $cache = array(
                 new OAuthCleanupCronJob(),
                 new CacheCleanupCronJob(),
@@ -54,9 +53,10 @@ 
                 new SearchSetsCleanerJob(),
                 new TableOptimizerJob(),
             );
-            foreach ($cache as $cronjob)
-                if (!in_array($cronjob->get_type(), array('pre-request', 'cron-5')))
+            foreach ($cache as $cronjob) {
+                            if (!in_array($cronjob->get_type(), array('pre-request', 'cron-5')))
                     throw new Exception("Cronjob '".$cronjob->get_name()."' has an invalid (unsupported) type.");
+            }
         }
         return $cache;
     }
@@ -74,25 +74,18 @@ 
         $lock->acquire();
 
         $schedule = Cache::get("cron_schedule");
-        if ($schedule == null)
-            $schedule = array();
-        foreach (self::get_enabled_cronjobs() as $cronjob)
-        {
+        if ($schedule == null) {
+                    $schedule = array();
+        }
+        foreach (self::get_enabled_cronjobs() as $cronjob) {
             $name = $cronjob->get_name();
-            if ((!isset($schedule[$name])) || ($schedule[$name] <= time()))
-            {
-                if ($cronjob->get_type() != $type)
-                {
+            if ((!isset($schedule[$name])) || ($schedule[$name] <= time())) {
+                if ($cronjob->get_type() != $type) {
                     $next_run = isset($schedule[$name]) ? $schedule[$name] : (time() - 1);
-                }
-                else
-                {
-                    try
-                    {
+                } else {
+                    try {
                         $cronjob->execute();
-                    }
-                    catch (Exception $e)
-                    {
+                    } catch (Exception $e) {
                         Okapi::mail_admins("Cronjob error: ".$cronjob->get_name(),
                             OkapiExceptionHandler::get_exception_info($e));
                     }
@@ -106,8 +99,7 @@ 
         # Remove "stale" schedule keys (those which are no longer declared).
 
         $fixed_schedule = array();
-        foreach (self::get_enabled_cronjobs() as $cronjob)
-        {
+        foreach (self::get_enabled_cronjobs() as $cronjob) {
             $name = $cronjob->get_name();
             $fixed_schedule[$name] = $schedule[$name];
         }
@@ -116,9 +108,10 @@ 
         # Return the nearest scheduled event time.
 
         $nearest = time() + 3600;
-        foreach ($fixed_schedule as $name => $time)
-            if ($time < $nearest)
+        foreach ($fixed_schedule as $name => $time) {
+                    if ($time < $nearest)
                 $nearest = $time;
+        }
         Cache::set("cron_schedule", $fixed_schedule, 30*86400);
         $lock->release();
         return $nearest;
@@ -132,10 +125,8 @@ 
     {
         require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
 
-        foreach (self::get_enabled_cronjobs() as $cronjob)
-        {
-            if (($cronjob->get_name() == $job_name) || ($cronjob->get_name() == "okapi\\cronjobs\\".$job_name))
-            {
+        foreach (self::get_enabled_cronjobs() as $cronjob) {
+            if (($cronjob->get_name() == $job_name) || ($cronjob->get_name() == "okapi\\cronjobs\\".$job_name)) {
                 $cronjob->execute();
                 return;
             }
@@ -150,11 +141,13 @@ 
     public static function reset_job_schedule($job_name)
     {
         $thejob = null;
-        foreach (self::get_enabled_cronjobs() as $tmp)
-            if (($tmp->get_name() == $job_name) || ($tmp->get_name() == "okapi\\cronjobs\\".$job_name))
+        foreach (self::get_enabled_cronjobs() as $tmp) {
+                    if (($tmp->get_name() == $job_name) || ($tmp->get_name() == "okapi\\cronjobs\\".$job_name))
                 $thejob = $tmp;
-        if ($thejob == null)
-            throw new Exception("Could not reset schedule for job $job_name. $jon_name not found.");
+        }
+        if ($thejob == null) {
+                    throw new Exception("Could not reset schedule for job $job_name. $jon_name not found.");
+        }
 
         # We have to acquire lock on the schedule. This might take some time if cron-5 jobs are
         # currently being run.
@@ -164,10 +157,10 @@ 
         $lock->acquire();
 
         $schedule = Cache::get("cron_schedule");
-        if ($schedule != null)
-        {
-            if (isset($schedule[$thejob->get_name()]))
-                unset($schedule[$thejob->get_name()]);
+        if ($schedule != null) {
+            if (isset($schedule[$thejob->get_name()])) {
+                            unset($schedule[$thejob->get_name()]);
+            }
             Cache::set("cron_schedule", $schedule, 30*86400);
         }
 
@@ -181,7 +174,9 @@ 
     public abstract function execute();
 
     /** Get unique name for this cronjob. */
-    public function get_name() { return get_class($this); }
+    public function get_name()
+    {
+return get_class($this); }
 
     /**
      * Get the type of this cronjob. Currently there are two: 'pre-request'
@@ -212,7 +207,9 @@ 
     /**
      * Always returns 'pre-request'.
      */
-    public final function get_type() { return 'pre-request'; }
+    public final function get_type()
+    {
+return 'pre-request'; }
 
     /**
      * Return number of seconds - a *minimum* time period that should pass between
@@ -235,7 +232,9 @@ 
     /**
      * Always returns 'cron-5'.
      */
-    public final function get_type() { return 'cron-5'; }
+    public final function get_type()
+    {
+return 'cron-5'; }
 
     /**
      * Return number of seconds - period of time after which cronjob execution
@@ -257,18 +256,23 @@ 
  */
 class OAuthCleanupCronJob extends PrerequestCronJob
 {
-    public function get_period() { return 300; } # 5 minutes
+    public function get_period()
+    {
+return 300; } # 5 minutes
     public function execute()
     {
-        if (Okapi::$data_store)
-            Okapi::$data_store->cleanup();
+        if (Okapi::$data_store) {
+                    Okapi::$data_store->cleanup();
+        }
     }
 }
 
 /** Clean up the saved search tables, every 10 minutes. */
 class SearchSetsCleanerJob extends Cron5Job
 {
-    public function get_period() { return 600; }
+    public function get_period()
+    {
+return 600; }
     public function execute()
     {
         Db::execute("
@@ -286,7 +290,9 @@ 
 /** Clean up the cache, once per hour. */
 class CacheCleanupCronJob extends Cron5Job
 {
-    public function get_period() { return 3600; }
+    public function get_period()
+    {
+return 3600; }
     public function execute()
     {
         # Delete all expired elements.
@@ -358,11 +364,14 @@ 
 /** Reads temporary (fast) stats-tables and reformats them into more permanent structures. */
 class StatsWriterCronJob extends PrerequestCronJob
 {
-    public function get_period() { return 60; } # 1 minute
+    public function get_period()
+    {
+return 60; } # 1 minute
     public function execute()
     {
-        if (Okapi::get_var('db_version', 0) + 0 < 32)
-            return;
+        if (Okapi::get_var('db_version', 0) + 0 < 32) {
+                    return;
+        }
         Db::execute("lock tables okapi_stats_hourly write, okapi_stats_temp write;");
         try {
             $rs = Db::query("
@@ -377,8 +386,7 @@ 
                 from okapi_stats_temp
                 group by substr(`datetime`, 1, 13), consumer_key, user_id, service_name, calltype
             ");
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 Db::execute("
                     insert into okapi_stats_hourly (consumer_key, user_id, period_start, service_name,
                         total_calls, http_calls, total_runtime, http_runtime)
@@ -416,11 +424,14 @@ 
  */
 class StatsCompressorCronJob extends Cron5Job
 {
-    public function get_period() { return 3600; }  # 1 hour
+    public function get_period()
+    {
+return 3600; }  # 1 hour
     public function execute()
     {
-        if (Okapi::get_var('db_version', 0) + 0 < 94)
-            return;
+        if (Okapi::get_var('db_version', 0) + 0 < 94) {
+                    return;
+        }
 
         # We will process a single month, every time we are being run.
 
@@ -489,7 +500,9 @@ 
  */
 class CheckCronTab1 extends Cron5Job
 {
-    public function get_period() { return 3600; }
+    public function get_period()
+    {
+return 3600; }
     public function execute()
     {
         Cache::set('crontab_last_ping', time(), 86400);
@@ -502,14 +515,17 @@ 
  */
 class CheckCronTab2 extends PrerequestCronJob
 {
-    public function get_period() { return 30 * 60; }
+    public function get_period()
+    {
+return 30 * 60; }
     public function execute()
     {
         $last_ping = Cache::get('crontab_last_ping');
-        if ($last_ping === null)
-            $last_ping = time() - 86400; # if not set, assume 1 day ago.
-        if ($last_ping > time() - 3600)
-        {
+        if ($last_ping === null) {
+                    $last_ping = time() - 86400;
+        }
+        # if not set, assume 1 day ago.
+        if ($last_ping > time() - 3600) {
             # There was a ping during the last hour. Everything is okay.
             # Reset the counter and return.
 
@@ -520,15 +536,13 @@ 
         # There was no ping. Decrement the counter. When reached zero, alert.
 
         $counter = Cache::get('crontab_check_counter');
-        if ($counter === null)
-            $counter = 5;
+        if ($counter === null) {
+                    $counter = 5;
+        }
         $counter--;
-        if ($counter > 0)
-        {
+        if ($counter > 0) {
             Cache::set('crontab_check_counter', $counter, 86400);
-        }
-        elseif ($counter == 0)
-        {
+        } elseif ($counter == 0) {
             Okapi::mail_admins(
                 "Crontab not working.",
                 "Hello. OKAPI detected, that it's crontab is not working properly.\n".
@@ -554,7 +568,9 @@ 
  */
 class ChangeLogWriterJob extends Cron5Job
 {
-    public function get_period() { return 300; }
+    public function get_period()
+    {
+return 300; }
     public function execute()
     {
         require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
@@ -570,7 +586,9 @@ 
  */
 class ChangeLogCheckerJob extends Cron5Job
 {
-    public function get_period() { return 86400; }
+    public function get_period()
+    {
+return 86400; }
     public function execute()
     {
         require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
@@ -583,7 +601,9 @@ 
  */
 class FulldumpGeneratorJob extends Cron5Job
 {
-    public function get_period() { return 7*86400; }
+    public function get_period()
+    {
+return 7*86400; }
     public function execute()
     {
         require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
@@ -596,7 +616,9 @@ 
  */
 class TileTreeUpdater extends Cron5Job
 {
-    public function get_period() { return 5*60; }
+    public function get_period()
+    {
+return 5*60; }
     public function execute()
     {
         $current_clog_revision = Okapi::get_var('clog_revision', 0);
@@ -605,18 +627,24 @@ 
             # No update necessary.
         } elseif ($tiletree_revision < $current_clog_revision) {
             require_once($GLOBALS['rootpath']."okapi/services/caches/map/replicate_listener.inc.php");
-            if ($current_clog_revision - $tiletree_revision < 30000)  # In the middle of 2012, OCPL generated 30000 entries per week
+            if ($current_clog_revision - $tiletree_revision < 30000) {
+                # In the middle of 2012, OCPL generated 30000 entries per week
             {
-                for ($timeout = time() + 240; time() < $timeout; )  # Try to stop after 4 minutes.
+                for ($timeout = time() + 240;
+            }
+            time() < $timeout; ) {
+                    # Try to stop after 4 minutes.
                 {
                     try {
                         $response = OkapiServiceRunner::call('services/replicate/changelog', new OkapiInternalRequest(
                             new OkapiInternalConsumer(), null, array('since' => $tiletree_revision)));
+                }
                         \okapi\services\caches\map\ReplicateListener::receive($response['changelog']);
                         $tiletree_revision = $response['revision'];
                         Okapi::set_var('clog_followup_revision', $tiletree_revision);
-                        if (!$response['more'])
-                            break;
+                        if (!$response['more']) {
+                                                    break;
+                        }
                     } catch (BadRequest $e) {
                         # Invalid 'since' parameter? May happen when crontab was
                         # not working for more than 10 days. Or, just after OKAPI
@@ -640,24 +668,27 @@ 
 /** Once per day, removes all revisions older than 10 days from okapi_clog table. */
 class ChangeLogCleanerJob extends Cron5Job
 {
-    public function get_period() { return 86400; }
+    public function get_period()
+    {
+return 86400; }
     public function execute()
     {
         require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
         $max_revision = ReplicateCommon::get_revision();
         $cache_key = 'clog_revisions_daily';
         $data = Cache::get($cache_key);
-        if ($data == null)
-            $data = array();
+        if ($data == null) {
+                    $data = array();
+        }
         $data[time()] = $max_revision;
         $new_min_revision = 1;
         $new_data = array();
-        foreach ($data as $time => $r)
-        {
-            if ($time < time() - 10*86400)
-                $new_min_revision = max($new_min_revision, $r);
-            else
-                $new_data[$time] = $r;
+        foreach ($data as $time => $r) {
+            if ($time < time() - 10*86400) {
+                            $new_min_revision = max($new_min_revision, $r);
+            } else {
+                            $new_data[$time] = $r;
+            }
         }
         Db::execute("
             delete from okapi_clog
@@ -673,7 +704,9 @@ 
  */
 class AdminStatsSender extends Cron5Job
 {
-    public function get_period() { return 7*86400; }
+    public function get_period()
+    {
+return 7*86400; }
     public function execute()
     {
         ob_start();
@@ -718,15 +751,16 @@ 
         print "== Consumers ==\n\n";
         print "Consumer name                         Calls     Runtime\n";
         print "----------------------------------- ------- -----------\n";
-        foreach ($consumers as $row)
-        {
+        foreach ($consumers as $row) {
             $name = $row['name'];
-            if ($row['consumer_key'] == 'anonymous')
-                $name = "Anonymous (Level 0 Authentication)";
-            elseif ($row['consumer_key'] == 'facade')
-                $name = "Internal usage via Facade";
-            if (mb_strlen($name) > 35)
-                $name = mb_substr($name, 0, 32)."...";
+            if ($row['consumer_key'] == 'anonymous') {
+                            $name = "Anonymous (Level 0 Authentication)";
+            } elseif ($row['consumer_key'] == 'facade') {
+                            $name = "Internal usage via Facade";
+            }
+            if (mb_strlen($name) > 35) {
+                            $name = mb_substr($name, 0, 32)."...";
+            }
             print self::mb_str_pad($name, 35, " ", STR_PAD_RIGHT);
             print str_pad($row['http_calls'], 8, " ", STR_PAD_LEFT);
             print str_pad(sprintf("%01.2f", $row['http_runtime']), 11, " ", STR_PAD_LEFT)."s\n";
@@ -746,11 +780,11 @@ 
         print "== Methods ==\n\n";
         print "Service name                          Calls     Runtime      Avg\n";
         print "----------------------------------- ------- ----------- --------\n";
-        foreach ($methods as $row)
-        {
+        foreach ($methods as $row) {
             $name = $row['service_name'];
-            if (mb_strlen($name) > 35)
-                $name = mb_substr($name, 0, 32)."...";
+            if (mb_strlen($name) > 35) {
+                            $name = mb_substr($name, 0, 32)."...";
+            }
             print self::mb_str_pad($name, 35, " ", STR_PAD_RIGHT);
             print str_pad($row['http_calls'], 8, " ", STR_PAD_LEFT);
             print str_pad(sprintf("%01.2f", $row['http_runtime']), 11, " ", STR_PAD_LEFT)."s";
@@ -774,11 +808,11 @@ 
         print "== Current OAuth usage by Consumers with at least 5 users ==\n\n";
         print "Consumer name                         Users\n";
         print "----------------------------------- -------\n";
-        foreach ($oauth_users as $row)
-        {
+        foreach ($oauth_users as $row) {
             $name = $row['name'];
-            if (mb_strlen($name) > 35)
-                $name = mb_substr($name, 0, 32)."...";
+            if (mb_strlen($name) > 35) {
+                            $name = mb_substr($name, 0, 32)."...";
+            }
             print self::mb_str_pad($name, 35, " ", STR_PAD_RIGHT);
             print str_pad($row['users'], 8, " ", STR_PAD_LEFT)."\n";
         }
@@ -806,18 +840,23 @@ 
  */
 class LocaleChecker extends Cron5Job
 {
-    public function get_period() { return 7*86400; }
+    public function get_period()
+    {
+return 7*86400; }
     public function execute()
     {
         require_once($GLOBALS['rootpath']."okapi/locale/locales.php");
         $required = Locales::get_required_locales();
         $installed = Locales::get_installed_locales();
         $missing = array();
-        foreach ($required as $locale)
-            if (!in_array($locale, $installed))
+        foreach ($required as $locale) {
+                    if (!in_array($locale, $installed))
                 $missing[] = $locale;
-        if (count($missing) == 0)
-            return; # okay!
+        }
+        if (count($missing) == 0) {
+                    return;
+        }
+        # okay!
         ob_start();
         print "Hi!\n\n";
         print "Your system is missing some locales required by OKAPI for proper\n";
@@ -825,24 +864,21 @@ 
         print "languages. This number (hopefully) will be growing.\n\n";
         print "Please take a moment to install the following missing locales:\n\n";
         $prefixes = array();
-        foreach ($missing as $locale)
-        {
+        foreach ($missing as $locale) {
             print " - ".$locale."\n";
             $prefixes[substr($locale, 0, 2)] = true;
         }
         $prefixes = array_keys($prefixes);
         print "\n";
-        if ((count($missing) == 1) && ($missing[0] == 'POSIX'))
-        {
+        if ((count($missing) == 1) && ($missing[0] == 'POSIX')) {
             # I don't remember how to install POSIX, probably everyone has it anyway.
-        }
-        else
-        {
+        } else {
             print "On Debian, try the following:\n\n";
-            foreach ($prefixes as $lang)
-            {
-                if ($lang != 'PO') # Two first letters cut from POSIX.
+            foreach ($prefixes as $lang) {
+                if ($lang != 'PO') {
+                    # Two first letters cut from POSIX.
                     print "sudo apt-get install language-pack-".$lang."-base\n";
+                }
             }
             print "sudo service apache2 restart\n";
             print "\n";
@@ -857,7 +893,9 @@ 
 /** Once per day, optimize certain MySQL tables. */
 class TableOptimizerJob extends Cron5Job
 {
-    public function get_period() { return 86400; }
+    public function get_period()
+    {
+return 86400; }
     public function execute()
     {
         Db::query("optimize table okapi_tile_caches");

htdocs/okapi/lib/tbszip.php

Braces +195 added lines, -76 removed lines

@@ -11,22 +11,28 @@ 
 */
 
 
-class clsTbsZip {
+class clsTbsZip
+{
     const TBSZIP_DOWNLOAD = 1;   // download (default)
     const TBSZIP_NOHEADER = 4;   // option to use with DOWNLOAD: no header is sent
     const TBSZIP_FILE     = 8;   // output to file  , or add from file
     const TBSZIP_STRING   = 32;  // output to string, or add from string
 
-    function __construct() {
+    function __construct()
+    {
         $this->Meth8Ok = extension_loaded('zlib'); // check if Zlib extension is available. This is need for compress and uncompress with method 8.
         $this->DisplayError = true;
         $this->ArchFile = '';
         $this->Error = false;
     }
 
-    function CreateNew($ArchName='new.zip') {
+    function CreateNew($ArchName='new.zip')
+    {
     // Create a new virtual empty archive, the name will be the default name when the archive is flushed.
-        if (!isset($this->Meth8Ok)) $this->__construct();  // for PHP 4 compatibility
+        if (!isset($this->Meth8Ok)) {
+            $this->__construct();
+        }
+        // for PHP 4 compatibility
         $this->Close(); // note that $this->ArchHnd is set to false here
         $this->Error = false;
         $this->ArchFile = $ArchName;
@@ -37,9 +43,13 @@ 
         $this->CdPos = $this->CdInfo['p_cd'];
     }
 
-    function Open($ArchFile, $UseIncludePath=false) {
+    function Open($ArchFile, $UseIncludePath=false)
+    {
     // Open the zip archive
-        if (!isset($this->Meth8Ok)) $this->__construct();  // for PHP 4 compatibility
+        if (!isset($this->Meth8Ok)) {
+            $this->__construct();
+        }
+        // for PHP 4 compatibility
         $this->Close(); // close handle and init info
         $this->Error = false;
         $this->ArchIsNew = false;
@@ -53,12 +63,17 @@ 
             $this->ArchHnd = fopen($ArchFile, 'rb', $UseIncludePath);
         }
         $ok = !($this->ArchHnd===false);
-        if ($ok) $ok = $this->CentralDirRead();
+        if ($ok) {
+            $ok = $this->CentralDirRead();
+        }
         return $ok;
     }
 
-    function Close() {
-        if (isset($this->ArchHnd) and ($this->ArchHnd!==false)) fclose($this->ArchHnd);
+    function Close()
+    {
+        if (isset($this->ArchHnd) and ($this->ArchHnd!==false)) {
+            fclose($this->ArchHnd);
+        }
         $this->ArchFile = '';
         $this->ArchHnd = false;
         $this->CdInfo = array();
@@ -69,7 +84,8 @@ 
         $this->ArchCancelModif();
     }
 
-    function ArchCancelModif() {
+    function ArchCancelModif()
+    {
         $this->LastReadComp = false; // compression of the last read file (1=compressed, 0=stored not compressed, -1= stored compressed but read uncompressed)
         $this->LastReadIdx = false;  // index of the last file read
         $this->ReplInfo = array();
@@ -77,21 +93,28 @@ 
         $this->AddInfo = array();
     }
 
-    function FileAdd($Name, $Data, $DataType=self::TBSZIP_STRING, $Compress=true) {
+    function FileAdd($Name, $Data, $DataType=self::TBSZIP_STRING, $Compress=true)
+    {
 
-        if ($Data===false) return $this->FileCancelModif($Name, false); // Cancel a previously added file
+        if ($Data===false) {
+            return $this->FileCancelModif($Name, false);
+        }
+        // Cancel a previously added file
 
         // Save information for adding a new file into the archive
         $Diff = 30 + 46 + 2*strlen($Name); // size of the header + cd info
         $Ref = $this->_DataCreateNewRef($Data, $DataType, $Compress, $Diff, $Name);
-        if ($Ref===false) return false;
+        if ($Ref===false) {
+            return false;
+        }
         $Ref['name'] = $Name;
         $this->AddInfo[] = $Ref;
         return $Ref['res'];
 
     }
 
-    function CentralDirRead() {
+    function CentralDirRead()
+    {
         $cd_info = 'PK'.chr(05).chr(06); // signature of the Central Directory
         $cd_pos = -22;
         $this->_MoveTo($cd_pos, SEEK_END);
@@ -113,8 +136,12 @@ 
         $this->CdFileNbr = $this->CdInfo['file_nbr_curr'];
         $this->CdPos = $this->CdInfo['p_cd'];
 
-        if ($this->CdFileNbr<=0) return $this->RaiseError('No header found in the Central Directory.');
-        if ($this->CdPos<=0) return $this->RaiseError('No position found for the Central Directory.');
+        if ($this->CdFileNbr<=0) {
+            return $this->RaiseError('No header found in the Central Directory.');
+        }
+        if ($this->CdPos<=0) {
+            return $this->RaiseError('No position found for the Central Directory.');
+        }
 
         $this->_MoveTo($this->CdPos);
         for ($i=0;$i<$this->CdFileNbr;$i++) {
@@ -127,7 +154,8 @@ 
         return true;
     }
 
-    function CentralDirRead_End($cd_info) {
+    function CentralDirRead_End($cd_info)
+    {
         $b = $cd_info.$this->_ReadData(18);
         $x = array();
         $x['disk_num_curr'] = $this->_GetDec($b,4,2);  // number of this disk
@@ -142,12 +170,15 @@ 
         return $x;
     }
 
-    function CentralDirRead_File($idx) {
+    function CentralDirRead_File($idx)
+    {
 
         $b = $this->_ReadData(46);
 
         $x = $this->_GetHex($b,0,4);
-        if ($x!=='h:02014b50') return $this->RaiseError("Signature of Central Directory Header #".$idx." (file information) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd) - 46).".");
+        if ($x!=='h:02014b50') {
+            return $this->RaiseError("Signature of Central Directory Header #".$idx." (file information) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd) - 46).".");
+        }
 
         $x = array();
         $x['vers_used'] = $this->_GetDec($b,4,2);
@@ -175,7 +206,8 @@ 
         return $x;
     }
 
-    function RaiseError($Msg) {
+    function RaiseError($Msg)
+    {
         if ($this->DisplayError) {
             if (PHP_SAPI==='cli') {
                 echo get_class($this).' ERROR with the zip archive: '.$Msg."\r\n";
@@ -187,7 +219,8 @@ 
         return false;
     }
 
-    function Debug($FileHeaders=false) {
+    function Debug($FileHeaders=false)
+    {
 
         $this->DisplayError = true;
 
@@ -230,7 +263,8 @@ 
 
     }
 
-    function DebugArray($arr) {
+    function DebugArray($arr)
+    {
         foreach ($arr as $k=>$v) {
             if (is_array($v)) {
                 $arr[$k] = $this->DebugArray($v);
@@ -241,11 +275,13 @@ 
         return $arr;
     }
 
-    function FileExists($NameOrIdx) {
+    function FileExists($NameOrIdx)
+    {
         return ($this->FileGetIdx($NameOrIdx)!==false);
     }
 
-    function FileGetIdx($NameOrIdx) {
+    function FileGetIdx($NameOrIdx)
+    {
     // Check if a file name, or a file index exists in the Central Directory, and return its index
         if (is_string($NameOrIdx)) {
             if (isset($this->CdFileByName[$NameOrIdx])) {
@@ -262,23 +298,31 @@ 
         }
     }
 
-    function FileGetIdxAdd($Name) {
+    function FileGetIdxAdd($Name)
+    {
     // Check if a file name exists in the list of file to add, and return its index
-        if (!is_string($Name)) return false;
+        if (!is_string($Name)) {
+            return false;
+        }
         $idx_lst = array_keys($this->AddInfo);
         foreach ($idx_lst as $idx) {
-            if ($this->AddInfo[$idx]['name']===$Name) return $idx;
+            if ($this->AddInfo[$idx]['name']===$Name) {
+                return $idx;
+            }
         }
         return false;
     }
 
-    function FileRead($NameOrIdx, $Uncompress=true) {
+    function FileRead($NameOrIdx, $Uncompress=true)
+    {
 
         $this->LastReadComp = false; // means the file is not found
         $this->LastReadIdx = false;
 
         $idx = $this->FileGetIdx($NameOrIdx);
-        if ($idx===false) return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        if ($idx===false) {
+            return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        }
 
         $pos = $this->CdFileLst[$idx]['p_loc'];
         $this->_MoveTo($pos);
@@ -302,7 +346,9 @@ 
         } elseif($meth==0) {
             $Comp = 0; // means stored without compression
         } else {
-            if ($Uncompress) $this->RaiseError('Unable to uncompress file "'.$NameOrIdx.'" because it is compressed with method '.$meth.'.');
+            if ($Uncompress) {
+                $this->RaiseError('Unable to uncompress file "'.$NameOrIdx.'" because it is compressed with method '.$meth.'.');
+            }
         }
         $this->LastReadComp = $Comp;
 
@@ -310,13 +356,16 @@ 
 
     }
 
-    function _ReadFile($idx, $ReadData) {
+    function _ReadFile($idx, $ReadData)
+    {
     // read the file header (and maybe the data ) in the archive, assuming the cursor in at a new file position
 
         $b = $this->_ReadData(30);
 
         $x = $this->_GetHex($b,0,4);
-        if ($x!=='h:04034b50') return $this->RaiseError("Signature of Local File Header #".$idx." (data section) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd)-30).".");
+        if ($x!=='h:04034b50') {
+            return $this->RaiseError("Signature of Local File Header #".$idx." (data section) expected but not found at position ".$this->_TxtPos(ftell($this->ArchHnd)-30).".");
+        }
 
         $x = array();
         $x['vers'] = $this->_GetDec($b,4,2);
@@ -348,7 +397,9 @@ 
             }
         } else {
             $len = $x['l_data_c'];
-            if ($len==0) $this->RaiseError("File Data #".$idx." cannt be read because no length is specified in the Local File Header and its Central Directory information has not been found.");
+            if ($len==0) {
+                $this->RaiseError("File Data #".$idx." cannt be read because no length is specified in the Local File Header and its Central Directory information has not been found.");
+            }
         }
 
         if ($ReadData) {
@@ -389,11 +440,14 @@ 
 
     }
 
-    function FileReplace($NameOrIdx, $Data, $DataType=self::TBSZIP_STRING, $Compress=true) {
+    function FileReplace($NameOrIdx, $Data, $DataType=self::TBSZIP_STRING, $Compress=true)
+    {
     // Store replacement information.
 
         $idx = $this->FileGetIdx($NameOrIdx);
-        if ($idx===false) return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        if ($idx===false) {
+            return $this->RaiseError('File "'.$NameOrIdx.'" is not found in the Central Directory.');
+        }
 
         $pos = $this->CdFileLst[$idx]['p_loc'];
 
@@ -405,7 +459,9 @@ 
             // file to replace
             $Diff = - $this->CdFileLst[$idx]['l_data_c'];
             $Ref = $this->_DataCreateNewRef($Data, $DataType, $Compress, $Diff, $NameOrIdx);
-            if ($Ref===false) return false;
+            if ($Ref===false) {
+                return false;
+            }
             $this->ReplInfo[$idx] = $Ref;
             $Result = $Ref['res'];
         }
@@ -420,7 +476,8 @@ 
      * Return the state of the file.
      * @return {string} 'u'=unchanged, 'm'=modified, 'd'=deleted, 'a'=added, false=unknown
      */
-    function FileGetState($NameOrIdx) {
+    function FileGetState($NameOrIdx)
+    {
 
         $idx = $this->FileGetIdx($NameOrIdx);
         if ($idx===false) {
@@ -442,7 +499,8 @@ 
 
     }
 
-    function FileCancelModif($NameOrIdx, $ReplacedAndDeleted=true) {
+    function FileCancelModif($NameOrIdx, $ReplacedAndDeleted=true)
+    {
     // cancel added, modified or deleted modifications on a file in the archive
     // return the number of cancels
 
@@ -472,7 +530,8 @@ 
 
     }
 
-    function Flush($Render=self::TBSZIP_DOWNLOAD, $File='', $ContentType='') {
+    function Flush($Render=self::TBSZIP_DOWNLOAD, $File='', $ContentType='')
+    {
 
         if ( ($File!=='') && ($this->ArchFile===$File) && ($Render==self::TBSZIP_FILE) ) {
             $this->RaiseError('Method Flush() cannot overwrite the current opened archive: \''.$File.'\''); // this makes corrupted zip archives without PHP error.
@@ -489,7 +548,9 @@ 
         $date  = $this->_MsDos_Date($now);
         $time  = $this->_MsDos_Time($now);
 
-        if (!$this->OutputOpen($Render, $File, $ContentType)) return false;
+        if (!$this->OutputOpen($Render, $File, $ContentType)) {
+            return false;
+        }
 
         // output modified zipped files and unmodified zipped files that are beetween them
         ksort($this->ReplByPos);
@@ -497,7 +558,9 @@ 
             // output data from the zip archive which is before the data to replace
             $this->OutputFromArch($ArchPos, $ReplPos);
             // get current file information
-            if (!isset($this->VisFileLst[$ReplIdx])) $this->_ReadFile($ReplIdx, false);
+            if (!isset($this->VisFileLst[$ReplIdx])) {
+                $this->_ReadFile($ReplIdx, false);
+            }
             $FileInfo =& $this->VisFileLst[$ReplIdx];
             $b1 = $FileInfo['bin'];
             if (isset($FileInfo['desc_bin'])) {
@@ -520,7 +583,10 @@ 
                 $this->_PutDec($b1, $ReplInfo['crc32'], 14, 4); // crc32
                 $this->_PutDec($b1, $ReplInfo['len_c'], 18, 4); // l_data_c
                 $this->_PutDec($b1, $ReplInfo['len_u'], 22, 4); // l_data_u
-                if ($ReplInfo['meth']!==false) $this->_PutDec($b1, $ReplInfo['meth'], 8, 2); // meth
+                if ($ReplInfo['meth']!==false) {
+                    $this->_PutDec($b1, $ReplInfo['meth'], 8, 2);
+                }
+                // meth
                 // prepare the bottom description if the zipped file, if any
                 if ($b2!=='') {
                     $d = (strlen($b2)==16) ? 4 : 0; // offset because of the signature if any
@@ -544,7 +610,10 @@ 
         }
 
         // Ouput all the zipped files that remain before the Central Directory listing
-        if ($this->ArchHnd!==false) $this->OutputFromArch($ArchPos, $this->CdPos); // ArchHnd is false if CreateNew() has been called
+        if ($this->ArchHnd!==false) {
+            $this->OutputFromArch($ArchPos, $this->CdPos);
+        }
+        // ArchHnd is false if CreateNew() has been called
         $ArchPos = $this->CdPos;
 
         // Output file to add
@@ -567,7 +636,10 @@ 
             $b1 = $this->CdFileLst[$i]['bin'];
             $old_cd_len += strlen($b1);
             if (!isset($DelLst[$i])) {
-                if (isset($FicNewPos[$i])) $this->_PutDec($b1, $FicNewPos[$i], 42, 4);   // p_loc
+                if (isset($FicNewPos[$i])) {
+                    $this->_PutDec($b1, $FicNewPos[$i], 42, 4);
+                }
+                // p_loc
                 if (isset($this->ReplInfo[$i])) {
                     $ReplInfo =& $this->ReplInfo[$i];
                     $this->_PutDec($b1, $time, 12, 2); // time
@@ -575,7 +647,10 @@ 
                     $this->_PutDec($b1, $ReplInfo['crc32'], 16, 4); // crc32
                     $this->_PutDec($b1, $ReplInfo['len_c'], 20, 4); // l_data_c
                     $this->_PutDec($b1, $ReplInfo['len_u'], 24, 4); // l_data_u
-                    if ($ReplInfo['meth']!==false) $this->_PutDec($b1, $ReplInfo['meth'], 10, 2); // meth
+                    if ($ReplInfo['meth']!==false) {
+                        $this->_PutDec($b1, $ReplInfo['meth'], 10, 2);
+                    }
+                    // meth
                 }
                 $b2 .= $b1;
             }
@@ -585,7 +660,10 @@ 
         $DeltaCdLen =  $DeltaCdLen + strlen($b2) - $old_cd_len;
 
         // Output until "end of central directory record"
-        if ($this->ArchHnd!==false) $this->OutputFromArch($ArchPos, $this->CdEndPos); // ArchHnd is false if CreateNew() has been called
+        if ($this->ArchHnd!==false) {
+            $this->OutputFromArch($ArchPos, $this->CdEndPos);
+        }
+        // ArchHnd is false if CreateNew() has been called
 
         // Output file information of the Central Directory for added files
         if ($AddNbr>0) {
@@ -625,11 +703,14 @@ 
     // output functions
     // ----------------
 
-    function OutputOpen($Render, $File, $ContentType) {
+    function OutputOpen($Render, $File, $ContentType)
+    {
 
         if (($Render & self::TBSZIP_FILE)==self::TBSZIP_FILE) {
             $this->OutputMode = self::TBSZIP_FILE;
-            if (''.$File=='') $File = basename($this->ArchFile).'.zip';
+            if (''.$File=='') {
+                $File = basename($this->ArchFile).'.zip';
+            }
             $this->OutputHandle = @fopen($File, 'w');
             if ($this->OutputHandle===false) {
                 return $this->RaiseError('Method Flush() cannot overwrite the target file \''.$File.'\'. This may not be a valid file path or the file may be locked by another process or because of a denied permission.');
@@ -640,11 +721,15 @@ 
         } elseif (($Render & self::TBSZIP_DOWNLOAD)==self::TBSZIP_DOWNLOAD) {
             $this->OutputMode = self::TBSZIP_DOWNLOAD;
             // Output the file
-            if (''.$File=='') $File = basename($this->ArchFile);
+            if (''.$File=='') {
+                $File = basename($this->ArchFile);
+            }
             if (($Render & self::TBSZIP_NOHEADER)==self::TBSZIP_NOHEADER) {
             } else {
                 header ('Pragma: no-cache');
-                if ($ContentType!='') header ('Content-Type: '.$ContentType);
+                if ($ContentType!='') {
+                    header ('Content-Type: '.$ContentType);
+                }
                 header('Content-Disposition: attachment; filename="'.$File.'"');
                 header('Expires: 0');
                 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -652,7 +737,9 @@ 
                 header('Content-Description: File Transfer');
                 header('Content-Transfer-Encoding: binary');
                 $Len = $this->_EstimateNewArchSize();
-                if ($Len!==false) header('Content-Length: '.$Len);
+                if ($Len!==false) {
+                    header('Content-Length: '.$Len);
+                }
             }
         } else {
             return $this->RaiseError('Method Flush is called with a unsupported render option.');
@@ -662,9 +749,12 @@ 
 
     }
 
-    function OutputFromArch($pos, $pos_stop) {
+    function OutputFromArch($pos, $pos_stop)
+    {
         $len = $pos_stop - $pos;
-        if ($len<0) return;
+        if ($len<0) {
+            return;
+        }
         $this->_MoveTo($pos);
         $block = 1024;
         while ($len>0) {
@@ -676,7 +766,8 @@ 
         unset($x);
     }
 
-    function OutputFromString($data) {
+    function OutputFromString($data)
+    {
         if ($this->OutputMode===self::TBSZIP_DOWNLOAD) {
             echo $data; // donwload
         } elseif ($this->OutputMode===self::TBSZIP_STRING) {
@@ -686,7 +777,8 @@ 
         }
     }
 
-    function OutputClose() {
+    function OutputClose()
+    {
         if ( ($this->OutputMode===self::TBSZIP_FILE) && ($this->OutputHandle!==false) ) {
             fclose($this->OutputHandle);
             $this->OutputHandle = false;
@@ -697,11 +789,13 @@ 
     // Reading functions
     // ----------------
 
-    function _MoveTo($pos, $relative = SEEK_SET) {
+    function _MoveTo($pos, $relative = SEEK_SET)
+    {
         fseek($this->ArchHnd, $pos, $relative);
     }
 
-    function _ReadData($len) {
+    function _ReadData($len)
+    {
         if ($len>0) {
             $x = fread($this->ArchHnd, $len);
             return $x;
@@ -714,22 +808,27 @@ 
     // Take info from binary data
     // ----------------
 
-    function _GetDec($txt, $pos, $len) {
+    function _GetDec($txt, $pos, $len)
+    {
         $x = substr($txt, $pos, $len);
         $z = 0;
         for ($i=0;$i<$len;$i++) {
             $asc = ord($x[$i]);
-            if ($asc>0) $z = $z + $asc*pow(256,$i);
+            if ($asc>0) {
+                $z = $z + $asc*pow(256,$i);
+            }
         }
         return $z;
     }
 
-    function _GetHex($txt, $pos, $len) {
+    function _GetHex($txt, $pos, $len)
+    {
         $x = substr($txt, $pos, $len);
         return 'h:'.bin2hex(strrev($x));
     }
 
-    function _GetBin($txt, $pos, $len) {
+    function _GetBin($txt, $pos, $len)
+    {
         $x = substr($txt, $pos, $len);
         $z = '';
         for ($i=0;$i<$len;$i++) {
@@ -749,14 +848,16 @@ 
     // Put info into binary data
     // ----------------
 
-    function _PutDec(&$txt, $val, $pos, $len) {
+    function _PutDec(&$txt, $val, $pos, $len)
+    {
         $x = '';
         for ($i=0;$i<$len;$i++) {
             if ($val==0) {
                 $z = 0;
             } else {
                 $z = intval($val % 256);
-                if (($val<0) && ($z!=0)) { // ($z!=0) is very important, example: val=-420085702
+                if (($val<0) && ($z!=0)) {
+// ($z!=0) is very important, example: val=-420085702
                     // special opration for negative value. If the number id too big, PHP stores it into a signed integer. For example: crc32('coucou') => -256185401 instead of  4038781895. NegVal = BigVal - (MaxVal+1) = BigVal - 256^4
                     $val = ($val - $z)/256 -1;
                     $z = 256 + $z;
@@ -769,18 +870,21 @@ 
         $txt = substr_replace($txt, $x, $pos, $len);
     }
 
-    function _MsDos_Date($Timestamp = false) {
+    function _MsDos_Date($Timestamp = false)
+    {
         // convert a date-time timstamp into the MS-Dos format
         $d = ($Timestamp===false) ? getdate() : getdate($Timestamp);
         return (($d['year']-1980)*512) + ($d['mon']*32) + $d['mday'];
     }
-    function _MsDos_Time($Timestamp = false) {
+    function _MsDos_Time($Timestamp = false)
+    {
         // convert a date-time timstamp into the MS-Dos format
         $d = ($Timestamp===false) ? getdate() : getdate($Timestamp);
         return ($d['hours']*2048) + ($d['minutes']*32) + intval($d['seconds']/2); // seconds are rounded to an even number in order to save 1 bit
     }
 
-    function _MsDos_Debug($date, $time) {
+    function _MsDos_Debug($date, $time)
+    {
         // Display the formated date and time. Just for debug purpose.
         // date end time are encoded on 16 bits (2 bytes) : date = yyyyyyymmmmddddd , time = hhhhhnnnnnssssss
         $y = ($date & 65024)/512 + 1980;
@@ -792,7 +896,8 @@ 
         return $y.'-'.str_pad($m,2,'0',STR_PAD_LEFT).'-'.str_pad($d,2,'0',STR_PAD_LEFT).' '.str_pad($h,2,'0',STR_PAD_LEFT).':'.str_pad($i,2,'0',STR_PAD_LEFT).':'.str_pad($s,2,'0',STR_PAD_LEFT);
     }
 
-    function _TxtPos($pos) {
+    function _TxtPos($pos)
+    {
         // Return the human readable position in both decimal and hexa
         return $pos." (h:".dechex($pos).")";
     }
@@ -803,7 +908,8 @@ 
      * Return false if the record is not found. The comment cannot exceed 65335 bytes (=FFFF).
      * The method is read backwards a block of 256 bytes and search the key in this block.
      */
-    function _FindCDEnd($cd_info) {
+    function _FindCDEnd($cd_info)
+    {
         $nbr = 1;
         $p = false;
         $pos = ftell($this->ArchHnd) - 4 - 256;
@@ -825,7 +931,8 @@ 
         return false;
     }
 
-    function _DataOuputAddedFile($Idx, $PosLoc) {
+    function _DataOuputAddedFile($Idx, $PosLoc)
+    {
 
         $Ref =& $this->AddInfo[$Idx];
         $this->_DataPrepare($Ref); // get data from external file if necessary
@@ -885,7 +992,8 @@ 
 
     }
 
-    function _DataCreateNewRef($Data, $DataType, $Compress, $Diff, $NameOrIdx) {
+    function _DataCreateNewRef($Data, $DataType, $Compress, $Diff, $NameOrIdx)
+    {
 
         $file_time = false;
         if (is_array($Compress)) {
@@ -929,7 +1037,9 @@ 
             $fi = stat($path);
             if ($fi !== false) {
                 $fz = $fi['size'];
-                if ($len_u===false) $len_u = $fz;
+                if ($len_u===false) {
+                    $len_u = $fz;
+                }
                 $len_c = ($Compress) ? false : $fz;
                 $file_time = $fi['mtime'];
             } else {
@@ -943,12 +1053,15 @@ 
 
     }
 
-    function _DataPrepare(&$Ref) {
+    function _DataPrepare(&$Ref)
+    {
         // returns the real size of data
         // TODO: support for data returned from okapi cache
         if ($Ref['path']!==false) {
             $Ref['data'] = file_get_contents($Ref['path']);
-            if ($Ref['crc32']===false) $Ref['crc32'] = crc32($Ref['data']);
+            if ($Ref['crc32']===false) {
+                $Ref['crc32'] = crc32($Ref['data']);
+            }
             if ($Ref['len_c']===false) {
                 // means the data must be compressed
                 $Ref['data'] = gzdeflate($Ref['data']);
@@ -959,7 +1072,8 @@ 
     /**
      * Return the size of the new archive, or false if it cannot be calculated (because of external file that must be compressed before to be insered)
      */
-    function _EstimateNewArchSize($Optim=true) {
+    function _EstimateNewArchSize($Optim=true)
+    {
 
         if ($this->ArchIsNew) {
             $Len = strlen($this->CdInfo['bin']);
@@ -977,13 +1091,18 @@ 
                 // file to delete
                 $Info =& $this->CdFileLst[$i];
                 if (!isset($this->VisFileLst[$i])) {
-                    if ($Optim) return false; // if $Optimization is set to true, then we d'ont rewind to read information
+                    if ($Optim) {
+                        return false;
+                    }
+                    // if $Optimization is set to true, then we d'ont rewind to read information
                     $this->_MoveTo($Info['p_loc']);
                     $this->_ReadFile($i, false);
                 }
                 $Vis =& $this->VisFileLst[$i];
                 $Len += -strlen($Vis['bin']) -strlen($Info['bin']) - $Info['l_data_c'];
-                if (isset($Vis['desc_bin'])) $Len += -strlen($Vis['desc_bin']);
+                if (isset($Vis['desc_bin'])) {
+                    $Len += -strlen($Vis['desc_bin']);
+                }
             } elseif ($Ref['len_c']===false) {
                 return false; // information not yet known
             } else {

htdocs/okapi/lib/ocpl_access_logs.php

Braces +36 added lines, -33 removed lines

@@ -22,20 +22,18 @@ 
         // traverse PHP call stack to find out who originally called us
         // first, find first service_runner.php invocation
         // then, find previous class invocation
-        for($i = count($trace)-1; $i >= 0; $i--)
-        {
+        for($i = count($trace)-1; $i >= 0; $i--) {
             $frame = $trace[$i];
-            if ($break_next && isset($frame['class']))
-            {
+            if ($break_next && isset($frame['class'])) {
                 $class_elems = explode('\\', $frame['class']);
-                if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                if (count($class_elems) >= 2) {
+                                    $org_caller = $class_elems[count($class_elems)-2];
+                }
                 break;
             }
             if (isset($frame['file']) &&
                     // test if file ends with service_runner.php
-                    substr($frame['file'], -strlen('service_runner.php')) === 'service_runner.php')
-            {
+                    substr($frame['file'], -strlen('service_runner.php')) === 'service_runner.php') {
                 $break_next = true;
             }
         }
@@ -50,11 +48,11 @@ 
      */
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
-        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true) {
+                    return ;
+        }
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             // TODO: can we use the _SERVER global here? or should we make them abstract, and
             // pass along with request object?
             $remote_addr_escaped = "'" . Db::escape_string($_SERVER['REMOTE_ADDR']) . "'";
@@ -67,14 +65,16 @@ 
             $original_caller_escaped = "'" . Db::escape_string(self::get_original_caller()) . "'";
 
             $user_id = null;
-            if ($request->token != null)
-                $user_id = $request->token->user_id;
+            if ($request->token != null) {
+                            $user_id = $request->token->user_id;
+            }
             $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
-            if (is_array($cache_ids)){
-                if (count($cache_ids) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+            if (is_array($cache_ids)) {
+                if (count($cache_ids) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids) . "'";
             }
@@ -99,30 +99,33 @@ 
 
             // check, if all the geocaches has already been logged
             if (is_array($cache_ids) && count($already_logged_cache_ids) == count($cache_ids)
-                || !is_array($cache_ids) && count($already_logged_cache_ids) == 1)
-            {
+                || !is_array($cache_ids) && count($already_logged_cache_ids) == 1) {
                 return ;
             }
 
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 $tmp = array();
-                foreach ($cache_ids as $cache_id)
-                    $tmp[$cache_id] = true;
-                foreach ($already_logged_cache_ids as $cache_id)
-                    unset($tmp[$cache_id]);
-                if (count($tmp) <= 0)
-                    return ;
+                foreach ($cache_ids as $cache_id) {
+                                    $tmp[$cache_id] = true;
+                }
+                foreach ($already_logged_cache_ids as $cache_id) {
+                                    unset($tmp[$cache_id]);
+                }
+                if (count($tmp) <= 0) {
+                                    return ;
+                }
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
                 $cache_ids_filterd = $cache_ids;
             }
 
-            if (is_array($cache_ids_filterd)){
-                if (count($cache_ids_filterd) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+            if (is_array($cache_ids_filterd)) {
+                if (count($cache_ids_filterd) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd) . "'";
             }

htdocs/restorecaches.php

Braces +10 added lines, -5 removed lines

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

htdocs/util2/gns/gns_import.php

Braces +2 added lines, -1 removed lines

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

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

Braces +2 added lines, -1 removed lines

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

htdocs/lib2/imagebmp.inc.php

Braces +129 added lines, -130 removed lines

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

htdocs/lib2/RSSParser.class.php

Braces +2 added lines, -1 removed lines

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