iNextrix / ASTPP

web_interface/astpp/application/libraries/html2pdf/_tcpdf_5.0.002/qrcode.php

Doc Comments +4 added lines, -4 removed lines

@@ -1123,7 +1123,7 @@ 
 		 * @param array $frame
 		 * @param int $maskNo
 		 * @param int $level
-		 * @return array mask
+		 * @return integer mask
 		 */
 		 protected function makeMask($width, $frame, $maskNo, $level) {
 			$masked = array_fill(0, $width, str_repeat("\0", $width));
@@ -1165,7 +1165,7 @@ 
 		/**
 		 * evaluateSymbol
 		 * @param int $width
-		 * @param array $frame
+		 * @param integer $frame
 		 * @return int demerit
 		 */
 		 protected function evaluateSymbol($width, $frame) {
@@ -2035,7 +2035,7 @@ 
 
 		/**
 		 * convertData
-		 * @param array $items
+		 * @param integer $items
 		 * @return array items
 		 */
 		 protected function convertData($items) {
@@ -2490,7 +2490,7 @@ 
 
 		/**
 		 * Return BCH encoded format information pattern.
-		 * @param array $mask
+		 * @param integer $mask
 		 * @param int $level error correction level
 		 * @return BCH encoded format information pattern
 		 */

Indentation +6 added lines, -6 removed lines

@@ -264,12 +264,12 @@
 
 	// for compaibility with PHP4
 	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
+		/**
+		 * Convert a string to an array (needed for PHP4 compatibility)
+		 * @param string $string The input string.
+		 * @param int $split_length Maximum length of the chunk.
+		 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+		 */
 		function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {

Spacing +10 added lines, -10 removed lines

@@ -180,12 +180,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-	define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH', 0);
 
 	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-	define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS', 1);
 
 	/**
 	 * Matrix index to get remainder from $capacity array.
@@ -195,7 +195,7 @@ 
 	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-	define('QRCAP_EC',       3);
+	define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -204,7 +204,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-	define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS', 20);
 
 	/**
 	 * Max number of symbols for structured mode
@@ -218,12 +218,12 @@ 
 	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-	define('N1',  3);
+	define('N1', 3);
 
 	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
 	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -260,18 +260,18 @@ 
 
 // #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
 
-if (!class_exists('QRcode', false)) {
+if ( ! class_exists('QRcode', false)) {
 
 	// for compaibility with PHP4
-	if (!function_exists('str_split')) {
+	if ( ! function_exists('str_split')) {
     	/**
     	 * Convert a string to an array (needed for PHP4 compatibility)
     	 * @param string $string The input string.
     	 * @param int $split_length Maximum length of the chunk.
     	 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
     	 */
-		function str_split($string, $split_length=1) {
-			if ((strlen($string) > $split_length) OR (!$split_length)) {
+		function str_split($string, $split_length = 1) {
+			if ((strlen($string) > $split_length) OR ( ! $split_length)) {
 				do {
 					$c = strlen($string);
 					$parts[] = substr($string, 0, $split_length);

web_interface/astpp/system/database/DB_result.php

Doc Comments +1 added lines

@@ -64,6 +64,7 @@
 	 * Custom query result.
 	 *
 	 * @param class_name A string that represents the type of object you want back
+	 * @param string $class_name
 	 * @return array of objects
 	 */
 	public function custom_result_object($class_name)

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_driver.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 	 *
 	 * @access	private called by execute()
 	 * @param	string	an SQL query
+	 * @param string $sql
 	 * @return	string
 	 */
 	function _prep_query($sql)

Indentation +9 added lines, -9 removed lines

@@ -295,15 +295,15 @@
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return string major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return string major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);

Braces +6 added lines, -4 removed lines

@@ -338,13 +338,15 @@
 	 */
 	function count_all($table = '')
 	{
-		if ($table == '')
-			return '0';
+		if ($table == '') {
+					return '0';
+		}
 	
 		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table);
 		
-		if ($query->num_rows() == 0)
-			return '0';
+		if ($query->num_rows() == 0) {
+					return '0';
+		}
 
 		$row = $query->row();
 		$this->_reset_select();

web_interface/astpp/system/libraries/Encrypt.php

Doc Comments +5 added lines

@@ -293,6 +293,8 @@ 
 	 * @access	private
 	 * @param	string
 	 * @param	string
+	 * @param string $string
+	 * @param string $key
 	 * @return	string
 	 */
 	function _xor_merge($string, $key)
@@ -365,6 +367,7 @@ 
 	 * @param	string
 	 * @param	string
 	 * @param string $data
+	 * @param string $key
 	 * @return	string
 	 */
 	function _add_cipher_noise($data, $key)
@@ -396,6 +399,8 @@ 
 	 *
 	 * @access	public
 	 * @param	type
+	 * @param string $data
+	 * @param string $key
 	 * @return	string
 	 */
 	function _remove_cipher_noise($data, $key)

web_interface/astpp/system/libraries/Fpdf.php

Doc Comments +3 added lines

@@ -1010,6 +1010,9 @@
 	return $this->x;

 }

 

+/**
+ * @param integer $x
+ */
 function SetX($x)

 {

 	// Set x position

Spacing +106 added lines, -106 removed lines

@@ -77,14 +77,14 @@ 
 *******************************************************************************/

 function FPDF($props = array())

 {

-	 if(count($props) == 3)

+	 if (count($props) == 3)

 	 {

-		 list($orientation,$unit,$format) = $props;

-		 $this->initialize($orientation,$unit,$format);

+		 list($orientation, $unit, $format) = $props;

+		 $this->initialize($orientation, $unit, $format);

 	 }	

 }

 

-function initialize($orientation='P',$unit='mm',$size='A4')

+function initialize($orientation = 'P', $unit = 'mm', $size = 'A4')

 {

 	// Some checks

 	$this->_dochecks();

@@ -182,12 +182,12 @@ 
  * @param double $left
  * @param double $top
  */
-function SetMargins($left, $top, $right=null)

+function SetMargins($left, $top, $right = null)

 {

 	// Set left, top and right margins

 	$this->lMargin = $left;

 	$this->tMargin = $top;

-	if($right===null) {
+	if ($right === null) {
 			$right = $left;
 	}
 	$this->rMargin = $right;

@@ -216,25 +216,25 @@ 
 /**
  * @param boolean $auto
  */
-function SetAutoPageBreak($auto, $margin=0)

+function SetAutoPageBreak($auto, $margin = 0)

 {

 	// Set auto page break mode and triggering margin

 	$this->AutoPageBreak = $auto;

 	$this->bMargin = $margin;

-	$this->PageBreakTrigger = $this->h-$margin;

+	$this->PageBreakTrigger = $this->h - $margin;

 }

 

 /**
  * @param string $zoom
  */
-function SetDisplayMode($zoom, $layout='default')

+function SetDisplayMode($zoom, $layout = 'default')

 {

 	// Set display mode in viewer

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

+	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')

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

 		$this->LayoutMode = $layout;

 	else

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

@@ -412,14 +412,14 @@ 
 	return $this->page;

 }

 

-function SetDrawColor($r, $g=null, $b=null)

+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);

+	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->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);

+	if ($this->page > 0)

 		$this->_out($this->DrawColor);

 }

 

@@ -428,26 +428,26 @@ 
  * @param integer $g
  * @param integer $b
  */
-function SetFillColor($r, $g=null, $b=null)

+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);

+	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->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);

 }

 

-function SetTextColor($r, $g=null, $b=null)

+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);

+	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);

+		$this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);

+	$this->ColorFlag = ($this->FillColor != $this->TextColor);

 }

 

 function GetStringWidth($s)

@@ -457,18 +457,18 @@ 
 	$cw = &$this->CurrentFont['cw'];

 	$w = 0;

 	$l = strlen($s);

-	for($i=0;$i<$l;$i++) {
+	for ($i = 0; $i < $l; $i++) {
 			$w += $cw[$s[$i]];
 	}
-	return $w*$this->FontSize/1000;

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

 }

 

 function SetLineWidth($width)

 {

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

 

@@ -479,57 +479,57 @@ 
 function Line($x1, $y1, $x2, $y2)

 {

 	// Draw a line

-	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));

+	$this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));

 }

 

