OpencachingDeutschland / oc-server3

htdocs/okapi/lib/tbszip.php

Braces +111 added lines, -34 removed lines

@@ -26,7 +26,10 @@ 
 
     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;
@@ -39,7 +42,10 @@ 
 
     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 +59,16 @@ 
             $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);
+        if (isset($this->ArchHnd) and ($this->ArchHnd!==false)) {
+            fclose($this->ArchHnd);
+        }
         $this->ArchFile = '';
         $this->ArchHnd = false;
         $this->CdInfo = array();
@@ -79,12 +89,17 @@ 
 
     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'];
@@ -113,8 +128,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++) {
@@ -147,7 +166,9 @@ 
         $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);
@@ -264,10 +285,14 @@ 
 
     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;
     }
@@ -278,7 +303,9 @@ 
         $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 +329,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;
 
@@ -316,7 +345,9 @@ 
         $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 +379,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) {
@@ -393,7 +426,9 @@ 
     // 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 +440,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'];
         }
@@ -489,7 +526,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 +536,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 +561,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 +588,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 +614,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 +625,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 +638,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) {
@@ -629,7 +685,9 @@ 
 
         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 +698,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 +714,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.');
@@ -664,7 +728,9 @@ 
 
     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) {
@@ -719,7 +785,9 @@ 
         $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;
     }
