joenilson / residentes

extras/fpdf183/exfpdf.php

Braces +33 added lines, -42 removed lines

@@ -17,11 +17,9 @@ 
    public function current_font($c){
       if($c=='family'){
          return $this->FontFamily;
-      }
-      elseif($c=='style'){
+      } elseif($c=='style'){
          return $this->FontStyle;
-      }
-      elseif($c=='size'){
+      } elseif($c=='size'){
          return $this->FontSizePt;
       }
    }
@@ -29,8 +27,7 @@ 
    public function get_color($c){
       if($c=='fill'){
          return $this->FillColor;
-      }
-      elseif($c=='text'){
+      } elseif($c=='text'){
          return $this->TextColor;
       }
    }
@@ -42,11 +39,9 @@ 
    public function get_margin($c){
       if($c=='l'){
          return $this->lMargin;
-      }
-      elseif($c=='r'){
+      } elseif($c=='r'){
          return $this->rMargin;
-      }
-      elseif($c=='t'){
+      } elseif($c=='t'){
          return $this->tMargin;
       }
    }
@@ -84,8 +79,7 @@ 
                break;
             }
          }
-      }
-      else{
+      } else{
          $a=false;
       }
       return $a;
@@ -98,8 +92,7 @@ 
       for($i=0; $i<3; $i++){
          if($n==6){
             $result[$i]=self::$hex[$str[2*$i]]*16+self::$hex[$str[2*$i+1]];
-         }
-         else{
+         } else{
             $result[$i]=self::$hex[$str[$i]]*16+self::$hex[$str[$i]];
          }
       }
@@ -113,16 +106,14 @@ 
          $array=array();
          if($this->is_hex($str)){
             $array=$this->hextodec($str);
-         }
-         elseif($this->is_rgb($str)){
+         } elseif($this->is_rgb($str)){
             $array=explode(',', trim($str, ','));
             for($i=0; $i<3; $i++){
                if(!isset($array[$i])){
                   $array[$i]=0;
                }
             }
-         }
-         else{
+         } else{
             $array=array(null, null, null);
             $i=0;
             $tmp=explode(' ', $str);
@@ -135,11 +126,9 @@ 
          }
          if($p=='T'){
             $this->SetTextColor($array[0],$array[1],$array[2]);
-         }
-         elseif($p=='D'){
+         } elseif($p=='D'){
             $this->SetDrawColor($array[0],$array[1], $array[2]);
-         }
-         elseif($p=='F'){
+         } elseif($p=='F'){
             $this->SetFillColor($array[0],$array[1],$array[2]);
          }
       }
@@ -164,30 +153,35 @@ 
    ************************************************************************/
 
    private function &FontData($family, $style, $size){
-      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);
       }
-      if($style=='IB')
-      $style = 'BI';
+      if($style=='IB') {
+            $style = 'BI';
+      }
       $fontkey = $family.$style;
       if(!isset($this->fonts[$fontkey])){
-         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);
       }
       $result['FontSize'] = $size/$this->k;
       $result['CurrentFont']=&$this->fonts[$fontkey];
@@ -242,8 +236,7 @@ 
                $x-=($a+$sl);
                $a=0;
                $u=$p;
-            }
-            else{
+            } else{
                $x=$cw[$parced_str[$i]]*$cfty['font-size'];
                $t='';
                $u=$i;
@@ -330,8 +323,7 @@ 
          if($line['width']!=0){
             if($align=='R'){
                $dx = $w-$line['width']/($this->k*1000);
-            }
-            elseif($align=='C'){
+            } elseif($align=='C'){
                $dx = ($w-$line['width']/($this->k*1000))/2;
             }
             if($align=='J'){
@@ -365,8 +357,7 @@ 
                   }
                   $xx+=$this->GetStringWidth($tt);
                }
-            }
-            else{
+            } else{
                $this->Text($xx, $y, $txt);
                   if($line['style'][$tj]['href']){
                   $yr=$this->y+0.5*($lh*$line['height']-$line['height']/$this->k);

extras/fpdf183/formatedstring.php

Braces +3 added lines, -6 removed lines

@@ -40,12 +40,10 @@ 
                   if(strpos($r[1], 'U')!==false){
                      $style['font-style'].='U';
                   }
-               }
-               elseif($r[1]){
+               } elseif($r[1]){
                   if($r[0]=='href'){
                      $style[$r[0]]=implode(':', array_slice($r,1));
-                  }
-                  else{
+                  } else{
                      $style[$r[0]]=$r[1];
                   }
                }
@@ -118,8 +116,7 @@ 
             $cs=$this->style_merge($cs, $this->get_style($open[$total[$i]]));
             array_push($tmp, $cs);
             $k=strpos($str, '>',$total[$i]+1)+1;
-         }
-         else{
+         } else{
             $k=$total[$i]+4;
             array_pop($tmp);
             $l=count($tmp)-1;

extras/fpdf183/EasyTable.php

Braces +45 added lines, -90 removed lines

@@ -72,8 +72,7 @@ 
       if($c=='R' || $c=='T'){
          if($c=='R'){
             $result['c-align']=array_pad(array(), $this->col_num, 'L');
-         }
-         else{
+         } else{
             $result['c-align']=array();
          }
       }
@@ -97,11 +96,9 @@ 
    private function inherating(&$sty, $setting, $c){
       if($c=='C'){
          $sty[$setting]=$this->row_style[$setting];
-      }
-      elseif($c=='R'){
+      } elseif($c=='R'){
          $sty[$setting]=$this->table_style[$setting];
-      }
-      else{
+      } else{
          $sty[$setting]=$this->document_style[$setting];
       }
    }
@@ -115,38 +112,32 @@ 
             if($sty['width']==0){
                $sty['width']=$this->document_style['document_width'];
             }
-         }
-         else{
+         } else{
             $x=strpos($sty['width'], '%');
             if($x!=false){
                $x=min(abs(substr($sty['width'], 0, $x)), 100);
                if($x){
                   $sty['width']=$x*$this->document_style['document_width']/100.0;
-               }
-               else{
+               } else{
                   $sty['width']=$this->document_style['document_width'];
                }
-            }
-            else{
+            } else{
                $sty['width']=$this->document_style['document_width'];
             }
          }
          if(!is_numeric($sty['l-margin'])){
             $sty['l-margin']=0;
-         }
-         else{
+         } else{
             $sty['l-margin']=abs($sty['l-margin']);
          }
          if(is_numeric($sty['border-width'])){
             $sty['border-width']=abs($sty['border-width']);
-         }
-         else{
+         } else{
             $sty['border-width']=false;
          }
          if($sty['split-row']=='false'){
             $sty['split-row']=false;
-         }
-         elseif($sty['split-row']!==false){
+         } elseif($sty['split-row']!==false){
             $sty['split-row']=true;
          }
       }
@@ -158,8 +149,7 @@ 
       if(!is_numeric($sty['paddingX'])){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingX', $c);
-         }
-         else{
+         } else{
             $sty['paddingX']=self::XPadding;
          }
       }
@@ -167,16 +157,14 @@ 
       if(!is_numeric($sty['paddingY'])){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'paddingY', $c);