-function Rect($x, $y, $w, $h, $style='')

+function Rect($x, $y, $w, $h, $style = '')

 {

 	// Draw a rectangle

-	if($style=='F') {
+	if ($style == 'F') {
 			$op = 'f';
-	} elseif($style=='FD' || $style=='DF') {
+	} 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));

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

 }

 

 /**
  * @param string $family
  */
-function AddFont($family, $style='', $file='')

+function AddFont($family, $style = '', $file = '')

 {

 	// 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') {
+	if ($style == 'IB') {
 			$style = 'BI';
 	}
 	$fontkey = $family.$style;

-	if(isset($this->fonts[$fontkey])) {
+	if (isset($this->fonts[$fontkey])) {
 			return;
 	}
 	$info = $this->_loadfont($file);

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

-	if(!empty($info['diff']))

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

+	if ( ! empty($info['diff']))

 	{

 		// Search existing encodings

-		$n = array_search($info['diff'],$this->diffs);

-		if(!$n)

+		$n = array_search($info['diff'], $this->diffs);

+		if ( ! $n)

 		{

-			$n = count($this->diffs)+1;

+			$n = count($this->diffs) + 1;

 			$this->diffs[$n] = $info['diff'];

 		}

 		$info['diffn'] = $n;

 	}

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

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

 	{

 		// Embedded font

-		if($info['type']=='TrueType') {
+		if ($info['type'] == 'TrueType') {
 					$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
 		} else {
 					$this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
@@ -541,48 +541,48 @@ 
 /**
  * @param string $family
  */
-function SetFont($family, $style='', $size=0)

+function SetFont($family, $style = '', $size = 0)

 {

 	// Select a font; size given in points

-	if($family=='') {
+	if ($family == '') {
 			$family = $this->FontFamily;
 	} else {
 			$family = strtolower($family);
 	}
 	$style = strtoupper($style);

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

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

 	{

 		$this->underline = true;

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

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

 	} else {
 			$this->underline = false;
 	}
-	if($style=='IB') {
+	if ($style == 'IB') {
 			$style = 'BI';
 	}
-	if($size==0) {
+	if ($size == 0) {
 			$size = $this->FontSizePt;
 	}
 	// Test if font is already selected

-	if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
+	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]))

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

 	{

 		// Test if one of the core fonts

-		if($family=='arial') {
+		if ($family == 'arial') {
 					$family = 'helvetica';
 		}
-		if(in_array($family,$this->CoreFonts))

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

 		{

-			if($family=='symbol' || $family=='zapfdingbats') {
+			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);
@@ -654,79 +654,79 @@ 
 	return $this->AutoPageBreak;

 }

 

-function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')

+function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '')

 {

 	// Output a cell

 	$k = $this->k;

-	if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

+	if ($this->y + $h > $this->PageBreakTrigger && ! $this->InHeader && ! $this->InFooter && $this->AcceptPageBreak())

 	{

 		// Automatic page break

 		$x = $this->x;

 		$ws = $this->ws;

-		if($ws>0)

+		if ($ws > 0)

 		{

 			$this->ws = 0;

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

 		}

-		$this->AddPage($this->CurOrientation,$this->CurPageSize);

+		$this->AddPage($this->CurOrientation, $this->CurPageSize);

 		$this->x = $x;

-		if($ws>0)

+		if ($ws > 0)

 		{

 			$this->ws = $ws;

-			$this->_out(sprintf('%.3F Tw',$ws*$k));

+			$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 || $border == 1)

 	{

-		if($fill)

-			$op = ($border==1) ? 'B' : 'f';

+		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);

+		$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))

+	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 ($txt !== '')

 	{

-		if($align=='R')

-			$dx = $w-$this->cMargin-$this->GetStringWidth($txt);

-		elseif($align=='C')

-			$dx = ($w-$this->GetStringWidth($txt))/2;

+		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)

+		if ($this->ColorFlag)

 			$s .= 'q '.$this->TextColor.' ';

-		$txt2 = str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));

-		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);

-		if($this->underline)

-			$s .= ' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-		if($this->ColorFlag)

+		$txt2 = str_replace(')', '\\)', str_replace('(', '\\(', str_replace('\\', '\\\\', $txt)));

+		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $txt2);

+		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 ($link)

+			$this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);

 	}

-	if($s)

+	if ($s)

 		$this->_out($s);

 	$this->lasth = $h;

-	if($ln>0)

+	if ($ln > 0)

 	{

 		// Go to next line

 		$this->y += $h;

-		if($ln==1)

+		if ($ln == 1)

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

 	}

 	else

@@ -737,21 +737,21 @@ 
  * @param integer $w
  * @param integer $h
  */
-function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)