@@ -929,7 +997,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 {
@@ -948,7 +1018,9 @@ 
         // 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']);
@@ -977,13 +1049,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/service_runner.php

Braces +17 added lines, -11 removed lines

@@ -71,8 +71,9 @@ 
     /** Get method options (is consumer required etc.). */
     public static function options($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         require_once($GLOBALS['rootpath']."okapi/$service_name.php");
         try
         {
@@ -92,8 +93,9 @@ 
      */
     public static function docs($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         try {
             return file_get_contents("$service_name.xml", true);
         } catch (Exception $e) {
@@ -114,8 +116,9 @@ 
     {
         Okapi::init_internals();
 
-        if (!self::exists($service_name))
-            throw new Exception("Method does not exist: '$service_name'");
+        if (!self::exists($service_name)) {
+                    throw new Exception("Method does not exist: '$service_name'");
+        }
 
         $options = self::options($service_name);
         if ($options['min_auth_level'] >= 2 && $request->consumer == null)
@@ -178,18 +181,21 @@ 
         if ($request !== null) {
             $consumer_key = ($request->consumer != null) ? $request->consumer->key : 'anonymous';
             $user_id = (($request->token != null) && ($request->token instanceof OkapiAccessToken)) ? $request->token->user_id : -1;
-            if ($request->is_http_request() && ($service_name[0] == 's'))  # 's' for "services/", we don't want "extra/" included
+            if ($request->is_http_request() && ($service_name[0] == 's')) {
+                # 's' for "services/", we don't want "extra/" included
                 $calltype = 'http';
-            else
-                $calltype = 'internal';
+            } else {
+                            $calltype = 'internal';
+            }
         } else {
             $consumer_key = 'internal';
             $user_id = -1;
             $calltype = 'internal';
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1)
-            $user_id = 0;
+        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1) {
+                    $user_id = 0;
+        }
 
         Db::execute("
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)

htdocs/okapi/cronjobs.php

Braces +80 added lines, -55 removed lines

@@ -54,9 +54,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,8 +75,9 @@ 
         $lock->acquire();
 
         $schedule = Cache::get("cron_schedule");
-        if ($schedule == null)
-            $schedule = array();
+        if ($schedule == null) {
+                    $schedule = array();
+        }
         foreach (self::get_enabled_cronjobs() as $cronjob)
         {
             $name = $cronjob->get_name();
@@ -84,14 +86,12 @@ 
                 if ($cronjob->get_type() != $type)
                 {
                     $next_run = isset($schedule[$name]) ? $schedule[$name] : (time() - 1);
-                }
-                else
+                } else
                 {
                     try
                     {
                         $cronjob->execute();
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         Okapi::mail_admins("Cronjob error: ".$cronjob->get_name(),
                             OkapiExceptionHandler::get_exception_info($e));
@@ -116,9 +116,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;
@@ -150,11 +151,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.
@@ -166,8 +169,9 @@ 
         $schedule = Cache::get("cron_schedule");
         if ($schedule != null)
         {
-            if (isset($schedule[$thejob->get_name()]))
-                unset($schedule[$thejob->get_name()]);
+            if (isset($schedule[$thejob->get_name()])) {
+                            unset($schedule[$thejob->get_name()]);
+            }
             Cache::set("cron_schedule", $schedule, 30*86400);
         }
 
@@ -260,8 +264,9 @@ 
     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();
+        }
     }
 }
 
@@ -361,8 +366,9 @@ 
     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("
@@ -419,8 +425,9 @@ 
     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.
 
@@ -506,8 +513,10 @@ 
     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 === 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.
@@ -520,14 +529,14 @@ 
         # 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)
         {
             Cache::set('crontab_check_counter', $counter, 86400);
-        }
-        elseif ($counter == 0)
+        } elseif ($counter == 0)
         {
             Okapi::mail_admins(
                 "Crontab not working.",
@@ -605,18 +614,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
@@ -647,17 +662,19 @@ 
         $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;
+            if ($time < time() - 10*86400) {
+                            $new_min_revision = max($new_min_revision, $r);
+            } else {
+                            $new_data[$time] = $r;
+            }
         }
         Db::execute("
             delete from okapi_clog
@@ -721,12 +738,14 @@ 
         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";
@@ -749,8 +768,9 @@ 
         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";
@@ -777,8 +797,9 @@ 
         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";
         }
@@ -813,11 +834,14 @@ 
         $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";
@@ -835,14 +859,15 @@ 
         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.
+                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";

htdocs/okapi/controller.php

Braces +13 added lines, -10 removed lines

@@ -37,20 +37,23 @@ 
     {
         # Chop off the ?args=... part.
 
-        if (strpos($uri, '?') !== false)
-            $uri = substr($uri, 0, strpos($uri, '?'));
+        if (strpos($uri, '?') !== false) {
+                    $uri = substr($uri, 0, strpos($uri, '?'));
+        }
 
         # Chop off everything before "/okapi/". This should work for okay for most "weird"
         # server configurations. It will also address a more subtle issue described here:
         # http://stackoverflow.com/questions/8040461/request-uri-unexpectedly-contains-fqdn
 
-        if (strpos($uri, "/okapi/") !== false)
-            $uri = substr($uri, strpos($uri, "/okapi/"));
+        if (strpos($uri, "/okapi/") !== false) {
+                    $uri = substr($uri, strpos($uri, "/okapi/"));
+        }
 
         # Make sure we're in the right directory (.htaccess should make sure of that).
 
-        if (strpos($uri, "/okapi/") !== 0)
-            throw new Exception("'$uri' is outside of the /okapi/ path.");
+        if (strpos($uri, "/okapi/") !== 0) {
+                    throw new Exception("'$uri' is outside of the /okapi/ path.");
+        }
         $uri = substr($uri, 7);
 
         # Initializing internals and running pre-request cronjobs (we don't want
@@ -75,13 +78,13 @@ 
                     require_once($GLOBALS['rootpath']."okapi/views/$namespace.php");
                     $response = call_user_func_array(array('\\okapi\\views\\'.
                         str_replace('/', '\\', $namespace).'\\View', 'call'), $matches);
-                    if ($response)
-                        $response->display();
+                    if ($response) {
+                                            $response->display();
+                    }
                     return;
                 }
             }
-        }
-        catch (Http404 $e)
+        } catch (Http404 $e)
         {
             /* pass */
         }

htdocs/okapi/views/update.php

Braces +27 added lines, -25 removed lines

@@ -28,11 +28,11 @@ 
         try
         {
             return Okapi::get_var('db_version', 0) + 0;
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
-            if (strpos($e->getMessage(), "okapi_vars' doesn't exist") !== false)
-                return 0;
+            if (strpos($e->getMessage(), "okapi_vars' doesn't exist") !== false) {
+                            return 0;
+            }
             throw $e;
         }
     }
@@ -45,8 +45,9 @@ 
             if (strpos($name, "ver") === 0)
             {
                 $ver = substr($name, 3) + 0;
-                if ($ver > $max_db_version)
-                    $max_db_version = $ver;
+                if ($ver > $max_db_version) {
+                                    $max_db_version = $ver;
+                }
             }
         }
         return $max_db_version;