-         }
-         else{
+         } else{
             $sty['paddingY']=self::YPadding;
          }
       }
       $sty['paddingY']=abs($sty['paddingY']);
       if($sty['border']===false && ($c=='C' || $c=='R')){
          $this->inherating($sty, 'border', $c);
-      }
-      else{
+      } else{
          $border=array('T'=>1, 'R'=>1, 'B'=>1, 'L'=>1);
          if(!(is_numeric($sty['border']) && $sty['border']==1)){
             foreach($border as $k=>$v){
@@ -193,12 +181,10 @@ 
          if($sty[$setting]===false || !($this->pdf_obj->is_hex($sty[$setting]) || $this->pdf_obj->is_rgb($sty[$setting]))){
             if($c=='C' || $c=='R'){
                $this->inherating($sty, $setting, $c);
-            }
-            elseif($setting=='font-color'){
+            } elseif($setting=='font-color'){
                $sty[$setting]=$this->document_style[$setting];
             }
-         }
-         else{
+         } else{
             $sty[$setting]=$sty[$setting];
          }
       }
@@ -210,12 +196,10 @@ 
       }
       if(is_numeric($sty['line-height'])){
          $sty['line-height']=self::LP*abs($sty['line-height']);
-      }
-      else{
+      } else{
          if($c=='C' || $c=='R'){
             $this->inherating($sty,'line-height', $c);
-         }
-         else{
+         } else{
             $sty['line-height']=self::LP;
          }
       }
@@ -241,28 +225,23 @@ 
                if($sty['img']['w']+$sty['img']['h']==0){
                   $sty['img']['w']=$img[0];
                   $sty['img']['h']=$img[1];
-               }
-               elseif($sty['img']['w']==0){
+               } elseif($sty['img']['w']==0){
                   $sty['img']['w']=$sty['img']['h']*$ration;
-               }
-               elseif($sty['img']['h']==0){
+               } elseif($sty['img']['h']==0){
                   $sty['img']['h']=$sty['img']['w']/$ration;
                }
-            }
-            else{
+            } else{
                $sty['img']='failed to open stream: file ' . $tmp[0] .' does not exist';
             }
          }
          if(is_numeric($sty['colspan']) && $sty['colspan']>0){
             $sty['colspan']--;
-         }
-         else{
+         } else{
             $sty['colspan']=0;
          }
          if(is_numeric($sty['rowspan']) && $sty['rowspan']>0){
             $sty['rowspan']--;
-         }
-         else{
+         } else{
             $sty['rowspan']=0;
          }
          if($sty['valign']==false && ($sty['rowspan']>0 || $sty['img']!==false)){
@@ -283,8 +262,7 @@ 
                for($i=0; $i<strlen($tmp[1]); $i++){
                   if(preg_match("/[LCRJ]/", $tmp[1][$i])!=0){
                      $sty['c-align'][$i]=$tmp[1][$i];
-                  }
-                  else{
+                  } else{
                      $sty['c-align'][$i]='L';
                   }
                }
@@ -298,23 +276,19 @@ 
       if($sty['align']!='L' && $sty['align']!='C' && $sty['align']!='R' && $sty['align']!='J'){
          if($c=='C'){
             $sty['align']=$this->row_style['c-align'][$pos];
-         }
-         elseif($c=='R'){
+         } elseif($c=='R'){
             $sty['align']='L';
             $sty['c-align']=$this->table_style['c-align'];
-         }
-         else{
+         } else{
             $sty['align']='C';
          }
-      }
-      elseif($c=='T' && $sty['align']=='J'){
+      } elseif($c=='T' && $sty['align']=='J'){
          $sty['align']='C';
       }
       if($sty['valign']!='T' && $sty['valign']!='M' && $sty['valign']!='B'){
          if($c=='C' || $c=='R'){
             $this->inherating($sty, 'valign', $c);
-         }
-         else{
+         } else{
             $sty['valign']='T';
          }
       }
@@ -348,8 +322,7 @@ 
                if($split==0){
                   $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
                }
-            }
-            else{
+            } else{
                $this->pdf_obj->Line($this->row_data[$i][6]+(1+$a[($j+2)%4])%2*$w, $y+(1+$a[($j+1)%4])%2 * $h, $this->row_data[$i][6]+$a[$j%4]*$w, $y+($a[($j+3)%4])%2 *$h);
             }
          }
@@ -393,8 +366,7 @@ 
                if($this->row_data[$i][1]['align']=='C'){
                   $x-=$this->row_data[$i][1]['paddingX'];
                   $x+=($this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'])/2;
-               }
-               elseif($this->row_data[$i][1]['align']=='R'){
+               } elseif($this->row_data[$i][1]['align']=='R'){
                   $x+=$this->row_data[$i][2]-$this->row_data[$i][1]['img']['w'];
                   $x-=2*$this->row_data[$i][1]['paddingX'];
                }
@@ -441,14 +413,12 @@ 
                if(!isset($rw[$j])){
                   if($this->pdf_obj->PageBreak()-($T+$this->row_heights[$j])>=0){
                      $h+=$this->row_heights[$j];
-                  }
-                  else{
+                  } else{
                      $a=$j+1;
                      break;
                   }
                }
-            }
-            else{
+            } else{
                $a=$j+1;
                break;
             }
@@ -465,8 +435,7 @@ 
                      $this->print_text($index, $T, $split_cell);
                      if($split_cell==0){
                         $tmp[$index]=$index;
-                     }
-                     else{
+                     } else{
                         $ztmp[]=$index;
                      }
                   }
@@ -476,8 +445,7 @@ 
                   if($tw>=0){
                      $h+=$this->row_heights[$j];
                      $rw[$j]=$j;
-                  }
-                  else{
+                  } else{
                      $this->row_heights[$j]=$this->overflow-$tw;
                   }
                }
@@ -494,8 +462,7 @@ 
             $this->overflow=0;
             $ztmp=array();
             $this->pdf_obj->addPage($this->document_style['orientation']);
-         }
-         else{
+         } else{
             $y+=$h;
          }
       }
@@ -508,8 +475,7 @@ 
       $ls=$this->row_data[$i][1]['img']['h'];
       if($this->row_data[$i][1]['valign']=='B'){
          $ls+=$li;
-      }
-      else{
+      } else{
          $li+=$this->row_data[$i][3]-$this->row_data[$i][1]['img']['h'];
          $ls+=$li;
       }
@@ -555,8 +521,7 @@ 
                }
                $this->overflow=max($this->overflow, $mx);
                $this->row_data[$index][8]=1;
-            }
-            else{
+            } else{
                $this->row_data[$index][8]=-1*$rr;
             }
             $this->row_data[$index][7]=$h;
@@ -577,8 +542,7 @@ 
          $this->row_heights=&$this->header_row['row_heights'];
          $this->row_data=&$this->header_row['row_data'];
          $this->rows=&$this->header_row['rows'];