+function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false)

 {

 	// Output text with automatic or explicit line breaks

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

-	if($w==0)

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

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

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

+	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")

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

 		$nb--;

 	$b = 0;

-	if($border)

+	if ($border)

 	{

-		if($border==1)

+		if ($border == 1)

 		{

 			$border = 'LTRB';

 			$b = 'LRT';

Braces +518 added lines, -401 removed lines

@@ -116,26 +116,28 @@ 
 	if (defined('FPDF_FONTPATH'))

 	{

 		$this->fontpath = FPDF_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 = '';	

+		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 = '';
+	}
 	// Core fonts

 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');

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

@@ -149,15 +151,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;

@@ -197,9 +198,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)

 {

@@ -230,15 +232,17 @@ 
 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);
+	}
+	}

 

 /**
  * @param boolean $compress
@@ -246,49 +250,55 @@ 
 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)

 {

 	// Title of document

-	if ($isUTF8)

-		$title = $this->_UTF8toUTF16($title);

+	if ($isUTF8) {
+			$title = $this->_UTF8toUTF16($title);
+	}
 	$this->title = $title;

 }

 

 function SetSubject($subject, $isUTF8 = false)

 {

 	// Subject of document

-	if ($isUTF8)

-		$subject = $this->_UTF8toUTF16($subject);

+	if ($isUTF8) {
+			$subject = $this->_UTF8toUTF16($subject);
+	}
 	$this->subject = $subject;

 }

 

 function SetAuthor($author, $isUTF8 = false)

 {

 	// Author of document

-	if ($isUTF8)

-		$author = $this->_UTF8toUTF16($author);

+	if ($isUTF8) {
+			$author = $this->_UTF8toUTF16($author);
+	}
 	$this->author = $author;

 }

 

 function SetKeywords($keywords, $isUTF8 = false)

 {

 	// Keywords of document

-	if ($isUTF8)

-		$keywords = $this->_UTF8toUTF16($keywords);

+	if ($isUTF8) {
+			$keywords = $this->_UTF8toUTF16($keywords);
+	}
 	$this->keywords = $keywords;

 }

 

 function SetCreator($creator, $isUTF8 = false)

 {

 	// Creator of document

-	if ($isUTF8)

-		$creator = $this->_UTF8toUTF16($creator);

+	if ($isUTF8) {
+			$creator = $this->_UTF8toUTF16($creator);
+	}
 	$this->creator = $creator;

 }

 

@@ -313,10 +323,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();

@@ -330,8 +342,9 @@ 
 function AddPage($orientation = '', $size = '')

 {

 	// Start a new page

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

-		$this->Open();

+	if ($this->state == 0) {
+			$this->Open();
+	}
 	$family = $this->FontFamily;

 	$style = $this->FontStyle.($this->underline ? 'U' : '');

 	$fontsize = $this->FontSizePt;

@@ -357,15 +370,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

@@ -379,8 +395,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)

 	{

@@ -415,13 +432,15 @@ 
 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);
+	}
+	}

 

 /**
  * @param integer $r
@@ -431,22 +450,25 @@ 
 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);

 }

 

@@ -594,20 +616,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()

 {

@@ -620,10 +645,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);

 }

 

@@ -641,10 +668,12 @@ 
 {

 	// Output a string

 	$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);

 }

 

@@ -676,62 +705,75 @@ 
 			$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($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($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.' ';
+		}
 		$txt2 = str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));

 		$s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);

-		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($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($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;

-}

 

 /**
  * @param integer $w
@@ -741,13 +783,15 @@ 
 {

 	// Output text with automatic or explicit line breaks

 	$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)

 	{

@@ -756,14 +800,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;

 		}

 	}

@@ -792,8 +837,9 @@ 
 			$l = 0;

 			$ns = 0;

 			$nl++;

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

-				$b = $b2;

+			if ($border && $nl == 2) {
+							$b = $b2;
+			}
 			continue;

 		}

 		if ($c == ' ')

@@ -808,16 +854,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')

 				{

@@ -832,11 +878,12 @@ 
 			$l = 0;

 			$ns = 0;

 			$nl++;

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

-				$b = $b2;

-		}

-		else

-			$i++;

+			if ($border && $nl == 2) {
+							$b = $b2;
+			}
+		} else {
+					$i++;
+		}
 	}

 	// Last chunk

 	if ($this->ws > 0)

@@ -844,8 +891,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;

 }

@@ -884,8 +932,9 @@ 
 			$nl++;

 			continue;

 		}

-		if ($c == ' ')

-			$sep = $i;

+		if ($c == ' ') {
+					$sep = $i;
+		}
 		$l += $cw[$c];

 		if ($l > $wmax)

 		{

@@ -903,11 +952,11 @@ 
 					$nl++;

 					continue;

 				}

-				if ($i == $j)

-					$i++;

+				if ($i == $j) {
+									$i++;
+				}
 				$this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);

-			}

-			else

+			} else

 			{

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

 				$i = $sep + 1;

@@ -922,24 +971,26 @@ 
 				$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, '', 0, $link);

-}

+	if ($i != $j) {
+			$this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', 0, $link);
+	}
+	}

 

 function Ln($h = null)

 {

 	// Line feed; default value is 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 = '')

 {

@@ -950,22 +1001,25 @@ 
 		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)

@@ -974,14 +1028,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)

@@ -997,12 +1055,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 GetX()

 {

@@ -1013,11 +1073,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()

 {

@@ -1029,11 +1090,12 @@ 
 {

 	// Set y position and reset x

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

-	if ($y >= 0)

-		$this->y = $y;

-	else

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

-}

+	if ($y >= 0) {
+			$this->y = $y;
+	} else {
+			$this->y = $this->h + $y;
+	}
+	}

 

 /**
  * @param integer $x
@@ -1048,8 +1110,9 @@ 
 function Output($name = '', $dest = '')

 {

 	// Output PDF to some destination

-	if ($this->state < 3)

-		$this->Close();

+	if ($this->state < 3) {
+			$this->Close();
+	}
 	$dest = strtoupper($dest);

 	if ($dest == '')

 	{

@@ -1089,8 +1152,9 @@ 
 		case 'F':

 			// Save to local file

 			$f = fopen($name, 'wb');

-			if ( ! $f)

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

+			if ( ! $f) {
+							$this->Error('Unable to create output file: '.$name);
+			}
 			fwrite($f, $this->buffer, strlen($this->buffer));

 			fclose($f);

 			break;

@@ -1111,22 +1175,26 @@ 
 function _dochecks()

 {

 	// Check availability of %F

-	if (sprintf('%.1F', 1.0) != '1.0')

-		$this->Error('This version of PHP is not supported');

+	if (sprintf('%.1F', 1.0) != '1.0') {
+			$this->Error('This version of PHP is not supported');
+	}
 	// 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');
+	}
 	// Ensure runtime magic quotes are disabled

-	if (get_magic_quotes_runtime())

-		@set_magic_quotes_runtime(0);

-}

+	if (get_magic_quotes_runtime()) {
+			@set_magic_quotes_runtime(0);
+	}
+	}

 

 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())

 	{

@@ -1146,17 +1214,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;
+		}
 	}

 }

 

@@ -1173,14 +1242,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

@@ -1199,9 +1270,10 @@ 
 		$this->CurOrientation = $orientation;

 		$this->CurPageSize = $size;

 	}

-	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1])

-		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);

-}

+	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1]) {
+			$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+	}
+	}

 

 function _endpage()

 {

@@ -1216,8 +1288,9 @@ 
 	// Load a font definition file from the font directory

 	include($this->fontpath.$font);

 	$a = get_defined_vars();

-	if ( ! isset($a['name']))

-		$this->Error('Could not include font definition file');

+	if ( ! isset($a['name'])) {
+			$this->Error('Could not include font definition file');
+	}
 	return $a;

 }

 

@@ -1253,15 +1326,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);

@@ -1283,16 +1354,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);

@@ -1305,8 +1379,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;

@@ -1315,33 +1390,40 @@ 
 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;

 

@@ -1358,44 +1440,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 = '';

@@ -1429,8 +1512,9 @@ 
 		unset($data);

 		$data = gzcompress($color);

 		$info['smask'] = gzcompress($alpha);

-		if ($this->PDFVersion < '1.4')

-			$this->PDFVersion = '1.4';

+		if ($this->PDFVersion < '1.4') {
+					$this->PDFVersion = '1.4';
+		}
 	}

 	$info['data'] = $data;

 	return $info;

@@ -1443,13 +1527,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;

 }

 

@@ -1463,13 +1549,16 @@ 
 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);

 	$f = @fopen('php://temp', 'rb+');

 	if ($f)

@@ -1483,15 +1572,16 @@ 
 		rewind($f);

 		$info = $this->_parsepngstream($f, $file);

 		fclose($f);

-	}

-	else

+	} else

 	{

 		// Use temporary file

 		$tmp = tempnam('.', 'gif');

-		if ( ! $tmp)

-			$this->Error('Unable to create a temporary file');

-		if ( ! imagepng($im, $tmp))

-			$this->Error('Error while saving to temporary file');

+		if ( ! $tmp) {
+					$this->Error('Unable to create a temporary file');
+		}
+		if ( ! imagepng($im, $tmp)) {
+					$this->Error('Error while saving to temporary file');
+		}
 		imagedestroy($im);

 		$info = $this->_parsepng($tmp);

 		unlink($tmp);

@@ -1517,11 +1607,12 @@ 
 function _out($s)

 {

 	// Add a line to the document

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

-		$this->pages[$this->page] .= $s."\n";

-	else

-		$this->buffer .= $s."\n";

-}

+	if ($this->state == 2) {
+			$this->pages[$this->page] .= $s."\n";
+	} else {
+			$this->buffer .= $s."\n";
+	}
+	}

 

 function _putpages()

 {

@@ -1529,15 +1620,15 @@ 
 	if ( ! empty($this->AliasNbPages))

 	{

 		// Replace number of pages

-		for ($n = 1; $n <= $nb; $n++)

-			$this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);

+		for ($n = 1; $n <= $nb; $n++) {
+					$this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);
+		}
 	}

 	if ($this->DefOrientation == 'P')

 	{

 		$wPt = $this->DefPageSize[0] * $this->k;

 		$hPt = $this->DefPageSize[1] * $this->k;

-	}

-	else

+	} else

 	{

 		$wPt = $this->DefPageSize[1] * $this->k;

 		$hPt = $this->DefPageSize[0] * $this->k;

@@ -1549,8 +1640,9 @@ 
 		$this->_newobj();

 		$this->_out('<</Type /Page');

 		$this->_out('/Parent 1 0 R');

-		if (isset($this->PageSizes[$n]))

-			$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));

+		if (isset($this->PageSizes[$n])) {
+					$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));
+		}
 		$this->_out('/Resources 2 0 R');

 		if (isset($this->PageLinks[$n]))

 		{

@@ -1560,9 +1652,9 @@ 
 			{

 				$rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);

 				$annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';

-				if (is_string($pl[4]))

-					$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';

-				else

+				if (is_string($pl[4])) {
+									$annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+				} else

 				{

 					$l = $this->links[$pl[4]];

 					$h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;

@@ -1571,8 +1663,9 @@ 
 			}

 			$this->_out($annots.']');

 		}

-		if ($this->PDFVersion > '1.3')

-			$this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');

+		if ($this->PDFVersion > '1.3') {
+					$this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+		}
 		$this->_out('/Contents '.($this->n + 1).' 0 R>>');

 		$this->_out('endobj');

 		// Page content

@@ -1587,8 +1680,9 @@ 
 	$this->_out('1 0 obj');

 	$this->_out('<</Type /Pages');

 	$kids = '/Kids [';

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

-		$kids .= (3 + 2 * $i).' 0 R ';

+	for ($i = 0; $i < $nb; $i++) {
+			$kids .= (3 + 2 * $i).' 0 R ';
+	}
 	$this->_out($kids.']');

 	$this->_out('/Count '.$nb);

 	$this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));

@@ -1612,17 +1706,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->_out('<</Length '.strlen($font));

-		if ($compressed)

-			$this->_out('/Filter /FlateDecode');

+		if ($compressed) {
+					$this->_out('/Filter /FlateDecode');
+		}
 		$this->_out('/Length1 '.$info['length1']);

-		if (isset($info['length2']))

-			$this->_out('/Length2 '.$info['length2'].' /Length3 0');

+		if (isset($info['length2'])) {
+					$this->_out('/Length2 '.$info['length2'].' /Length3 0');
+		}
 		$this->_out('>>');

 		$this->_putstream($font);

 		$this->_out('endobj');

@@ -1640,12 +1738,12 @@ 
 			$this->_out('<</Type /Font');

 			$this->_out('/BaseFont /'.$name);

 			$this->_out('/Subtype /Type1');

-			if ($name != 'Symbol' && $name != 'ZapfDingbats')

-				$this->_out('/Encoding /WinAnsiEncoding');

+			if ($name != 'Symbol' && $name != 'ZapfDingbats') {
+							$this->_out('/Encoding /WinAnsiEncoding');
+			}
 			$this->_out('>>');

 			$this->_out('endobj');

-		}

-		elseif ($type == 'Type1' || $type == 'TrueType')

+		} elseif ($type == 'Type1' || $type == 'TrueType')

 		{

 			// Additional Type1 or TrueType/OpenType font

 			$this->_newobj();

@@ -1655,36 +1753,40 @@ 
 			$this->_out('/FirstChar 32 /LastChar 255');

 			$this->_out('/Widths '.($this->n + 1).' 0 R');

 			$this->_out('/FontDescriptor '.($this->n + 2).' 0 R');

-			if (isset($font['diffn']))

-				$this->_out('/Encoding '.($nf + $font['diffn']).' 0 R');

-			else

-				$this->_out('/Encoding /WinAnsiEncoding');

+			if (isset($font['diffn'])) {
+							$this->_out('/Encoding '.($nf + $font['diffn']).' 0 R');
+			} else {
+							$this->_out('/Encoding /WinAnsiEncoding');
+			}
 			$this->_out('>>');

 			$this->_out('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->_out($s.']');

 			$this->_out('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->_out($s.'>>');

 			$this->_out('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);

 		}

 	}

@@ -1708,28 +1810,33 @@ 
 	$this->_out('/Subtype /Image');

 	$this->_out('/Width '.$info['w']);

 	$this->_out('/Height '.$info['h']);

-	if ($info['cs'] == 'Indexed')

-		$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');

-	else

+	if ($info['cs'] == 'Indexed') {
+			$this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');
+	} else

 	{

 		$this->_out('/ColorSpace /'.$info['cs']);

-		if ($info['cs'] == 'DeviceCMYK')

-			$this->_out('/Decode [1 0 1 0 1 0 1 0]');

+		if ($info['cs'] == 'DeviceCMYK') {
+					$this->_out('/Decode [1 0 1 0 1 0 1 0]');
+		}
 	}

 	$this->_out('/BitsPerComponent '.$info['bpc']);

-	if (isset($info['f']))

-		$this->_out('/Filter /'.$info['f']);

-	if (isset($info['dp']))

-		$this->_out('/DecodeParms <<'.$info['dp'].'>>');

+	if (isset($info['f'])) {
+			$this->_out('/Filter /'.$info['f']);
+	}
+	if (isset($info['dp'])) {
+			$this->_out('/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->_out('/Mask ['.$trns.']');

 	}

-	if (isset($info['smask']))

-		$this->_out('/SMask '.($this->n + 1).' 0 R');

+	if (isset($info['smask'])) {
+			$this->_out('/SMask '.($this->n + 1).' 0 R');
+	}
 	$this->_out('/Length '.strlen($info['data']).'>>');

 	$this->_putstream($info['data']);

 	$this->_out('endobj');

@@ -1754,16 +1861,18 @@ 
 

 function _putxobjectdict()

 {

-	foreach ($this->images as $image)

-		$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');

-}

+	foreach ($this->images as $image) {
+			$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+	}
+	}

 

 function _putresourcedict()

 {

 	$this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');

 	$this->_out('/Font <<');

-	foreach ($this->fonts as $font)

-		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');

+	foreach ($this->fonts as $font) {
+			$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+	}
 	$this->_out('>>');

 	$this->_out('/XObject <<');

 	$this->_putxobjectdict();

@@ -1786,16 +1895,21 @@ 
 function _putinfo()

 {

 	$this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));

-	if ( ! empty($this->title))

-		$this->_out('/Title '.$this->_textstring($this->title));

-	if ( ! empty($this->subject))

-		$this->_out('/Subject '.$this->_textstring($this->subject));

-	if ( ! empty($this->author))

-		$this->_out('/Author '.$this->_textstring($this->author));

-	if ( ! empty($this->keywords))

-		$this->_out('/Keywords '.$this->_textstring($this->keywords));

-	if ( ! empty($this->creator))

-		$this->_out('/Creator '.$this->_textstring($this->creator));

+	if ( ! empty($this->title)) {
+			$this->_out('/Title '.$this->_textstring($this->title));
+	}
+	if ( ! empty($this->subject)) {
+			$this->_out('/Subject '.$this->_textstring($this->subject));
+	}
+	if ( ! empty($this->author)) {
+			$this->_out('/Author '.$this->_textstring($this->author));
+	}
+	if ( ! empty($this->keywords)) {
+			$this->_out('/Keywords '.$this->_textstring($this->keywords));
+	}
+	if ( ! empty($this->creator)) {
+			$this->_out('/Creator '.$this->_textstring($this->creator));
+	}
 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

 

@@ -1803,21 +1917,23 @@ 
 {

 	$this->_out('/Type /Catalog');

 	$this->_out('/Pages 1 0 R');

-	if ($this->ZoomMode == 'fullpage')

-		$this->_out('/OpenAction [3 0 R /Fit]');

-	elseif ($this->ZoomMode == 'fullwidth')

-		$this->_out('/OpenAction [3 0 R /FitH null]');

-	elseif ($this->ZoomMode == 'real')

-		$this->_out('/OpenAction [3 0 R /XYZ null null 1]');

-	elseif ( ! is_string($this->ZoomMode))

-		$this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F', $this->ZoomMode / 100).']');

-	if ($this->LayoutMode == 'single')

-		$this->_out('/PageLayout /SinglePage');

-	elseif ($this->LayoutMode == 'continuous')

-		$this->_out('/PageLayout /OneColumn');

-	elseif ($this->LayoutMode == 'two')

-		$this->_out('/PageLayout /TwoColumnLeft');

-}

+	if ($this->ZoomMode == 'fullpage') {
+			$this->_out('/OpenAction [3 0 R /Fit]');
+	} elseif ($this->ZoomMode == 'fullwidth') {
+			$this->_out('/OpenAction [3 0 R /FitH null]');
+	} elseif ($this->ZoomMode == 'real') {
+			$this->_out('/OpenAction [3 0 R /XYZ null null 1]');
+	} elseif ( ! is_string($this->ZoomMode)) {
+			$this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F', $this->ZoomMode / 100).']');
+	}
+	if ($this->LayoutMode == 'single') {
+			$this->_out('/PageLayout /SinglePage');
+	} elseif ($this->LayoutMode == 'continuous') {
+			$this->_out('/PageLayout /OneColumn');
+	} elseif ($this->LayoutMode == 'two') {
+			$this->_out('/PageLayout /TwoColumnLeft');
+	}
+	}

 

 function _putheader()

 {

@@ -1853,8 +1969,9 @@ 
 	$this->_out('xref');

 	$this->_out('0 '.($this->n + 1));

 	$this->_out('0000000000 65535 f ');

-	for ($i = 1; $i <= $this->n; $i++)

-		$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));

+	for ($i = 1; $i <= $this->n; $i++) {
+			$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
+	}
 	// Trailer

 	$this->_out('trailer');

 	$this->_out('<<');

web_interface/astpp/system/libraries/Ftp.php

Doc Comments +1 added lines

@@ -461,6 +461,7 @@
 	 * @param	string	the file path
 	 * @param	string	the permissions
 	 * @param integer $perm
+	 * @param string $path
 	 * @return	bool
 	 */
 	function chmod($path, $perm)