@@ -71,8 +72,7 @@ 
         {
             self::_call();
             $lock->release();
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             # Error occured. Make sure the lock is released and rethrow.
 
@@ -98,8 +98,7 @@ 
             try
             {
                 Db::select_value("select 1 from caches limit 1");
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 self::out(
                     "\n\n".
@@ -110,14 +109,12 @@ 
                 );
             }
             return;
-        }
-        elseif ($max_ver == $current_ver)
+        } elseif ($max_ver == $current_ver)
         {
             self::out("It is up-to-date.\n\n");
-        }
-        elseif ($max_ver < $current_ver)
-            throw new Exception();
-        else
+        } elseif ($max_ver < $current_ver) {
+                    throw new Exception();
+        } else
         {
             self::out("Updating to version $max_ver... PLEASE WAIT\n\n");
 
@@ -340,8 +337,7 @@ 
         try
         {
             Db::execute("alter table cache_logs add key `uuid` (`uuid`)");
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             // key exists
         }
@@ -609,13 +605,18 @@ 
     {
         # Remove unused locks (these might have been created in previous versions of OKAPI).
 
-        for ($z=0; $z<=2; $z++)
-            for ($x=0; $x<(1<<$z); $x++)
-                for ($y=0; $y<(1<<$z); $y++)
+        for ($z=0; $z<=2; $z++) {
+                    for ($x=0;
+        }
+        $x<(1<<$z); $x++) {
+                            for ($y=0;
+            }
+            $y<(1<<$z); $y++)
                 {
                     $lockname = "tile-computation-$z-$x-$y";
-                    if (OkapiLock::exists($lockname))
-                        OkapiLock::get($lockname)->remove();
+                    if (OkapiLock::exists($lockname)) {
+                                            OkapiLock::get($lockname)->remove();
+                    }
                 }
     }
 
@@ -628,8 +629,9 @@ 
             foreach (array("", "-0", "-1") as $suffix)
             {
                 $lockname = "tile-$z$suffix";
-                if (OkapiLock::exists($lockname))
-                    OkapiLock::get($lockname)->remove();
+                if (OkapiLock::exists($lockname)) {
+                                    OkapiLock::get($lockname)->remove();
+                }
             }
         }
     }

htdocs/okapi/views/changelog_helper.inc.php

Braces +2 added lines, -4 removed lines

@@ -44,8 +44,7 @@ 
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
                 Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # GitHub failed on us. User backup list, if available.
 
@@ -69,8 +68,7 @@ 
             # We could not retreive the changelog from Github, and there was
             # no backup key or it expired. Probably we are on a developer
             # machine. The template will output some error message.
-        }
-        else
+        } else
         {
             $commits = array();
             $versions = array();

htdocs/okapi/views/devel/cronreport.php

Braces +26 added lines, -20 removed lines

@@ -28,19 +28,22 @@ 
 
         require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
         $schedule = Cache::get("cron_schedule");
-        if ($schedule == null)
-            $schedule = array();
+        if ($schedule == null) {
+                    $schedule = array();
+        }
         print "Nearest event: ";
-        if (Okapi::get_var('cron_nearest_event'))
-            print "in ".(Okapi::get_var('cron_nearest_event') - time())." seconds.\n\n";
-        else
-            print "NOT SET\n\n";
+        if (Okapi::get_var('cron_nearest_event')) {
+                    print "in ".(Okapi::get_var('cron_nearest_event') - time())." seconds.\n\n";
+        } else {
+                    print "NOT SET\n\n";
+        }
         $cronjobs = CronJobController::get_enabled_cronjobs();
         usort($cronjobs, function($a, $b) {
             $cmp = function($a, $b) { return ($a < $b) ? -1 : (($a > $b) ? 1 : 0); };
             $by_type = $cmp($a->get_type(), $b->get_type());
-            if ($by_type != 0)
-                return $by_type;
+            if ($by_type != 0) {
+                            return $by_type;
+            }
             return $cmp($a->get_name(), $b->get_name());
         });
         print str_pad("TYPE", 11)."  ".str_pad("NAME", 40)."  SCHEDULE\n";
@@ -50,25 +53,28 @@ 
             $type = $cronjob->get_type();
             $name = $cronjob->get_name();
             print str_pad($type, 11)."  ".str_pad($name, 40)."  ";
-            if (!isset($schedule[$name]))
-                print "NOT YET SCHEDULED\n";
-            elseif ($schedule[$name] <= time())
-                print "DELAYED: should be run ".(time() - $schedule[$name])." seconds ago\n";
-            else
-                print "scheduled to run in ".str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT)." seconds\n";
+            if (!isset($schedule[$name])) {
+                            print "NOT YET SCHEDULED\n";
+            } elseif ($schedule[$name] <= time()) {
+                            print "DELAYED: should be run ".(time() - $schedule[$name])." seconds ago\n";
+            } else {
+                            print "scheduled to run in ".str_pad($schedule[$name] - time(), 6, " ", STR_PAD_LEFT)." seconds\n";
+            }
         }
         print "\n";
         print "Crontab last ping: ";