-      }
-      else{
+      } else{
          $this->header_row['row_data']=$data['header_data'];
          unset($this->row_heights, $this->row_data, $this->rows);
          $this->row_heights=$data['row_heights'];
@@ -649,8 +613,7 @@ 
       if(is_int($num_cols) && $num_cols!=0){
          $this->col_num=abs($num_cols);
          $this->col_width=array_pad(array(), abs($num_cols), $this->table_style['width']/abs($num_cols));
-      }
-      elseif(is_string($num_cols)){
+      } elseif(is_string($num_cols)){
          $num_cols=trim($num_cols, '}, ');
          if($num_cols[0]!='{' && $num_cols[0]!='%'){
             error_log('Bad format for columns in Table constructor');
@@ -668,8 +631,7 @@ 
             if(abs($c)){
                $w+=abs($c);
                $this->col_width[]=abs($c);
-            }
-            else{
+            } else{
                error_log('Column width can not be zero');
             }
          }
@@ -682,12 +644,10 @@ 
             foreach($this->col_width as $i=>$c){
                $this->col_width[$i]=$c*$this->table_style['width']/100;
             }
-         }
-         elseif($w!=$this->table_style['width'] && $w){
+         } elseif($w!=$this->table_style['width'] && $w){
             if($w<$this->document_style['document_width']){
                $this->table_style['width']=$w;
-            }
-            else{
+            } else{
                $this->table_style['width']=$this->document_style['document_width'];
                $d=$this->table_style['width']/$w;
                for($i=0; $i<count($num_cols); $i++){
@@ -703,15 +663,12 @@ 
       $this->table_style['c-align']=array_pad($this->table_style['c-align'], $this->col_num, 'L');
       if($this->table_style['l-margin']){
          $this->baseX=$this->pdf_obj->get_margin('l')+min($this->table_style['l-margin'],$this->document_style['document_width']-$this->table_style['width']);
-      }
-      else{
+      } else{
          if($this->table_style['align']=='L'){
             $this->baseX=$this->pdf_obj->get_margin('l');
-         }
-         elseif($this->table_style['align']=='R'){
+         } elseif($this->table_style['align']=='R'){
             $this->baseX=$this->pdf_obj->get_margin('l')+$this->document_style['document_width']-$this->table_style['width'];
-         }
-         else{
+         } else{
             $this->baseX=$this->pdf_obj->get_margin('l')+($this->document_style['document_width']-$this->table_style['width'])/2;
          }
       }
@@ -863,8 +820,7 @@ 
       
       if($this->total_rowspan>0){
          $this->total_rowspan--;
-      }
-      else{
+      } else{
          $row_number=count($this->rows);
          if(count($this->blocks)>0){
             
@@ -898,8 +854,7 @@ 
                $this->row_data[$index][1]['padding-y']=$this->row_data[$index][1]['paddingY'];
                if($this->row_data[$index][1]['valign']=='M' || ($this->row_data[$index][1]['img'] && count($this->row_data[$index][0]))){
                   $this->row_data[$index][1]['padding-y']=($this->row_data[$index][5]-$this->row_data[$index][3])/2;
-               }
-               elseif($this->row_data[$index][1]['valign']=='B'){
+               } elseif($this->row_data[$index][1]['valign']=='B'){
                   $this->row_data[$index][1]['padding-y']=$this->row_data[$index][5]-($this->row_data[$index][3]+$this->row_data[$index][1]['paddingY']);
                }
             });

extras/fpdf183/font/courierbi.php

Braces +2 added lines, -1 removed lines

@@ -3,8 +3,9 @@
 $name = 'Courier-BoldOblique';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

extras/fpdf183/font/courierb.php

Braces +2 added lines, -1 removed lines

@@ -3,8 +3,9 @@
 $name = 'Courier-Bold';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

extras/fpdf183/font/courier.php

Braces +2 added lines, -1 removed lines

@@ -3,8 +3,9 @@
 $name = 'Courier';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

extras/fpdf183/font/courieri.php

Braces +2 added lines, -1 removed lines

@@ -3,8 +3,9 @@
 $name = 'Courier-Oblique';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 $enc = 'cp1252';
 $uv = array(0=>array(0,128),128=>8364,130=>8218,131=>402,132=>8222,133=>8230,134=>array(8224,2),136=>710,137=>8240,138=>352,139=>8249,140=>338,142=>381,145=>array(8216,2),147=>array(8220,2),149=>8226,150=>array(8211,2),152=>732,153=>8482,154=>353,155=>8250,156=>339,158=>382,159=>376,160=>array(160,96));
 ?>

extras/fpdf183/fpdf.php

Braces +640 added lines, -494 removed lines

@@ -105,26 +105,28 @@ 
 	if(defined('FPDF_FONTPATH'))
 	{
 		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
-			$this->fontpath .= '/';
+		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\') {
+					$this->fontpath .= '/';
+		}
+	} elseif(is_dir(dirname(__FILE__).'/font')) {
+			$this->fontpath = dirname(__FILE__).'/font/';
+	} else {
+			$this->fontpath = '';
 	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
-		$this->fontpath = dirname(__FILE__).'/font/';
-	else
-		$this->fontpath = '';
 	// Core fonts
 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats','verdana','calligra','Arimo-Regular');
 	// Scale factor
-	if($unit=='pt')
-		$this->k = 1;
-	elseif($unit=='mm')
-		$this->k = 72/25.4;
-	elseif($unit=='cm')
-		$this->k = 72/2.54;
-	elseif($unit=='in')
-		$this->k = 72;
-	else
-		$this->Error('Incorrect unit: '.$unit);
+	if($unit=='pt') {
+			$this->k = 1;
+	} elseif($unit=='mm') {
+			$this->k = 72/25.4;
+	} elseif($unit=='cm') {
+			$this->k = 72/2.54;
+	} elseif($unit=='in') {
+			$this->k = 72;
+	} else {
+			$this->Error('Incorrect unit: '.$unit);
+	}
 	// Page sizes
 	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
 		'letter'=>array(612,792), 'legal'=>array(612,1008));
@@ -138,15 +140,14 @@ 
 		$this->DefOrientation = 'P';
 		$this->w = $size[0];
 		$this->h = $size[1];
-	}
-	elseif($orientation=='l' || $orientation=='landscape')
+	} elseif($orientation=='l' || $orientation=='landscape')
 	{
 		$this->DefOrientation = 'L';
 		$this->w = $size[1];
 		$this->h = $size[0];
+	} else {
+			$this->Error('Incorrect orientation: '.$orientation);
 	}
-	else
-		$this->Error('Incorrect orientation: '.$orientation);
 	$this->CurOrientation = $this->DefOrientation;
 	$this->wPt = $this->w*$this->k;
 	$this->hPt = $this->h*$this->k;
@@ -174,8 +175,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;
 }
 
@@ -183,9 +185,10 @@ 
 {
 	// 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;
+	}
+	}
 
 function SetTopMargin($margin)
 {
@@ -210,24 +213,27 @@ 
 function SetDisplayMode($zoom, $layout='default')
 {
 	// 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);
+	}
+	}
 
 function SetCompression($compress)
 {
 	// 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;
+	}
+	}
 
 function SetTitle($title, $isUTF8=false)
 {
@@ -274,10 +280,12 @@ 
 function Close()
 {
 	// 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();
@@ -291,8 +299,9 @@ 
 function AddPage($orientation='', $size='', $rotation=0)
 {
 	// Start a new page
-	if($this->state==3)
-		$this->Error('The document is closed');
+	if($this->state==3) {
+			$this->Error('The document is closed');
+	}
 	$family = $this->FontFamily;
 	$style = $this->FontStyle.($this->underline ? 'U' : '');
 	$fontsize = $this->FontSizePt;
@@ -318,15 +327,18 @@ 
 	$this->LineWidth = $lw;
 	$this->_out(sprintf('%.2F w',$lw*$this->k));
 	// Set font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if($family) {
+			$this->SetFont($family,$style,$fontsize);
+	}
 	// Set colors
 	$this->DrawColor = $dc;
-	if($dc!='0 G')
-		$this->_out($dc);
+	if($dc!='0 G') {
+			$this->_out($dc);
+	}
 	$this->FillColor = $fc;
-	if($fc!='0 g')
-		$this->_out($fc);
+	if($fc!='0 g') {
+			$this->_out($fc);
+	}
 	$this->TextColor = $tc;
 	$this->ColorFlag = $cf;
 	// Page header
@@ -340,8 +352,9 @@ 
 		$this->_out(sprintf('%.2F w',$lw*$this->k));
 	}
 	// Restore font
-	if($family)
-		$this->SetFont($family,$style,$fontsize);
+	if($family) {
+			$this->SetFont($family,$style,$fontsize);
+	}
 	// Restore colors
 	if($this->DrawColor!=$dc)
 	{
@@ -376,33 +389,38 @@ 
 function SetDrawColor($r, $g=null, $b=null)
 {
 	// Set color for all stroking operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->DrawColor = sprintf('%.3F G',$r/255);
-	else
-		$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
-	if($this->page>0)
-		$this->_out($this->DrawColor);
-}
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->DrawColor = sprintf('%.3F G',$r/255);
+	} else {
+			$this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+	}
+	if($this->page>0) {
+			$this->_out($this->DrawColor);
+	}
+	}
 
 function SetFillColor($r, $g=null, $b=null)
 {
 	// Set color for all filling operations
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->FillColor = sprintf('%.3F g',$r/255);
-	else
-		$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->FillColor = sprintf('%.3F g',$r/255);
+	} else {
+			$this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
-	if($this->page>0)
-		$this->_out($this->FillColor);
-}
+	if($this->page>0) {
+			$this->_out($this->FillColor);
+	}
+	}
 
 function SetTextColor($r, $g=null, $b=null)
 {
 	// Set color for text
-	if(($r==0 && $g==0 && $b==0) || $g===null)
-		$this->TextColor = sprintf('%.3F g',$r/255);
-	else
-		$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	if(($r==0 && $g==0 && $b==0) || $g===null) {
+			$this->TextColor = sprintf('%.3F g',$r/255);
+	} else {
+			$this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+	}
 	$this->ColorFlag = ($this->FillColor!=$this->TextColor);
 }
 
@@ -413,8 +431,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;
 }
 