web_interface/astpp/system/libraries/Sha1.php

Doc Comments +1 added lines

@@ -227,6 +227,7 @@
 	 *
 	 * @access	private
 	 * @return	string
+	 * @param integer $b
 	 */
 	function _zero_fill($a, $b)
 	{

web_interface/astpp/system/libraries/Xmlrpc.php

Doc Comments +3 added lines

@@ -381,6 +381,9 @@
 		return $this->sendPayload($msg);
 	}
 
+	/**
+	 * @param XML_RPC_Message $msg
+	 */
 	function sendPayload($msg)
 	{
 		$fp = @fsockopen($this->server, $this->port, $this->errno, $this->errstr, $this->timeout);

Spacing +2 added lines, -2 removed lines

@@ -1234,11 +1234,11 @@
 	/**
 	 * @param integer $val
 	 */
-	function addScalar($val, $type='string')
+	function addScalar($val, $type = 'string')
 	{
 		$typeof = $this->xmlrpcTypes[$type];
 
-		if ($this->mytype==1)
+		if ($this->mytype == 1)
 		{
 			echo '<strong>XML_RPC_Values</strong>: scalar can have only one value<br />';
 			return 0;

Braces +12 added lines, -24 removed lines

@@ -443,14 +443,12 @@ 
 			// error
 			$this->errno = $code;
 			$this->errstr = htmlentities($fstr);
-		}
-		else if ( ! is_object($val))
+		} else if ( ! is_object($val))
 		{
 			// programmer error, not an object
 			error_log("Invalid type '".gettype($val)."' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
 			$this->val = new XML_RPC_Values();
-		}
-		else
+		} else
 		{
 			$this->val = $val;
 		}
@@ -979,50 +977,42 @@ 
 				if ($name == 'STRING')
 				{
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name == 'DATETIME.ISO8601')
+				} elseif ($name == 'DATETIME.ISO8601')
 				{
 					$this->xh[$the_parser]['vt'] = $this->xmlrpcDateTime;
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name == 'BASE64')
+				} elseif ($name == 'BASE64')
 				{
 					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
-				}
-				elseif ($name == 'BOOLEAN')
+				} elseif ($name == 'BOOLEAN')
 				{
 					// Translated BOOLEAN values to TRUE AND FALSE
 					if ($this->xh[$the_parser]['ac'] == '1')
 					{
 						$this->xh[$the_parser]['value'] = TRUE;
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = FALSE;
 					}
-				}
-				elseif ($name == 'DOUBLE')
+				} elseif ($name == 'DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
 					if ( ! preg_match('/^[+-]?[eE0-9\t \.]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
 					}
-				}
-				else
+				} else
 				{
 					// we have an I4/INT
 					// we must check that only 0123456789-<space> are characters here
 					if ( ! preg_match('/^[+-]?[0-9\t ]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
 					}
@@ -1219,12 +1209,10 @@ 
 			if ($this->xmlrpcTypes[$type] == 1)
 			{
 				$this->addScalar($val, $type);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 2)
+			} elseif ($this->xmlrpcTypes[$type] == 2)
 			{
 				$this->addArray($val);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 3)
+			} elseif ($this->xmlrpcTypes[$type] == 3)
 			{
 				$this->addStruct($val);
 			}

