Stefanius67 / XFPDF

OPlathey/FPDF/FPDF.php

Braces +159 added lines, -120 removed lines

@@ -259,8 +259,9 @@ 
         // Set left, top and right margins

         $this->lMargin = $left;

         $this->tMargin = $top;

-        if($right===null)

-            $right = $left;

+        if($right===null) {

+                    $right = $left;

+        }

         $this->rMargin = $right;

     }

 

@@ -274,8 +275,9 @@ 
     {

         // Set left margin

         $this->lMargin = $margin;

-        if($this->page>0 && $this->x<$margin)

-            $this->x = $margin;

+        if($this->page>0 && $this->x<$margin) {

+                    $this->x = $margin;

+        }

     }

 

     /**

@@ -347,14 +349,16 @@ 
     public function setDisplayMode($zoom, string $layout='default') : void

     {

         // Set display mode in viewer

-        if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

-            $this->ZoomMode = $zoom;

-        else

-            $this->error('Incorrect zoom display mode: '.$zoom);

-        if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

-            $this->LayoutMode = $layout;

-        else

-            $this->error('Incorrect layout display mode: '.$layout);

+        if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {

+                    $this->ZoomMode = $zoom;

+        } else {

+                    $this->error('Incorrect zoom display mode: '.$zoom);

+        }

+        if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {

+                    $this->LayoutMode = $layout;

+        } else {

+                    $this->error('Incorrect layout display mode: '.$layout);

+        }

     }

 

     /**

@@ -369,10 +373,11 @@ 
     public function setCompression(bool $compress) : void

     {

         // Set page compression

-        if(function_exists('gzcompress'))

-            $this->compress = $compress;

-        else

-            $this->compress = false;

+        if(function_exists('gzcompress')) {

+                    $this->compress = $compress;

+        } else {

+                    $this->compress = false;

+        }

     }

 

     /**

@@ -463,10 +468,12 @@ 
     public function close() : void

     {

         // Terminate document

-        if($this->state==3)

-            return;

-        if($this->page==0)

-            $this->addPage();

+        if($this->state==3) {

+                    return;

+        }

+        if($this->page==0) {

+                    $this->addPage();

+        }

         // Page footer

         $this->InFooter = true;

         $this->footer();

@@ -682,8 +689,9 @@ 
         $cw = &$this->CurrentFont['cw'];

         $w = 0;

         $l = strlen($s);

-        for($i=0;$i<$l;$i++)

-            $w += $cw[$s[$i]];

+        for($i=0;$i<$l;$i++) {

+                    $w += $cw[$s[$i]];

+        }

         return $w*$this->FontSize/1000;

     }

     

@@ -697,8 +705,9 @@ 
     {

         // Set line width

         $this->LineWidth = $width;

-        if($this->page>0)

-            $this->out(sprintf('%.2F w',$width*$this->k));

+        if($this->page>0) {

+                    $this->out(sprintf('%.2F w',$width*$this->k));

+        }

     }

     

     /**

@@ -734,12 +743,13 @@ 
     public function rect(float $x, float $y, float $w, float $h, string $style='') : void

     {

         // Draw a rectangle

-        if($style=='F')

-            $op = 'f';

-        elseif($style=='FD' || $style=='DF')

-            $op = 'B';

-        else

-            $op = 'S';

+        if($style=='F') {

+                    $op = 'f';

+        } elseif($style=='FD' || $style=='DF') {

+                    $op = 'B';

+        } else {

+                    $op = 'S';

+        }

         $this->out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));

     }

     

@@ -764,23 +774,27 @@ 
     {

         // Add a TrueType, OpenType or Type1 font

         $family = strtolower($family);

-        if($file=='')

-            $file = str_replace(' ','',$family).strtolower($style).'.php';

+        if($file=='') {

+                    $file = str_replace(' ','',$family).strtolower($style).'.php';

+        }

         $style = strtoupper($style);

-        if($style=='IB')

-            $style = 'BI';

+        if($style=='IB') {

+                    $style = 'BI';

+        }

         $fontkey = $family.$style;

-        if(isset($this->fonts[$fontkey]))

-            return;

+        if(isset($this->fonts[$fontkey])) {

+                    return;

+        }

         $info = $this->loadFont($file);

         $info['i'] = count($this->fonts)+1;

         if(!empty($info['file']))

         {

             // Embedded font

-            if($info['type']=='TrueType')

-                $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

-            else

-                $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+            if($info['type']=='TrueType') {

+                            $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

+            } else {

+                            $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+            }

         }

         $this->fonts[$fontkey] = $info;

     }

@@ -823,42 +837,49 @@ 
     public function setFont(string $family, string $style='', float $size=0) : void

     {

         // Select a font; size given in points

-        if($family=='')

-            $family = $this->FontFamily;

-        else

-            $family = strtolower($family);

+        if($family=='') {

+                    $family = $this->FontFamily;

+        } else {

+                    $family = strtolower($family);

+        }

         $style = strtoupper($style);

         if(strpos($style,'U')!==false)

         {

             $this->underline = true;

             $style = str_replace('U','',$style);

+        } else {

+                    $this->underline = false;

+        }

+        if($style=='IB') {

+                    $style = 'BI';

+        }

+        if($size==0) {

+                    $size = $this->FontSizePt;

         }

-        else

-            $this->underline = false;

-        if($style=='IB')

-            $style = 'BI';

-        if($size==0)

-            $size = $this->FontSizePt;

         // Test if font is already selected

-        if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

-            return;

+        if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {

+                    return;

+        }

         // Test if font is already loaded

         $fontkey = $family.$style;

         if(!isset($this->fonts[$fontkey]))

         {

             // Test if one of the core fonts

-            if($family=='arial')

-                $family = 'helvetica';

+            if($family=='arial') {

+                            $family = 'helvetica';

+            }

             if(in_array($family,$this->CoreFonts))

             {

-                if($family=='symbol' || $family=='zapfdingbats')

-                    $style = '';

+                if($family=='symbol' || $family=='zapfdingbats') {

+                                    $style = '';

+                }

                 $fontkey = $family.$style;

-                if(!isset($this->fonts[$fontkey]))

-                    $this->addFont($family,$style);

+                if(!isset($this->fonts[$fontkey])) {

+                                    $this->addFont($family,$style);

+                }

+            } else {

+                            $this->error('Undefined font: '.$family.' '.$style);

             }

-            else

-                $this->error('Undefined font: '.$family.' '.$style);

         }

         // Select it

         $this->FontFamily = $family;

@@ -866,8 +887,9 @@ 
         $this->FontSizePt = $size;

         $this->FontSize = $size/$this->k;

         $this->CurrentFont = &$this->fonts[$fontkey];

-        if($this->page>0)

-            $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        if($this->page>0) {

+                    $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        }

     }

     

     /**

@@ -1135,16 +1157,19 @@ 
     public function multiCell(float $w, float $h, string $txt, $border=0, string $align='J', bool $fill=false) : void

     {

         // Output text with automatic or explicit line breaks

-        if(!isset($this->CurrentFont))

-            $this->error('No font has been set');

+        if(!isset($this->CurrentFont)) {

+                    $this->error('No font has been set');

+        }

         $cw = &$this->CurrentFont['cw'];

-        if($w==0)

-            $w = $this->w-$this->rMargin-$this->x;

+        if($w==0) {

+                    $w = $this->w-$this->rMargin-$this->x;

+        }

         $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

         $s = str_replace("\r",'',$txt);

         $nb = strlen($s);

-        if($nb>0 && $s[$nb-1]=="\n")

-            $nb--;

+        if($nb>0 && $s[$nb-1]=="\n") {

+                    $nb--;

+        }

         $b = 0;

         $b2 = '';

         if($border)

@@ -1154,14 +1179,15 @@ 
                 $border = 'LTRB';

                 $b = 'LRT';

                 $b2 = 'LR';

-            }

-            else

+            } else

             {

                 $b2 = '';

-                if(strpos($border,'L')!==false)

-                    $b2 .= 'L';

-                if(strpos($border,'R')!==false)

-                    $b2 .= 'R';

+                if(strpos($border,'L')!==false) {

+                                    $b2 .= 'L';

+                }

+                if(strpos($border,'R')!==false) {

+                                    $b2 .= 'R';

+                }

                 $b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;

             }

         }

@@ -1191,8 +1217,9 @@ 
                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

-                    $b = $b2;

+                if($border && $nl==2) {

+                                    $b = $b2;

+                }

                 continue;

             }

             if($c==' ')

@@ -1207,16 +1234,16 @@ 
                 // Automatic line break

                 if($sep==-1)

                 {

-                    if($i==$j)

-                        $i++;

+                    if($i==$j) {

+                                            $i++;

+                    }

                     if($this->ws>0)

                     {

                         $this->ws = 0;

                         $this->out('0 Tw');

                     }

                     $this->cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

-                }

-                else

+                } else

                 {

                     if($align=='J')

                     {

@@ -1231,11 +1258,12 @@ 
                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

-                    $b = $b2;

+                if($border && $nl==2) {

+                                    $b = $b2;

+                }

+            } else {

+                            $i++;

             }

-            else

-                $i++;

         }

         // Last chunk

         if($this->ws>0)

@@ -1243,8 +1271,9 @@ 
             $this->ws = 0;

             $this->out('0 Tw');

         }

-        if($border && strpos($border,'B')!==false)

-            $b .= 'B';

+        if($border && strpos($border,'B')!==false) {

+                    $b .= 'B';

+        }

         $this->cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

         $this->x = $this->lMargin;

     }

@@ -1262,8 +1291,9 @@ 
     public function write(float $h, string $txt, $link='') : void

     {

         // Output text in flowing mode

-        if(!isset($this->CurrentFont))

-            $this->error('No font has been set');

+        if(!isset($this->CurrentFont)) {

+                    $this->error('No font has been set');

+        }

         $cw = &$this->CurrentFont['cw'];

         $w = $this->w-$this->rMargin-$this->x;

         $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

@@ -1295,8 +1325,9 @@ 
                 $nl++;

                 continue;

             }

-            if($c==' ')

-                $sep = $i;

+            if($c==' ') {

+                            $sep = $i;

+            }

             $l += $cw[$c];

             if($l>$wmax)

             {

@@ -1314,11 +1345,11 @@ 
                         $nl++;

                         continue;

                     }

-                    if($i==$j)

-                        $i++;

+                    if($i==$j) {

+                                            $i++;

+                    }

                     $this->cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);

-                }

-                else

+                } else

                 {

                     $this->cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);

                     $i = $sep+1;

@@ -1333,13 +1364,14 @@ 
                     $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

                 }

                 $nl++;

+            } else {

+                            $i++;

             }

-            else

-                $i++;

         }

         // Last chunk

-        if($i!=$j)

-            $this->cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+        if($i!=$j) {

+                    $this->cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+        }

     }

     

     /**

@@ -1353,10 +1385,11 @@ 
     {

         // Line feed; default value is the last cell height

         $this->x = $this->lMargin;

-        if($h===null)

-            $this->y += $this->lasth;

-        else

-            $this->y += $h;

+        if($h===null) {

+                    $this->y += $this->lasth;

+        } else {

+                    $this->y += $h;

+        }

     }

     

     /**

@@ -1534,10 +1567,11 @@ 
     public function setX(float $x) : void

     {

         // Set x position

-        if($x>=0)

-            $this->x = $x;

-        else

-            $this->x = $this->w+$x;

+        if($x>=0) {

+                    $this->x = $x;

+        } else {

+                    $this->x = $this->w+$x;

+        }

     }

 

     /**

@@ -1559,12 +1593,14 @@ 
     public function setY(float $y, bool $resetX=true) : void

     {

         // Set y position and optionally reset x

-        if($y>=0)

-            $this->y = $y;

-        else

-            $this->y = $this->h+$y;

-        if($resetX)

-            $this->x = $this->lMargin;

+        if($y>=0) {

+                    $this->y = $y;

+        } else {

+                    $this->y = $this->h+$y;

+        }

+        if($resetX) {

+                    $this->x = $this->lMargin;

+        }

     }

     

     /**

@@ -1609,10 +1645,12 @@ 
             $dest = $name;

             $name = $tmp;

         }

-        if($dest=='')

-            $dest = 'I';

-        if($name=='')

-            $name = 'doc.pdf';

+        if($dest=='') {

+                    $dest = 'I';

+        }

+        if($name=='') {

+                    $name = 'doc.pdf';

+        }

         switch(strtoupper($dest))

         {

             case 'I':

@@ -1639,8 +1677,9 @@ 
                 break;

             case 'F':

                 // Save to local file

-                if(!file_put_contents($name,$this->buffer))

-                    $this->error('Unable to create output file: '.$name);

+                if(!file_put_contents($name,$this->buffer)) {

+                                    $this->error('Unable to create output file: '.$name);

+                }

                 break;

             case 'S':

                 // Return as a string

@@ -2701,9 +2740,9 @@ 
                     // Level increasing: set first pointer

                     $this->outlines[$parent]['first'] = $i;

                 }

+            } else {

+                            $this->outlines[$i]['parent'] = $nb;

             }

-            else

-                $this->outlines[$i]['parent'] = $nb;

                 if ($o['l'] <= $level && $i > 0) {

                     // Set prev and next pointers

                     $prev = $lru[$o['l']];