@@ -422,9 +441,10 @@ 
 {
 	// 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));
+	}
+	}
 
 function Line($x1, $y1, $x2, $y2)
 {
@@ -435,12 +455,13 @@ 
 function Rect($x, $y, $w, $h, $style='')
 {
 	// 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));
 }
 
@@ -448,23 +469,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;
 }
@@ -472,42 +497,49 @@ 
 function SetFont($family, $style='', $size=0)
 {
 	// 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;
@@ -515,20 +547,23 @@ 
 	$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));
+	}
+	}
 
 function SetFontSize($size)
 {
 	// Set font size in points
-	if($this->FontSizePt==$size)
-		return;
+	if($this->FontSizePt==$size) {
+			return;
+	}
 	$this->FontSizePt = $size;
 	$this->FontSize = $size/$this->k;
-	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));
+	}
+	}
 
 function AddLink()
 {
@@ -541,10 +576,12 @@ 
 function SetLink($link, $y=0, $page=-1)
 {
 	// Set destination of internal link
-	if($y==-1)
-		$y = $this->y;
-	if($page==-1)
-		$page = $this->page;
+	if($y==-1) {
+			$y = $this->y;
+	}
+	if($page==-1) {
+			$page = $this->page;
+	}
 	$this->links[$link] = array($page, $y);
 }
 
@@ -557,13 +594,16 @@ 
 function Text($x, $y, $txt)
 {
 	// Output a string
-	if(!isset($this->CurrentFont))
-		$this->Error('No font has been set');
+	if(!isset($this->CurrentFont)) {
+			$this->Error('No font has been set');
+	}
 	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if($this->underline && $txt!='')
-		$s .= ' '.$this->_dounderline($x,$y,$txt);
-	if($this->ColorFlag)
-		$s = 'q '.$this->TextColor.' '.$s.' Q';
+	if($this->underline && $txt!='') {
+			$s .= ' '.$this->_dounderline($x,$y,$txt);
+	}
+	if($this->ColorFlag) {
+			$s = 'q '.$this->TextColor.' '.$s.' Q';
+	}
 	$this->_out($s);
 }
 
@@ -595,77 +635,94 @@ 
 			$this->_out(sprintf('%.3F Tw',$ws*$k));
 		}
 	}
-	if($w==0)
-		$w = $this->w-$this->rMargin-$this->x;
+	if($w==0) {
+			$w = $this->w-$this->rMargin-$this->x;
+	}
 	$s = '';
 	if($fill || $border==1)
 	{
-		if($fill)
-			$op = ($border==1) ? 'B' : 'f';
-		else
-			$op = 'S';
+		if($fill) {
+					$op = ($border==1) ? 'B' : 'f';
+		} else {
+					$op = 'S';
+		}
 		$s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
 	}
 	if(is_string($border))
 	{
 		$x = $this->x;
 		$y = $this->y;
-		if(strpos($border,'L')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'T')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
-		if(strpos($border,'R')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
-		if(strpos($border,'B')!==false)
-			$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		if(strpos($border,'L')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'T')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+		}
+		if(strpos($border,'R')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
+		if(strpos($border,'B')!==false) {
+					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+		}
 	}
 	if($txt!=='')
 	{
-		if(!isset($this->CurrentFont))
-			$this->Error('No font has been set');
-		if($align=='R')
-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
-		elseif($align=='C')
-			$dx = ($w-$this->GetStringWidth($txt))/2;
-		else
-			$dx = $this->cMargin;
-		if($this->ColorFlag)
-			$s .= 'q '.$this->TextColor.' ';
+		if(!isset($this->CurrentFont)) {
+					$this->Error('No font has been set');
+		}
+		if($align=='R') {
+					$dx = $w-$this->cMargin-$this->GetStringWidth($txt);
+		} elseif($align=='C') {
+					$dx = ($w-$this->GetStringWidth($txt))/2;
+		} else {
+					$dx = $this->cMargin;
+		}
+		if($this->ColorFlag) {
+					$s .= 'q '.$this->TextColor.' ';
+		}
 		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->_escape($txt));
-		if($this->underline)
-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
-		if($this->ColorFlag)
-			$s .= ' Q';
-		if($link)
-			$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
-	}
-	if($s)
-		$this->_out($s);
+		if($this->underline) {
+					$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+		}
+		if($this->ColorFlag) {
+					$s .= ' Q';
+		}
+		if($link) {
+					$this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+		}
+	}
+	if($s) {
+			$this->_out($s);
+	}
 	$this->lasth = $h;
 	if($ln>0)
 	{
 		// Go to next line
 		$this->y += $h;
-		if($ln==1)
-			$this->x = $this->lMargin;
+		if($ln==1) {
+					$this->x = $this->lMargin;
+		}
+	} else {
+			$this->x += $w;
+	}
 	}
-	else
-		$this->x += $w;
-}
 
 function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
 	// 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;
 	if($border)
 	{
@@ -674,14 +731,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;
 		}
 	}
@@ -710,8 +768,9 @@ 
 			$l = 0;
 			$ns = 0;
 			$nl++;
-			if($border && $nl==2)
-				$b = $b2;
+			if($border && $nl==2) {
+							$b = $b2;
+			}
 			continue;
 		}
 		if($c==' ')
@@ -726,16 +785,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')
 				{
@@ -750,11 +809,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)
@@ -762,8 +822,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;
 }
@@ -771,8 +832,9 @@ 
 function Write($h, $txt, $link='')
 {
 	// 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;
@@ -804,8 +866,9 @@ 
 			$nl++;
 			continue;
 		}
-		if($c==' ')
-			$sep = $i;
+		if($c==' ') {
+					$sep = $i;
+		}
 		$l += $cw[$c];
 		if($l>$wmax)
 		{
@@ -823,11 +886,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;
@@ -842,52 +905,58 @@ 
 				$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);
+	}
+	}
 
 function Ln($h=null)
 {
 	// 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;
+	}
+	}
 
 function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
 	// Put an image on the page
-	if($file=='')
-		$this->Error('Image file name is empty');
+	if($file=='') {
+			$this->Error('Image file name is empty');
+	}
 	if(!isset($this->images[$file]))
 	{
 		// First use of this image, get info
 		if($type=='')
 		{
 			$pos = strrpos($file,'.');
-			if(!$pos)
-				$this->Error('Image file has no extension and no type was specified: '.$file);
+			if(!$pos) {
+							$this->Error('Image file has no extension and no type was specified: '.$file);
+			}
 			$type = substr($file,$pos+1);
 		}
 		$type = strtolower($type);
-		if($type=='jpeg')
-			$type = 'jpg';
+		if($type=='jpeg') {
+					$type = 'jpg';
+		}
 		$mtd = '_parse'.$type;
-		if(!method_exists($this,$mtd))
-			$this->Error('Unsupported image type: '.$type);
+		if(!method_exists($this,$mtd)) {
+					$this->Error('Unsupported image type: '.$type);
+		}
 		$info = $this->$mtd($file);
 		$info['i'] = count($this->images)+1;
 		$this->images[$file] = $info;
+	} else {
+			$info = $this->images[$file];
 	}
-	else
-		$info = $this->images[$file];
 
 	// Automatic width and height calculation if needed
 	if($w==0 && $h==0)
@@ -896,14 +965,18 @@ 
 		$w = -96;
 		$h = -96;
 	}
-	if($w<0)
-		$w = -$info['w']*72/$w/$this->k;
-	if($h<0)
-		$h = -$info['h']*72/$h/$this->k;
-	if($w==0)
-		$w = $h*$info['w']/$info['h'];
-	if($h==0)
-		$h = $w*$info['h']/$info['w'];
+	if($w<0) {
+			$w = -$info['w']*72/$w/$this->k;
+	}
+	if($h<0) {
+			$h = -$info['h']*72/$h/$this->k;
+	}
+	if($w==0) {
+			$w = $h*$info['w']/$info['h'];
+	}
+	if($h==0) {
+			$h = $w*$info['h']/$info['w'];
+	}
 
 	// Flowing mode
 	if($y===null)
@@ -919,12 +992,14 @@ 
 		$this->y += $h;
 	}
 