web_interface/astpp/application/models/astpp_common.php

Indentation +112 added lines, -112 removed lines

@@ -22,133 +22,133 @@
 ###############################################################################
 
 class Astpp_common extends CI_Model {
-    // ------------------------------------------------------------------------
-    /**
-     * initialises the class inheriting the methods of the class Model 
-     *
-     * @return Usermodel
-     */
-    function Astpp_common() {
-        parent::__construct();
-    }
-    /**
-     * -------Here we write code for model astpp_common_model functions list_applyable_charges------
-     * Purpose: build array for applyable charge dropdown list.
-     * @param 
-     * @return return array of applyable chargelist.
-     */
-    function list_applyable_charges($accountid = '') {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+	// ------------------------------------------------------------------------
+	/**
+	 * initialises the class inheriting the methods of the class Model 
+	 *
+	 * @return Usermodel
+	 */
+	function Astpp_common() {
+		parent::__construct();
+	}
+	/**
+	 * -------Here we write code for model astpp_common_model functions list_applyable_charges------
+	 * Purpose: build array for applyable charge dropdown list.
+	 * @param 
+	 * @return return array of applyable chargelist.
+	 */
+	function list_applyable_charges($accountid = '') {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
 	$q = " SELECT * FROM `charges` where reseller_id =$reseller_id and id NOT IN(select charge_id from charge_to_account where accountid  =$accountid) AND pricelist_id = '0'";
-        $item_arr = array();
-        $query = $this->db->query($q);
-        if ($query->num_rows() > 0) {
-            foreach ($query->result_array() as $row) {
-                if ($row['charge'] > 0) {
-                    $row['charge'] = $this->common_model->calculate_currency($row['charge']);
-                }
-                $item_arr[$row['id']] = $row['description'].' - '.$row['charge'];
-            }
-        }
-        return $item_arr;
-    }
-    function quote($inp) {
-        return "'".$this->db->escape_str($inp)."'";
-    }
+		$item_arr = array();
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			foreach ($query->result_array() as $row) {
+				if ($row['charge'] > 0) {
+					$row['charge'] = $this->common_model->calculate_currency($row['charge']);
+				}
+				$item_arr[$row['id']] = $row['description'].' - '.$row['charge'];
+			}
+		}
+		return $item_arr;
+	}
+	function quote($inp) {
+		return "'".$this->db->escape_str($inp)."'";
+	}
 