-        if (Cache::get('crontab_last_ping'))
-            print (time() - Cache::get('crontab_last_ping'))." seconds ago";
-        else
-            print "NEVER";
+        if (Cache::get('crontab_last_ping')) {
+                    print (time() - Cache::get('crontab_last_ping'))." seconds ago";
+        } else {
+                    print "NEVER";
+        }
         print " (crontab_check_counter: ".Cache::get('crontab_check_counter').").\n";
         print "clog_revisions_daily: ";
         if (Cache::get('clog_revisions_daily'))
         {
-            foreach (Cache::get('clog_revisions_daily') as $time => $rev)
-                print "$rev ";
+            foreach (Cache::get('clog_revisions_daily') as $time => $rev) {
+                            print "$rev ";
+            }
             print "\n";
         } else {
             print "NULL\n";

htdocs/okapi/views/devel/tilereport.php

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
             {
                 $total_calls = $c;
                 $total_runtime = $r;
-            }
-            elseif (strpos($name, 'extra/caches/map/tile/checkpoint') === 0)
+            } elseif (strpos($name, 'extra/caches/map/tile/checkpoint') === 0)
             {
                 $calls[$name[32]] = $c;
                 $runtime[$name[32]] = $r;

htdocs/okapi/views/devel/attrlist.php

Braces +22 added lines, -20 removed lines

@@ -26,12 +26,14 @@ 
         ob_start();
 
         print "Cache Types:\n\n";
-        foreach (self::get_all_cachetypes() as $id => $name)
-            print "$id: $name\n";
+        foreach (self::get_all_cachetypes() as $id => $name) {
+                    print "$id: $name\n";
+        }
 
         print "\nLog Types:\n\n";
-        foreach (self::get_all_logtypes() as $id => $name)
-            print "$id: $name\n";
+        foreach (self::get_all_logtypes() as $id => $name) {
+                    print "$id: $name\n";
+        }
 
         print "\nAttributes:\n\n";
         require_once($GLOBALS['rootpath'].'okapi/services/attrs/attr_helper.inc.php');
@@ -42,17 +44,20 @@ 
             print $internal_id.": ";
             $langkeys = array_keys($langs);
             sort($langkeys);
-            if (in_array('en', $langkeys))
-                print strtoupper($langs['en']);
-            else
-                print ">>>> ENGLISH NAME UNSET! <<<<";
-            if (isset($internal2acode[$internal_id]))
-                print " - ".$internal2acode[$internal_id];
-            else
-                print " - >>>> MISSING A-CODE MAPPING <<<<";
+            if (in_array('en', $langkeys)) {
+                            print strtoupper($langs['en']);
+            } else {
+                            print ">>>> ENGLISH NAME UNSET! <<<<";
+            }
+            if (isset($internal2acode[$internal_id])) {
+                            print " - ".$internal2acode[$internal_id];
+            } else {
+                            print " - >>>> MISSING A-CODE MAPPING <<<<";
+            }
             print "\n";
-            foreach ($langkeys as $langkey)
-                print "        $langkey: ".$langs[$langkey]."\n";
+            foreach ($langkeys as $langkey) {
+                            print "        $langkey: ".$langs[$langkey]."\n";
+            }
         }
 
         print "\nAttribute notices:\n\n";
@@ -110,8 +115,7 @@ 
             # have translation tables.
 
             $rs = Db::query("select id, language, text_long from cache_attrib order by id");
-        }
-        else
+        } else
         {
             # OCDE branch uses translation tables. Let's make a select which will
             # produce results compatible with the one above.
@@ -146,8 +150,7 @@ 
             # OCPL branch does not store cache types in many languages (just two).
 
             $rs = Db::query("select id, en from cache_type order by id");
-        }
-        else
+        } else
         {
             # OCDE branch uses translation tables.
 
@@ -181,8 +184,7 @@ 
             # OCPL branch does not store cache types in many languages (just two).
 
             $rs = Db::query("select id, en from log_types order by id");
-        }
-        else
+        } else
         {
             # OCDE branch uses translation tables.