-	if($x===null)
-		$x = $this->x;
+	if($x===null) {
+			$x = $this->x;
+	}
 	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if($link)
-		$this->Link($x,$y,$w,$h,$link);
-}
+	if($link) {
+			$this->Link($x,$y,$w,$h,$link);
+	}
+	}
 
 function GetPageWidth()
 {
@@ -947,11 +1022,12 @@ 
 function SetX($x)
 {
 	// 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;
+	}
+	}
 
 function GetY()
 {
@@ -962,13 +1038,15 @@ 
 function SetY($y, $resetX=true)
 {
 	// 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;
+	}
+	}
 
 function SetXY($x, $y)
 {
@@ -988,10 +1066,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':
@@ -1018,8 +1098,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
@@ -1037,16 +1118,18 @@ 
 protected function _dochecks()
 {
 	// Check mbstring overloading
-	if(ini_get('mbstring.func_overload') & 2)
-		$this->Error('mbstring overloading must be disabled');
-}
+	if(ini_get('mbstring.func_overload') & 2) {
+			$this->Error('mbstring overloading must be disabled');
+	}
+	}
 
 protected function _checkoutput()
 {
 	if(PHP_SAPI!='cli')
 	{
-		if(headers_sent($file,$line))
-			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+		if(headers_sent($file,$line)) {
+					$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+		}
 	}
 	if(ob_get_length())
 	{
@@ -1055,9 +1138,9 @@ 
 		{
 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it
 			ob_clean();
+		} else {
+					$this->Error("Some data has already been output, can't send PDF file");
 		}
-		else
-			$this->Error("Some data has already been output, can't send PDF file");
 	}
 }
 
@@ -1066,17 +1149,18 @@ 
 	if(is_string($size))
 	{
 		$size = strtolower($size);
-		if(!isset($this->StdPageSizes[$size]))
-			$this->Error('Unknown page size: '.$size);
+		if(!isset($this->StdPageSizes[$size])) {
+					$this->Error('Unknown page size: '.$size);
+		}
 		$a = $this->StdPageSizes[$size];
 		return array($a[0]/$this->k, $a[1]/$this->k);
-	}
-	else
+	} else
 	{
-		if($size[0]>$size[1])
-			return array($size[1], $size[0]);
-		else
-			return $size;
+		if($size[0]>$size[1]) {
+					return array($size[1], $size[0]);
+		} else {
+					return $size;
+		}
 	}
 }
 
@@ -1090,14 +1174,16 @@ 
 	$this->y = $this->tMargin;
 	$this->FontFamily = '';
 	// Check page size and orientation
-	if($orientation=='')
-		$orientation = $this->DefOrientation;
-	else
-		$orientation = strtoupper($orientation[0]);
-	if($size=='')
-		$size = $this->DefPageSize;
-	else
-		$size = $this->_getpagesize($size);
+	if($orientation=='') {
+			$orientation = $this->DefOrientation;
+	} else {
+			$orientation = strtoupper($orientation[0]);
+	}
+	if($size=='') {
+			$size = $this->DefPageSize;
+	} else {
+			$size = $this->_getpagesize($size);
+	}
 	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
 	{
 		// New size or orientation
@@ -1105,8 +1191,7 @@ 
 		{
 			$this->w = $size[0];
 			$this->h = $size[1];
-		}
-		else
+		} else
 		{
 			$this->w = $size[1];
 			$this->h = $size[0];
@@ -1117,12 +1202,14 @@ 
 		$this->CurOrientation = $orientation;
 		$this->CurPageSize = $size;
 	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
-		$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
+	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1]) {
+			$this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);
+	}
 	if($rotation!=0)
 	{
-		if($rotation%90!=0)
-			$this->Error('Incorrect rotation value: '.$rotation);
+		if($rotation%90!=0) {
+					$this->Error('Incorrect rotation value: '.$rotation);
+		}
 		$this->CurRotation = $rotation;
 		$this->PageInfo[$this->page]['rotation'] = $rotation;
 	}
@@ -1136,15 +1223,19 @@ 
 protected function _loadfont($font)
 {
 	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
-		$this->Error('Incorrect font definition file name: '.$font);
+	if(strpos($font,'/')!==false || strpos($font,"\\")!==false) {
+			$this->Error('Incorrect font definition file name: '.$font);
+	}
 	include($this->fontpath.$font);
-	if(!isset($name))
-		$this->Error('Could not include font definition file');
-	if(isset($enc))
-		$enc = strtolower($enc);
-	if(!isset($subsetted))
-		$subsetted = false;
+	if(!isset($name)) {
+			$this->Error('Could not include font definition file');
+	}
+	if(isset($enc)) {
+			$enc = strtolower($enc);
+	}
+	if(!isset($subsetted)) {
+			$subsetted = false;
+	}
 	return get_defined_vars();
 }
 
@@ -1154,8 +1245,9 @@ 
 	$nb = strlen($s);
 	for($i=0;$i<$nb;$i++)
 	{
-		if(ord($s[$i])>127)
-			return false;
+		if(ord($s[$i])>127) {
+					return false;
+		}
 	}
 	return true;
 }
@@ -1163,15 +1255,18 @@ 
 protected function _httpencode($param, $value, $isUTF8)
 {
 	// Encode HTTP header field parameter
-	if($this->_isascii($value))
-		return $param.'="'.$value.'"';
-	if(!$isUTF8)
-		$value = utf8_encode($value);
-	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false)
-		return $param.'="'.rawurlencode($value).'"';
-	else
-		return $param."*=UTF-8''".rawurlencode($value);
-}
+	if($this->_isascii($value)) {
+			return $param.'="'.$value.'"';
+	}
+	if(!$isUTF8) {
+			$value = utf8_encode($value);
+	}
+	if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')!==false) {
+			return $param.'="'.rawurlencode($value).'"';
+	} else {
+			return $param."*=UTF-8''".rawurlencode($value);
+	}
+	}
 
 protected function _UTF8toUTF16($s)
 {
@@ -1189,15 +1284,13 @@ 
 			$c3 = ord($s[$i++]);
 			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
 			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
-		}
-		elseif($c1>=192)
+		} elseif($c1>=192)
 		{
 			// 2-byte character
 			$c2 = ord($s[$i++]);
 			$res .= chr(($c1 & 0x1C)>>2);
 			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
-		}
-		else
+		} else
 		{
 			// Single-byte character
 			$res .= "\0".chr($c1);
@@ -1209,17 +1302,19 @@ 
 protected function _escape($s)
 {
 	// Escape special characters
-	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false)
-		return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
-	else
-		return $s;
-}
+	if(strpos($s,'(')!==false || strpos($s,')')!==false || strpos($s,'\\')!==false || strpos($s,"\r")!==false) {
+			return str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);
+	} else {
+			return $s;
+	}
+	}
 
 protected function _textstring($s)
 {
 	// Format a text string
-	if(!$this->_isascii($s))
-		$s = $this->_UTF8toUTF16($s);
+	if(!$this->_isascii($s)) {
+			$s = $this->_UTF8toUTF16($s);
+	}
 	return '('.$this->_escape($s).')';
 }
 