-    /**
-     * @param string $q
-     * @param string $colname
-     */
-    function db_get_item($q, $colname) {
-        $item_arr = array();
-        $query = $this->db->query($q);
-        if ($query->num_rows() > 0) {
-            $row = $query->row_array();
-            return $row[$colname];
-        }
-        return '';
-    }
-    // Return the balance for a specific ASTPP account.
-    function accountbalance($account) {
-        $debit = 0;
-        $q = "SELECT SUM(debit) as val1 FROM cdrs WHERE accountid=".$this->quote($account)." AND status NOT IN (1, 2)";
-        $query = $this->db->query($q);
-        if ($query->num_rows() > 0) {
-            $row = $query->row_array();
-            $debit = $row['val1'];
-        }
-        $credit = 0;
-        $q = "SELECT SUM(credit) as val1  FROM cdrs WHERE accountid= ".$this->quote($account)." AND status NOT IN (1, 2)";
-        $query = $this->db->query($q);
-        if ($query->num_rows() > 0) {
-            $row = $query->row_array();
-            $credit = $row['val1'];
-        }
-        $posted_balance = 0;
-        $q = "SELECT * FROM accounts WHERE id = ".$this->quote($account);
-        $query = $this->db->query($q);
-        if ($query->num_rows() > 0) {
-            $row = $query->row_array();
-            $posted_balance = $row['balance'];
-        }
-        $balance = ($debit - $credit + $posted_balance);
-        return $balance;
-    }
-    function accounts_total_balance($reseller) {
-        $debit = 0;
-        $credit = 0;
-        if ($reseller == "") {
-            $q = "SELECT SUM(debit) as val1 FROM cdrs WHERE status NOT IN (1, 2)";
-            $debit = $this->db_get_item($q, 'val1');
+	/**
+	 * @param string $q
+	 * @param string $colname
+	 */
+	function db_get_item($q, $colname) {
+		$item_arr = array();
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
+			return $row[$colname];
+		}
+		return '';
+	}
+	// Return the balance for a specific ASTPP account.
+	function accountbalance($account) {
+		$debit = 0;
+		$q = "SELECT SUM(debit) as val1 FROM cdrs WHERE accountid=".$this->quote($account)." AND status NOT IN (1, 2)";
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
+			$debit = $row['val1'];
+		}
+		$credit = 0;
+		$q = "SELECT SUM(credit) as val1  FROM cdrs WHERE accountid= ".$this->quote($account)." AND status NOT IN (1, 2)";
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
+			$credit = $row['val1'];
+		}
+		$posted_balance = 0;
+		$q = "SELECT * FROM accounts WHERE id = ".$this->quote($account);
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
+			$posted_balance = $row['balance'];
+		}
+		$balance = ($debit - $credit + $posted_balance);
+		return $balance;
+	}
+	function accounts_total_balance($reseller) {
+		$debit = 0;
+		$credit = 0;
+		if ($reseller == "") {
+			$q = "SELECT SUM(debit) as val1 FROM cdrs WHERE status NOT IN (1, 2)";
+			$debit = $this->db_get_item($q, 'val1');
 
-            $q = "SELECT SUM(credit)  as val1 FROM cdrs WHERE status NOT IN (1, 2)";
-            $credit = $this->db_get_item($q, 'val1');
+			$q = "SELECT SUM(credit)  as val1 FROM cdrs WHERE status NOT IN (1, 2)";
+			$credit = $this->db_get_item($q, 'val1');
 
-            $tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ''";
-        } else {
-            $tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ".$this->quote($reseller);
-        }
-        $posted_balance = $this->db_get_item($tmp, "val1");
+			$tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ''";
+		} else {
+			$tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ".$this->quote($reseller);
+		}
+		$posted_balance = $this->db_get_item($tmp, "val1");
 