@@ -1236,16 +1331,19 @@ 
 {
 	// Extract info from a JPEG file
 	$a = getimagesize($file);
-	if(!$a)
-		$this->Error('Missing or incorrect image file: '.$file);
-	if($a[2]!=2)
-		$this->Error('Not a JPEG file: '.$file);
-	if(!isset($a['channels']) || $a['channels']==3)
-		$colspace = 'DeviceRGB';
-	elseif($a['channels']==4)
-		$colspace = 'DeviceCMYK';
-	else
-		$colspace = 'DeviceGray';
+	if(!$a) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
+	if($a[2]!=2) {
+			$this->Error('Not a JPEG file: '.$file);
+	}
+	if(!isset($a['channels']) || $a['channels']==3) {
+			$colspace = 'DeviceRGB';
+	} elseif($a['channels']==4) {
+			$colspace = 'DeviceCMYK';
+	} else {
+			$colspace = 'DeviceGray';
+	}
 	$bpc = isset($a['bits']) ? $a['bits'] : 8;
 	$data = file_get_contents($file);
 	return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
@@ -1255,8 +1353,9 @@ 
 {
 	// Extract info from a PNG file
 	$f = fopen($file,'rb');
-	if(!$f)
-		$this->Error('Can\'t open image file: '.$file);
+	if(!$f) {
+			$this->Error('Can\'t open image file: '.$file);
+	}
 	$info = $this->_parsepngstream($f,$file);
 	fclose($f);
 	return $info;
@@ -1265,33 +1364,40 @@ 
 protected function _parsepngstream($f, $file)
 {
 	// Check signature
-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-		$this->Error('Not a PNG file: '.$file);
+	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
+			$this->Error('Not a PNG file: '.$file);
+	}
 
 	// Read header chunk
 	$this->_readstream($f,4);
-	if($this->_readstream($f,4)!='IHDR')
-		$this->Error('Incorrect PNG file: '.$file);
+	if($this->_readstream($f,4)!='IHDR') {
+			$this->Error('Incorrect PNG file: '.$file);
+	}
 	$w = $this->_readint($f);
 	$h = $this->_readint($f);
 	$bpc = ord($this->_readstream($f,1));
-	if($bpc>8)
-		$this->Error('16-bit depth not supported: '.$file);
+	if($bpc>8) {
+			$this->Error('16-bit depth not supported: '.$file);
+	}
 	$ct = ord($this->_readstream($f,1));
-	if($ct==0 || $ct==4)
-		$colspace = 'DeviceGray';
-	elseif($ct==2 || $ct==6)
-		$colspace = 'DeviceRGB';
-	elseif($ct==3)
-		$colspace = 'Indexed';
-	else
-		$this->Error('Unknown color type: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown compression method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Unknown filter method: '.$file);
-	if(ord($this->_readstream($f,1))!=0)
-		$this->Error('Interlacing not supported: '.$file);
+	if($ct==0 || $ct==4) {
+			$colspace = 'DeviceGray';
+	} elseif($ct==2 || $ct==6) {
+			$colspace = 'DeviceRGB';
+	} elseif($ct==3) {
+			$colspace = 'Indexed';
+	} else {
+			$this->Error('Unknown color type: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown compression method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Unknown filter method: '.$file);
+	}
+	if(ord($this->_readstream($f,1))!=0) {
+			$this->Error('Interlacing not supported: '.$file);
+	}
 	$this->_readstream($f,4);
 	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
 
@@ -1308,44 +1414,45 @@ 
 			// Read palette
 			$pal = $this->_readstream($f,$n);
 			$this->_readstream($f,4);
-		}
-		elseif($type=='tRNS')
+		} elseif($type=='tRNS')
 		{
 			// Read transparency info
 			$t = $this->_readstream($f,$n);
-			if($ct==0)
-				$trns = array(ord(substr($t,1,1)));
-			elseif($ct==2)
-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
-			else
+			if($ct==0) {
+							$trns = array(ord(substr($t,1,1)));
+			} elseif($ct==2) {
+							$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+			} else
 			{
 				$pos = strpos($t,chr(0));
-				if($pos!==false)
-					$trns = array($pos);
+				if($pos!==false) {
+									$trns = array($pos);
+				}
 			}
 			$this->_readstream($f,4);
-		}
-		elseif($type=='IDAT')
+		} elseif($type=='IDAT')
 		{
 			// Read image data block
 			$data .= $this->_readstream($f,$n);
 			$this->_readstream($f,4);
+		} elseif($type=='IEND') {
+					break;
+		} else {
+					$this->_readstream($f,$n+4);
 		}
-		elseif($type=='IEND')
-			break;
-		else
-			$this->_readstream($f,$n+4);
 	}
 	while($n);
 
-	if($colspace=='Indexed' && empty($pal))
-		$this->Error('Missing palette in '.$file);
+	if($colspace=='Indexed' && empty($pal)) {
+			$this->Error('Missing palette in '.$file);
+	}
 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
 	if($ct>=4)
 	{
 		// Extract alpha channel
-		if(!function_exists('gzuncompress'))
-			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+		if(!function_exists('gzuncompress')) {
+					$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+		}
 		$data = gzuncompress($data);
 		$color = '';
 		$alpha = '';
@@ -1362,8 +1469,7 @@ 
 				$color .= preg_replace('/(.)./s','$1',$line);
 				$alpha .= preg_replace('/.(.)/s','$1',$line);
 			}
-		}
-		else
+		} else
 		{
 			// RGB image
 			$len = 4*$w;
@@ -1381,8 +1487,9 @@ 
 		$data = gzcompress($color);
 		$info['smask'] = gzcompress($alpha);
 		$this->WithAlpha = true;
-		if($this->PDFVersion<'1.4')
-			$this->PDFVersion = '1.4';
+		if($this->PDFVersion<'1.4') {
+					$this->PDFVersion = '1.4';
+		}
 	}
 	$info['data'] = $data;
 	return $info;
@@ -1395,13 +1502,15 @@ 
 	while($n>0 && !feof($f))
 	{
 		$s = fread($f,$n);
-		if($s===false)
-			$this->Error('Error while reading stream');
+		if($s===false) {
+					$this->Error('Error while reading stream');
+		}
 		$n -= strlen($s);
 		$res .= $s;
 	}
-	if($n>0)
-		$this->Error('Unexpected end of stream');
+	if($n>0) {
+			$this->Error('Unexpected end of stream');
+	}
 	return $res;
 }
 
@@ -1415,21 +1524,25 @@ 
 protected function _parsegif($file)
 {
 	// Extract info from a GIF file (via PNG conversion)
-	if(!function_exists('imagepng'))
-		$this->Error('GD extension is required for GIF support');
-	if(!function_exists('imagecreatefromgif'))
-		$this->Error('GD has no GIF read support');
+	if(!function_exists('imagepng')) {
+			$this->Error('GD extension is required for GIF support');
+	}
+	if(!function_exists('imagecreatefromgif')) {
+			$this->Error('GD has no GIF read support');
+	}
 	$im = imagecreatefromgif($file);
-	if(!$im)
-		$this->Error('Missing or incorrect image file: '.$file);
+	if(!$im) {
+			$this->Error('Missing or incorrect image file: '.$file);
+	}
 	imageinterlace($im,0);
 	ob_start();
 	imagepng($im);
 	$data = ob_get_clean();
 	imagedestroy($im);
 	$f = fopen('php://temp','rb+');
-	if(!$f)
-		$this->Error('Unable to create memory stream');
+	if(!$f) {
+			$this->Error('Unable to create memory stream');
+	}
 	fwrite($f,$data);
 	rewind($f);
 	$info = $this->_parsepngstream($f,$file);
@@ -1440,15 +1553,16 @@ 
 protected function _out($s)
 {
 	// Add a line to the document
-	if($this->state==2)
-		$this->pages[$this->page] .= $s."\n";
-	elseif($this->state==1)
-		$this->_put($s);
-	elseif($this->state==0)
-		$this->Error('No page has been added yet');
-	elseif($this->state==3)
-		$this->Error('The document is closed');
-}
+	if($this->state==2) {
+			$this->pages[$this->page] .= $s."\n";
+	} elseif($this->state==1) {
+			$this->_put($s);
+	} elseif($this->state==0) {
+			$this->Error('No page has been added yet');
+	} elseif($this->state==3) {
+			$this->Error('The document is closed');
+	}
+	}
 
 protected function _put($s)
 {
@@ -1463,8 +1577,9 @@ 
 protected function _newobj($n=null)
 {
 	// Begin a new object
-	if($n===null)
-		$n = ++$this->n;
+	if($n===null) {
+			$n = ++$this->n;
+	}
 	$this->offsets[$n] = $this->_getoffset();
 	$this->_put($n.' 0 obj');
 }
@@ -1482,9 +1597,9 @@ 
 	{
 		$entries = '/Filter /FlateDecode ';
 		$data = gzcompress($data);
+	} else {
+			$entries = '';
 	}
-	else
-		$entries = '';
 	$entries .= '/Length '.strlen($data);
 	$this->_newobj();
 	$this->_put('<<'.$entries.'>>');
@@ -1497,41 +1612,47 @@ 
 	$this->_newobj();
 	$this->_put('<</Type /Page');
 	$this->_put('/Parent 1 0 R');
-	if(isset($this->PageInfo[$n]['size']))
-		$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
-	if(isset($this->PageInfo[$n]['rotation']))
-		$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
+	if(isset($this->PageInfo[$n]['size'])) {
+			$this->_put(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageInfo[$n]['size'][0],$this->PageInfo[$n]['size'][1]));
+	}
+	if(isset($this->PageInfo[$n]['rotation'])) {
+			$this->_put('/Rotate '.$this->PageInfo[$n]['rotation']);
+	}
 	$this->_put('/Resources 2 0 R');
 	if(!empty($this->PageLinks[$n]))
 	{
 		$s = '/Annots [';
-		foreach($this->PageLinks[$n] as $pl)
-			$s .= $pl[5].' 0 R ';
+		foreach($this->PageLinks[$n] as $pl) {
+					$s .= $pl[5].' 0 R ';
+		}
 		$s .= ']';
 		$this->_put($s);
 	}
-	if($this->WithAlpha)
-		$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+	if($this->WithAlpha) {
+			$this->_put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+	}
 	$this->_put('/Contents '.($this->n+1).' 0 R>>');
 	$this->_put('endobj');
 	// Page content
-	if(!empty($this->AliasNbPages))
-		$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+	if(!empty($this->AliasNbPages)) {
+			$this->pages[$n] = str_replace($this->AliasNbPages,$this->page,$this->pages[$n]);
+	}
 	$this->_putstreamobject($this->pages[$n]);
 	// Annotations
 	foreach($this->PageLinks[$n] as $pl)
 	{
 		$rect = sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
 		$s = '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-		if(is_string($pl[4]))
-			$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-		else
+		if(is_string($pl[4])) {
+					$s .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+		} else
 		{
 			$l = $this->links[$pl[4]];
-			if(isset($this->PageInfo[$l[0]]['size']))
-				$h = $this->PageInfo[$l[0]]['size'][1];
-			else
-				$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
+			if(isset($this->PageInfo[$l[0]]['size'])) {
+							$h = $this->PageInfo[$l[0]]['size'][1];
+			} else {
+							$h = ($this->DefOrientation=='P') ? $this->DefPageSize[1]*$this->k : $this->DefPageSize[0]*$this->k;
+			}
 			$s .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',$this->PageInfo[$l[0]]['n'],$h-$l[1]*$this->k);
 		}
 		$this->_newobj();
@@ -1548,18 +1669,21 @@ 
 	{
 		$this->PageInfo[$i]['n'] = ++$n;
 		$n++;
-		foreach($this->PageLinks[$i] as &$pl)
-			$pl[5] = ++$n;
+		foreach($this->PageLinks[$i] as &$pl) {
+					$pl[5] = ++$n;
+		}
 		unset($pl);
 	}
-	for($i=1;$i<=$nb;$i++)
-		$this->_putpage($i);
+	for($i=1;$i<=$nb;$i++) {
+			$this->_putpage($i);
+	}
 	// Pages root
 	$this->_newobj(1);
 	$this->_put('<</Type /Pages');
 	$kids = '/Kids [';
-	for($i=1;$i<=$nb;$i++)
-		$kids .= $this->PageInfo[$i]['n'].' 0 R ';
+	for($i=1;$i<=$nb;$i++) {
+			$kids .= $this->PageInfo[$i]['n'].' 0 R ';
+	}
 	$kids .= ']';
 	$this->_put($kids);
 	$this->_put('/Count '.$nb);
@@ -1567,8 +1691,7 @@ 
 	{
 		$w = $this->DefPageSize[0];
 		$h = $this->DefPageSize[1];
-	}
-	else
+	} else
 	{
 		$w = $this->DefPageSize[1];
 		$h = $this->DefPageSize[0];
@@ -1586,17 +1709,21 @@ 
 		$this->_newobj();
 		$this->FontFiles[$file]['n'] = $this->n;
 		$font = file_get_contents($this->fontpath.$file,true);
-		if(!$font)
-			$this->Error('Font file not found: '.$file);
+		if(!$font) {
+					$this->Error('Font file not found: '.$file);
+		}
 		$compressed = (substr($file,-2)=='.z');
-		if(!$compressed && isset($info['length2']))
-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+		if(!$compressed && isset($info['length2'])) {
+					$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);
+		}
 		$this->_put('<</Length '.strlen($font));
-		if($compressed)
-			$this->_put('/Filter /FlateDecode');
+		if($compressed) {
+					$this->_put('/Filter /FlateDecode');
+		}
 		$this->_put('/Length1 '.$info['length1']);
-		if(isset($info['length2']))
-			$this->_put('/Length2 '.$info['length2'].' /Length3 0');
+		if(isset($info['length2'])) {
+					$this->_put('/Length2 '.$info['length2'].' /Length3 0');
+		}
 		$this->_put('>>');
 		$this->_putstream($font);
 		$this->_put('endobj');
@@ -1617,10 +1744,11 @@ 
 		// ToUnicode CMap
 		if(isset($font['uv']))
 		{
-			if(isset($font['enc']))
-				$cmapkey = $font['enc'];
-			else
-				$cmapkey = $font['name'];
+			if(isset($font['enc'])) {
+							$cmapkey = $font['enc'];
+			} else {
+							$cmapkey = $font['name'];
+			}
 			if(!isset($this->cmaps[$cmapkey]))
 			{
 				$cmap = $this->_tounicodecmap($font['uv']);
@@ -1632,8 +1760,9 @@ 
 		$this->fonts[$k]['n'] = $this->n+1;
 		$type = $font['type'];
 		$name = $font['name'];
-		if($font['subsetted'])
-			$name = 'AAAAAA+'.$name;
+		if($font['subsetted']) {
+					$name = 'AAAAAA+'.$name;
+		}
 		if($type=='Core')
 		{
 			// Core font
@@ -1641,14 +1770,15 @@ 
 			$this->_put('<</Type /Font');
 			$this->_put('/BaseFont /'.$name);
 			$this->_put('/Subtype /Type1');
-			if($name!='Symbol' && $name!='ZapfDingbats')
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			if($name!='Symbol' && $name!='ZapfDingbats') {
+							$this->_put('/Encoding /WinAnsiEncoding');
+			}
+			if(isset($font['uv'])) {
+							$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			}
 			$this->_put('>>');
 			$this->_put('endobj');
-		}
-		elseif($type=='Type1' || $type=='TrueType')
+		} elseif($type=='Type1' || $type=='TrueType')
 		{
 			// Additional Type1 or TrueType/OpenType font
 			$this->_newobj();
@@ -1658,38 +1788,43 @@ 
 			$this->_put('/FirstChar 32 /LastChar 255');
 			$this->_put('/Widths '.($this->n+1).' 0 R');
 			$this->_put('/FontDescriptor '.($this->n+2).' 0 R');
-			if(isset($font['diff']))
-				$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
-			else
-				$this->_put('/Encoding /WinAnsiEncoding');
-			if(isset($font['uv']))
-				$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			if(isset($font['diff'])) {
+							$this->_put('/Encoding '.$this->encodings[$font['enc']].' 0 R');
+			} else {
+							$this->_put('/Encoding /WinAnsiEncoding');
+			}
+			if(isset($font['uv'])) {
+							$this->_put('/ToUnicode '.$this->cmaps[$cmapkey].' 0 R');
+			}
 			$this->_put('>>');
 			$this->_put('endobj');
 			// Widths
 			$this->_newobj();
 			$cw = &$font['cw'];
 			$s = '[';
-			for($i=32;$i<=255;$i++)
-				$s .= $cw[chr($i)].' ';
+			for($i=32;$i<=255;$i++) {
+							$s .= $cw[chr($i)].' ';
+			}
 			$this->_put($s.']');
 			$this->_put('endobj');
 			// Descriptor
 			$this->_newobj();
 			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach($font['desc'] as $k=>$v)
-				$s .= ' /'.$k.' '.$v;
-			if(!empty($font['file']))
-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+			foreach($font['desc'] as $k=>$v) {
+							$s .= ' /'.$k.' '.$v;
+			}
+			if(!empty($font['file'])) {
+							$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
+			}
 			$this->_put($s.'>>');
 			$this->_put('endobj');
-		}
-		else
+		} else
 		{
 			// Allow for additional types
 			$mtd = '_put'.strtolower($type);
-			if(!method_exists($this,$mtd))
-				$this->Error('Unsupported font type: '.$type);
+			if(!method_exists($this,$mtd)) {
+							$this->Error('Unsupported font type: '.$type);
+			}
 			$this->$mtd($font);
 		}
 	}