-        $balance = ($debit - $credit + $posted_balance);
-        return $balance;
-    }
-    function count_dids($test) {
-        $tmp = "SELECT COUNT(*) as val1 FROM dids ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+		$balance = ($debit - $credit + $posted_balance);
+		return $balance;
+	}
+	function count_dids($test) {
+		$tmp = "SELECT COUNT(*) as val1 FROM dids ".$test;
+		return $this->db_get_item($tmp, 'val1');
+	}
 
-    function count_callingcards($where, $field = 'COUNT(*)') {
-        $tmp = "SELECT $field as val FROM callingcards ".$where;
-        return $this->db_get_item($tmp, 'val');
-    }
+	function count_callingcards($where, $field = 'COUNT(*)') {
+		$tmp = "SELECT $field as val FROM callingcards ".$where;
+		return $this->db_get_item($tmp, 'val');
+	}
 
-    function count_accounts($test) {
-        $tmp = "SELECT COUNT(*) as val1 FROM accounts ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+	function count_accounts($test) {
+		$tmp = "SELECT COUNT(*) as val1 FROM accounts ".$test;
+		return $this->db_get_item($tmp, 'val1');
+	}
 
-    function count_rategroup($test) {
+	function count_rategroup($test) {
 	 $tmp = "SELECT COUNT(*) as val1 FROM pricelists ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+		return $this->db_get_item($tmp, 'val1');
+	}
 
-    function count_termination($test = '') {
+	function count_termination($test = '') {
 	 $tmp = "SELECT COUNT(*) as val1 FROM outbound_routes ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+		return $this->db_get_item($tmp, 'val1');
+	}
 
-    function count_trunk($test = '') {
+	function count_trunk($test = '') {
 	 $tmp = "SELECT COUNT(*) as val1 FROM trunks ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+		return $this->db_get_item($tmp, 'val1');
+	}
 
-    function count_origination($test = '') {
+	function count_origination($test = '') {
 	 $tmp = "SELECT COUNT(*) as val1 FROM routes ".$test;
-        return $this->db_get_item($tmp, 'val1');
-    }
+		return $this->db_get_item($tmp, 'val1');
+	}
 
 } 
 ?>