@@ -1707,8 +1842,7 @@ 
 		{
 			$ranges .= sprintf("<%02X> <%02X> <%04X>\n",$c,$c+$v[1]-1,$v[0]);
 			$nbr++;
-		}
-		else
+		} else
 		{
 			$chars .= sprintf("<%02X> <%04X>\n",$c,$v);
 			$nbc++;
@@ -1764,28 +1898,33 @@ 
 	$this->_put('/Subtype /Image');
 	$this->_put('/Width '.$info['w']);
 	$this->_put('/Height '.$info['h']);
-	if($info['cs']=='Indexed')
-		$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
-	else
+	if($info['cs']=='Indexed') {
+			$this->_put('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+	} else
 	{
 		$this->_put('/ColorSpace /'.$info['cs']);
-		if($info['cs']=='DeviceCMYK')
-			$this->_put('/Decode [1 0 1 0 1 0 1 0]');
+		if($info['cs']=='DeviceCMYK') {
+					$this->_put('/Decode [1 0 1 0 1 0 1 0]');
+		}
 	}
 	$this->_put('/BitsPerComponent '.$info['bpc']);
-	if(isset($info['f']))
-		$this->_put('/Filter /'.$info['f']);
-	if(isset($info['dp']))
-		$this->_put('/DecodeParms <<'.$info['dp'].'>>');
+	if(isset($info['f'])) {
+			$this->_put('/Filter /'.$info['f']);
+	}
+	if(isset($info['dp'])) {
+			$this->_put('/DecodeParms <<'.$info['dp'].'>>');
+	}
 	if(isset($info['trns']) && is_array($info['trns']))
 	{
 		$trns = '';
-		for($i=0;$i<count($info['trns']);$i++)
-			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+		for($i=0;$i<count($info['trns']);$i++) {
+					$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+		}
 		$this->_put('/Mask ['.$trns.']');
 	}
-	if(isset($info['smask']))
-		$this->_put('/SMask '.($this->n+1).' 0 R');
+	if(isset($info['smask'])) {
+			$this->_put('/SMask '.($this->n+1).' 0 R');
+	}
 	$this->_put('/Length '.strlen($info['data']).'>>');
 	$this->_putstream($info['data']);
 	$this->_put('endobj');
@@ -1797,22 +1936,25 @@ 
 		$this->_putimage($smask);
 	}
 	// Palette
-	if($info['cs']=='Indexed')
-		$this->_putstreamobject($info['pal']);
-}
+	if($info['cs']=='Indexed') {
+			$this->_putstreamobject($info['pal']);
+	}
+	}
 
 protected function _putxobjectdict()
 {
-	foreach($this->images as $image)
-		$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
+	foreach($this->images as $image) {
+			$this->_put('/I'.$image['i'].' '.$image['n'].' 0 R');
+	}
+	}
 
 protected function _putresourcedict()
 {
 	$this->_put('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
 	$this->_put('/Font <<');
-	foreach($this->fonts as $font)
-		$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
+	foreach($this->fonts as $font) {
+			$this->_put('/F'.$font['i'].' '.$font['n'].' 0 R');
+	}
 	$this->_put('>>');
 	$this->_put('/XObject <<');
 	$this->_putxobjectdict();
@@ -1835,30 +1977,33 @@ 
 {
 	$this->metadata['Producer'] = 'FPDF '.FPDF_VERSION;
 	$this->metadata['CreationDate'] = 'D:'.@date('YmdHis');
-	foreach($this->metadata as $key=>$value)
-		$this->_put('/'.$key.' '.$this->_textstring($value));
-}
+	foreach($this->metadata as $key=>$value) {
+			$this->_put('/'.$key.' '.$this->_textstring($value));
+	}
+	}
 
 protected function _putcatalog()
 {
 	$n = $this->PageInfo[1]['n'];
 	$this->_put('/Type /Catalog');
 	$this->_put('/Pages 1 0 R');
-	if($this->ZoomMode=='fullpage')
-		$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
-	elseif($this->ZoomMode=='fullwidth')
-		$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
-	elseif($this->ZoomMode=='real')
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
-	elseif(!is_string($this->ZoomMode))
-		$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
-	if($this->LayoutMode=='single')
-		$this->_put('/PageLayout /SinglePage');
-	elseif($this->LayoutMode=='continuous')
-		$this->_put('/PageLayout /OneColumn');
-	elseif($this->LayoutMode=='two')
-		$this->_put('/PageLayout /TwoColumnLeft');
-}
+	if($this->ZoomMode=='fullpage') {
+			$this->_put('/OpenAction ['.$n.' 0 R /Fit]');
+	} elseif($this->ZoomMode=='fullwidth') {
+			$this->_put('/OpenAction ['.$n.' 0 R /FitH null]');
+	} elseif($this->ZoomMode=='real') {
+			$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null 1]');
+	} elseif(!is_string($this->ZoomMode)) {
+			$this->_put('/OpenAction ['.$n.' 0 R /XYZ null null '.sprintf('%.2F',$this->ZoomMode/100).']');
+	}
+	if($this->LayoutMode=='single') {
+			$this->_put('/PageLayout /SinglePage');
+	} elseif($this->LayoutMode=='continuous') {
+			$this->_put('/PageLayout /OneColumn');
+	} elseif($this->LayoutMode=='two') {
+			$this->_put('/PageLayout /TwoColumnLeft');
+	}
+	}
 
 protected function _putheader()
 {
@@ -1894,8 +2039,9 @@ 
 	$this->_put('xref');
 	$this->_put('0 '.($this->n+1));
 	$this->_put('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
-		$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	for($i=1;$i<=$this->n;$i++) {
+			$this->_put(sprintf('%010d 00000 n ',$this->offsets[$i]));
+	}
 	// Trailer
 	$this->_put('trailer');
 	$this->_put('<<');

model/core/residentes_informacion.php

Braces +6 added lines, -6 removed lines

@@ -216,7 +216,7 @@ 
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        } else{
             return false;
         }
     }
@@ -235,7 +235,7 @@ 
         if($data){
             $item = new residentes_informacion($data[0]);
             return $item->info_adicional($item);
-        }else{
+        } else{
             return false;
         }
     }
@@ -257,7 +257,7 @@ 
                 $lista[] = $item->info_adicional($item);
             }
             return $lista;
-        }else{
+        } else{
             return false;
         }
     }
@@ -265,7 +265,7 @@ 
     public function exists() {
         if(!$this->get($this->codcliente)){
             return false;
-        }else{
+        } else{
             return $this->get($this->codcliente);
         }
     }
@@ -296,7 +296,7 @@ 
             "vehiculos = ".$this->intval($this->vehiculos)." ".
             "WHERE codcliente = ".$this->var2str($this->codcliente).";";
             return $this->db->exec($sql);
-        }else{
+        } else{
             $sql = "INSERT INTO ".$this->table_name." (codcliente, codigo, ocupantes, ocupantes5anos, ocupantes12anos, ocupantes18anos, ocupantes30anos, ocupantes50anos, ocupantes70anos, ocupantes71anos, informacion_discapacidad, propietario, profesion, ocupacion, ca_nombres, ca_apellidos, ca_telefono, ca_email, ca_propietario, ca_parentesco, ca_parentesco_obs, vehiculos) VALUES (".
             $this->var2str($this->codcliente).", ".
             $this->var2str($this->codigo).", ".
@@ -322,7 +322,7 @@ 
             $this->intval($this->vehiculos).");";
             if($this->db->exec($sql)){
                 return true;
-            }else{
+            } else{
                 return false;
             }
         }