aepnat / simhelpdesk

emailsend.php

Braces +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 {	$emailstatus = $_POST['emailstatus'];

 	if($emailstatus=="Sent")

 	{	$errors[] = 'You have sent this email!';

-	}else

+	} else

 	{	$to 	 = $_POST['emailto'];

 		$cc 	 = substr($_POST['emailcc'], 0, -2);

 		$subject = $_POST['emailsubject'];

useradd.php

Indentation +2 added lines, -2 removed lines

@@ -3,10 +3,10 @@
 $general->logged_out_protect();

 if (isset($_POST['submit'])) 

 {	if ($users->user_exists($_POST['username']) == true && !empty($_POST['username']))

-    {	$errors[] = 'Sorry, username '.$_POST['username'].' is already exists!';

+	{	$errors[] = 'Sorry, username '.$_POST['username'].' is already exists!';

 	}

 	if ($users->email_exists($_POST['email']) == true && !empty($_POST['email']))

-    {	$errors[] = 'Sorry, email '.$_POST['email'].' is already exists!';

+	{	$errors[] = 'Sorry, email '.$_POST['email'].' is already exists!';

 	}

 	if(empty($errors) === true)

 	{	$fullname 	= $_POST['fullname'];

changepwd.php

Braces +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	$userpassword	= $user['password'];

 	if ($oldpassword != $userpassword)

 	{	$errors[] = 'The old password does not match!';	

-	}else

+	} else

 	{	$newpassword1 	= $_POST['newpassword1'];

 		$users->changepwd($userid,$newpassword1);

 		$users->log_users($_SESSION['loginid'],"Change the old password");

ticketlist.php

Braces +3 added lines, -6 removed lines

@@ -3,8 +3,7 @@ 
 $general->logged_out_protect();

 $user = $users->userdata($_SESSION['loginid']);

 if($user['level'] == "Admin" || $user['level'] == "Manager")

-{$akses=true;}

-else 

+{$akses=true;} else 

 {$akses=false;}

 if ($akses=False)

 {exit("You don't have permission to access this page!");}

@@ -77,10 +76,8 @@ 
 			$slagoaltime=strtotime("+$resolutiontime hours",$documenteddate);

 			$slawarningtime=strtotime("+$slawarning hours",$documenteddate);

 			if ($currenttime > $slagoaltime)

-			{$slabgcolor="#FF0000";$slatxtcolor="#ffffff";}

-			else if ($currenttime >= $slawarningtime)

-			{$slabgcolor="#FFFF00";$slatxtcolor="#000000";}

-			else {$slabgcolor="#00FF00";$slatxtcolor="#000000";}

+			{$slabgcolor="#FF0000";$slatxtcolor="#ffffff";} else if ($currenttime >= $slawarningtime)

+			{$slabgcolor="#FFFF00";$slatxtcolor="#000000";} else {$slabgcolor="#00FF00";$slatxtcolor="#000000";}

 			$customer = $customers->customer_data($ticket['idcustomer']);

 			$user = $users->userdata($ticket['assignee']);

 			echo '<tr><td><a href=ticketedit.php?id='.$ticket['id']. '>'.$ticket['ticketnumber'].'</a></td>'.

userlist.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 		<?php 

 		foreach ($members as $member) {

 			if ($member['confirmed']=='1')

-			{$locked='No';}

-			else

+			{$locked='No';} else

 			{$locked='Yes';}

 			echo '<tr><td><a href=useredit.php?id='.$member['id']. '>'.$member['username'].'</a></td>'.

 				 '<td>'.$member['level'].'</td>'.

slaadd.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	$resolutiontime = $_POST['resolutiontime'];

 	$slawarning		= $_POST['slawarning'];

 	if ($slas->sla_exists($slaid) === true) {

-        $errors[] = 'SLA ID is already exists!';

-    } else {

+		$errors[] = 'SLA ID is already exists!';

+	} else {

 		$slas->add_sla($slaid,$namasla,$responsetime,$resolutiontime,$slawarning);

 		header('location:slalist.php');

 	}

statistic/rpt001print.php

Braces +2 added lines, -4 removed lines

@@ -21,13 +21,11 @@
 	{	header('Content-type: application/vnd.ms-word');

 		header('Content-Disposition: attachment; Filename="'.$reportname.'.doc"');

 		echo $content;

-	}

-	elseif($_POST['format']=='2')

+	} elseif($_POST['format']=='2')

 	{	header('Content-type: application/ms-excel');

 		header('Content-Disposition: attachment; filename="'.$reportname.'.xls"');

 		echo $content;

-	}

-	elseif($_POST['format']=='3')

+	} elseif($_POST['format']=='3')

 	{	$filename=$reportname.'.pdf';

 		define('FPDF_FONTPATH','pdftable/font/');

 		require('pdftable/lib/pdftable.inc.php');

statistic/pdftable/font/courier.php

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php

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

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

 	$fpdf_charwidths['courier'][chr($i)]=600;

+}

 $fpdf_charwidths['courierB']=$fpdf_charwidths['courier'];

 $fpdf_charwidths['courierI']=$fpdf_charwidths['courier'];

 $fpdf_charwidths['courierBI']=$fpdf_charwidths['courier'];

statistic/pdftable/lib/pdftable.inc.php

Indentation +4 added lines, -4 removed lines

@@ -397,10 +397,10 @@
 	$f = fopen($path,'r');

 	fseek($f,13,SEEK_SET);

 	$info = fread($f,3);

-    fclose($f);

-    $iUnit = ord($info{0});

-    $iX = ord($info{1}) * 256 + ord($info{2});

-    return array($iUnit, $iX);

+	fclose($f);

+	$iUnit = ord($info{0});

+	$iX = ord($info{1}) * 256 + ord($info{2});

+	return array($iUnit, $iX);

 }

 private function _html2text($text){

 	$text = str_replace(' ',' ',$text);

Braces +383 added lines, -175 removed lines

@@ -65,9 +65,13 @@ 
 }

 

 function SetHeaderFooter($header='',$footer=''){

-	if ($header) $this->headerTable = $header;

-	if ($footer) $this->footerTable = $footer;

-}

+	if ($header) {

+		$this->headerTable = $header;

+	}

+	if ($footer) {

+		$this->footerTable = $footer;

+	}

+	}

 function Header(){

 	$this->_makePageSize();

 	if ($this->headerTable){

@@ -97,7 +101,9 @@ 
  * Tra ve chieu cao cua 1 dong theo font hien hanh

  */

 function getLineHeight($fontSize = 0){

-	if ($fontSize == 0) $fontSize = $this->FontSizePt;

+	if ($fontSize == 0) {

+		$fontSize = $this->FontSizePt;

+	}

 	return $fontSize*2/$this->k;

 }

 

@@ -114,19 +120,26 @@ 
 	foreach ($c['font'] as &$f){

 		$this->_setFontText($f);

 		$hl = $this->getLineHeight();

-		if ($maxline<$hl || $x==$this->paddingCell) $maxline=$hl;

-		if (!isset($f['space'])) continue;

+		if ($maxline<$hl || $x==$this->paddingCell) {

+			$maxline=$hl;

+		}

+		if (!isset($f['space'])) {

+			continue;

+		}

 		$space = $f['space'];

 		foreach ($f['line'] as $i=>&$l){

-			if ($x!=$this->paddingCell) $x+=$space;

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

+			if ($x!=$this->paddingCell) {

+				$x+=$space;

+			}

+			if (isset($l['str'])&&is_array($l['str'])) {

+						foreach ($l['str'] as &$t){

 				if (!is_array($t)) continue;

+			}

 				if ($x==$this->paddingCell||$x+$t[1]<=$maxw){

 					$c['wlinet'][$countline][0] += $t[1];

 					$c['wlinet'][$countline][1]++;

 					$x += $t[1]+(($x>$this->paddingCell)?$space:0);

-				}else{//auto break line

+				} else{//auto break line

 					$h+=$maxline*FHR + $this->spacingLine;

 					$c['hline'][] = $maxline*FHR + $this->spacingLine;

 					$c['wlines'][$countline] = $x-$this->paddingCell;

@@ -158,8 +171,14 @@ 
 	$maxw = $c['w0']-$this->paddingCell2;

 	$curh = $c['maxh'];

 	$x=$y=0; //Top by default

-	if ($c['va']=='M') $y = ($maxh-$curh)/2; //Middle

-	elseif ($c['va']=='B') $y = $maxh-$curh; //Bottom

+	if ($c['va']=='M') {

+		$y = ($maxh-$curh)/2;

+	}

+	//Middle

+	elseif ($c['va']=='B') {

+		$y = $maxh-$curh;

+	}

+	//Bottom

 	$curline = 0;

 	$morespace = 0;

 	$cl = $c['hline'][$curline];

@@ -169,15 +188,21 @@ 
 		if (isset($f['color'])){

 			$color = Color::HEX2RGB($f['color']);

 			$this->SetTextColor($color[0],$color[1],$color[2]);

-		}else unset($color);

+		} else {

+			unset($color);

+		}

 		$hl = $this->getLineHeight();

-		if (!isset($f['space'])) continue;

+		if (!isset($f['space'])) {

+			continue;

+		}

 		$space = $f['space'];

 		foreach ($f['line'] as $i=>&$l){

-			if (isset($l['str'])&&is_array($l['str']))

-			foreach ($l['str'] as &$t){

+			if (isset($l['str'])&&is_array($l['str'])) {

+						foreach ($l['str'] as &$t){

 				if ($t[2]!=$curline){

-					$y += $cl;$curline++;$cl = $c['hline'][$curline];

+					$y += $cl;

+			}

+			$curline++;$cl = $c['hline'][$curline];

 					$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

 				}

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

@@ -190,31 +215,38 @@ 
 				$this->_cellHorzAlignLine($c,$curline,$maxw,$x,$morespace);

 			}

 		}

-		if (isset($color))

-			$this->SetTextColor(0);

+		if (isset($color)) {

+					$this->SetTextColor(0);

+		}

 	}

 }

 private function _cellHorzAlignLine(&$c,$line,$maxw,&$x,&$morespace){

 	$morespace = 0;

 	$x = $this->paddingCell;//Left by default

-	if (!isset($c['wlines'][$line])) return ;

+	if (!isset($c['wlines'][$line])) {

+		return ;

+	}

 	if ($c['a']=='C'){//Center

 		$x = ($maxw-$c['wlines'][$line])/2;

-	}elseif ($c['a']=='R'){

+	} elseif ($c['a']=='R'){

 		$x = $maxw-$c['wlines'][$line];

-	}elseif ($c['a']=='J' && $c['wlinet'][$line][1]>1

+	} elseif ($c['a']=='J' && $c['wlinet'][$line][1]>1

 		&& isset($c['autobr'][$line])){//Justify

 		$morespace = ($maxw-$c['wlines'][$line])/($c['wlinet'][$line][1]-1);

 	}

-	if ($x < $this->paddingCell) $x = $this->paddingCell;

-}

+	if ($x < $this->paddingCell) {

+		$x = $this->paddingCell;

+	}

+	}

 

 private function _calWidth($w){

 	$p = strpos($w,'%');

 	if ($p!==false){

 		return intval(substr($w,0,$p)*$this->width/100);

-	}else return intval($w);

-}

+	} else {

+		return intval($w);

+	}

+	}

 /**

  * @return array

  * @desc Parse a string in html and return array of attribute of table

@@ -229,8 +261,9 @@ 
 	$tdopen = false;

 	foreach ($t->name as $i=>$element){

 		if ($fontopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

-			&& (in_array($element,array('table','tr','td','font'))))

-				$fontopen = false;

+			&& (in_array($element,array('table','tr','td','font')))) {

+						$fontopen = false;

+		}

 		if ($tdopen && $t->type[$i]==NODE_TYPE_ENDELEMENT

 			&& (in_array($element,array('table','tr','td')))

 			&& !isset($cell[$row][$col]['miw'])){

@@ -238,16 +271,26 @@ 
 				$c['miw'] = $c['maw'] = 0;

 				$tdopen = false;

 		}

-		if ($t->type[$i] != NODE_TYPE_ELEMENT && $t->type[$i] != NODE_TYPE_TEXT) continue;

+		if ($t->type[$i] != NODE_TYPE_ELEMENT && $t->type[$i] != NODE_TYPE_TEXT) {

+			continue;

+		}

 		switch ($element){

 			case 'table':

 				$tdopen = 0;

 				$a	= &$t->attribute[$i];

-				if (isset($a['width']))		$table['w']	= $this->_calWidth($a['width']);

-				if (isset($a['height']))	$table['h']	= intval($a['height']);

-				if (isset($a['align']))		$table['a']	= $this->getAlign(strtolower($a['align']));

+				if (isset($a['width'])) {

+					$table['w']	= $this->_calWidth($a['width']);

+				}

+				if (isset($a['height'])) {

+					$table['h']	= intval($a['height']);

+				}

+				if (isset($a['align'])) {

+					$table['a']	= $this->getAlign(strtolower($a['align']));

+				}

 				$table['border'] = (isset($a['border']))?	$a['border']: 0;

-				if (isset($a['bgcolor']))	$table['bgcolor'][-1]	= $a['bgcolor'];

+				if (isset($a['bgcolor'])) {

+					$table['bgcolor'][-1]	= $a['bgcolor'];

+				}

 				$table['nobreak'] = isset($a['nobreak']);

 				break;

 			case 'tr':

@@ -256,52 +299,94 @@ 
 				$table['nr']++;

 				$col = -1;

 				$a	= &$t->attribute[$i];

-				if (isset($a['bgcolor']))	$table['bgcolor'][$row]	= $a['bgcolor'];

-				if (isset($a['repeat']))	$table['repeat'][]		= $row;

-				else{

-					if (isset($a['pbr']))	$table['pbr'][$row]	= 1;

-					if (isset($a['knext']))	$table['knext'][$row]	= 1;

+				if (isset($a['bgcolor'])) {

+					$table['bgcolor'][$row]	= $a['bgcolor'];

+				}

+				if (isset($a['repeat'])) {

+					$table['repeat'][]		= $row;

+				} else{

+					if (isset($a['pbr'])) {

+						$table['pbr'][$row]	= 1;

+					}

+					if (isset($a['knext'])) {

+						$table['knext'][$row]	= 1;

+					}

 				}

 				break;

 			case 'td':

 				$tdopen = 1;

-				$col++;while (isset($cell[$row][$col])) $col++;

+				$col++;while (isset($cell[$row][$col])) {

+					$col++;

+				}

 				//Update number column

-				if ($table['nc'] < $col+1)		$table['nc']		= $col+1;

+				if ($table['nc'] < $col+1) {

+					$table['nc']		= $col+1;

+				}

 				$cell[$row][$col] = array();

 				$c = &$cell[$row][$col];

 				$a	= &$t->attribute[$i];

-				if (isset($a['width']))		$c['w']		= intval($a['width']);

-				if (isset($a['height']))	$c['h']		= intval($a['height']);

+				if (isset($a['width'])) {

+					$c['w']		= intval($a['width']);

+				}

+				if (isset($a['height'])) {

+					$c['h']		= intval($a['height']);

+				}

 				$c['a'] = isset($a['align'])?$this->getAlign($a['align']):'L';

 				$c['va']= isset($a['valign'])?$this->getVAlign($a['valign']):'T';

-				if (isset($a['border']))	$c['border']	= $a['border'];

-					else					$c['border']	= $table['border'];

-				if (isset($a['bgcolor']))	$c['bgcolor']	= $a['bgcolor'];

+				if (isset($a['border'])) {

+					$c['border']	= $a['border'];

+				} else {

+						$c['border']	= $table['border'];

+					}

+				if (isset($a['bgcolor'])) {

+					$c['bgcolor']	= $a['bgcolor'];

+				}

 				$cs = $rs = 1;

-				if (isset($a['colspan']) && $a['colspan']>1)	$cs = $c['colspan']	= intval($a['colspan']);

-				if (isset($a['rowspan']) && $a['rowspan']>1)	$rs = $c['rowspan']	= intval($a['rowspan']);

-				if (isset($a['size']))		$c['font'][0]['size']   	= $a['size'];

-				if (isset($a['family']))	$c['font'][0]['family'] 	= $a['family'];

+				if (isset($a['colspan']) && $a['colspan']>1) {

+					$cs = $c['colspan']	= intval($a['colspan']);

+				}

+				if (isset($a['rowspan']) && $a['rowspan']>1) {

+					$rs = $c['rowspan']	= intval($a['rowspan']);

+				}

+				if (isset($a['size'])) {

+					$c['font'][0]['size']   	= $a['size'];

+				}

+				if (isset($a['family'])) {

+					$c['font'][0]['family'] 	= $a['family'];

+				}

 				if (isset($a['style'])){

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach($STYLE AS $style) {

+						$fontStyle .= substr(trim($style), 0, 1);

+					}

 					$c['font'][0]['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$c['font'][0]['color'] 		= $a['color'];

+				if (isset($a['color'])) {

+					$c['font'][0]['color'] 		= $a['color'];

+				}

 				//Chiem dung vi tri de danh cho cell span

-				for ($k=$row;$k<$row+$rs;$k++) for($l=$col;$l<$col+$cs;$l++){

-					if ($k-$row || $l-$col)

-						$cell[$k][$l] = 0;

+				for ($k=$row;$k<$row+$rs;$k++) {

+					for($l=$col;

+				}

+				$l<$col+$cs;$l++){

+					if ($k-$row || $l-$col) {

+											$cell[$k][$l] = 0;

+					}

+				}

+				if (isset($a['nowrap'])) {

+					$c['nowrap']= 1;

 				}

-				if (isset($a['nowrap']))	$c['nowrap']= 1;

 				$fontopen = true;

-				if (!isset($c['font'])) $c['font'][] = array();

+				if (!isset($c['font'])) {

+					$c['font'][] = array();

+				}

 				break;

 			case 'Text':

 				$c = &$cell[$row][$col];

-				if (!$fontopen || !isset($c['font'])) $c['font'][] = array();

+				if (!$fontopen || !isset($c['font'])) {

+					$c['font'][] = array();

+				}

 				$f = &$c['font'][count($c['font'])-1];

 				$this->_setTextAndSize($c,$f,$this->_html2text($t->value[$i]));

 				break;

@@ -310,15 +395,23 @@ 
 				$c = &$cell[$row][$col];

 				$c['font'][] = array();

 				$f = &$c['font'][count($c['font'])-1];

-				if (isset($a['size']))		$f['size']   	= $a['size'];

-				if (isset($a['family']))	$f['family'] 	= $a['family'];

+				if (isset($a['size'])) {

+					$f['size']   	= $a['size'];

+				}

+				if (isset($a['family'])) {

+					$f['family'] 	= $a['family'];

+				}

 				if (isset($a['style'])){

 					$STYLE     = explode(",", strtoupper($a['style']));

 					$fontStyle = '';

-					foreach($STYLE AS $style)  $fontStyle .= substr(trim($style), 0, 1);

+					foreach($STYLE AS $style) {

+						$fontStyle .= substr(trim($style), 0, 1);

+					}

 					$f['style'] = $fontStyle;

 				}

-				if (isset($a['color']))		$f['color'] 		= $a['color'];

+				if (isset($a['color'])) {

+					$f['color'] 		= $a['color'];

+				}

 				break;

 			case 'img':

 				$a	= &$t->attribute[$i];

@@ -340,7 +433,9 @@ 
 }

 

 private function _setTextAndSize(&$cell,&$f, $text){

-	if ($text=='') return;

+	if ($text=='') {

+		return;

+	}

 	$this->_setFontText($f);

 	if (!isset($f['line'][0])){

 		$f['line'][0]['min'] = $f['line'][0]['max'] = 0;

@@ -351,49 +446,69 @@ 
 		$f['line'][] = array('min'=>0,'max'=>0,'str'=>array());

 		$l = &$f['line'][count($f['line'])-1];

 	}

-	if (!isset($f['space'])) $f['space'] = $this->GetStringWidth(' ');

+	if (!isset($f['space'])) {

+		$f['space'] = $this->GetStringWidth(' ');

+	}

 	$ct = count($text);

 	foreach ($text as $item){

 		$s = $this->GetStringWidth($item);

-		if ($l['min']<$s) $l['min']=$s;

+		if ($l['min']<$s) {

+			$l['min']=$s;

+		}

 		$l['max'] += $s;

-		if ($ct>1) $l['max'] += $f['space'];

+		if ($ct>1) {

+			$l['max'] += $f['space'];

+		}

 		$l['str'][] =  array($item,$s);

 	}

-	if (isset($cell['nowrap'])) $l['min'] = $l['max'];

-	if (!isset($cell['miw']) || $cell['miw']-$this->paddingCell2<$l['min'])

-		$cell['miw']=$l['min']+$this->paddingCell2;

-	if (!isset($cell['maw']) || $cell['maw']-$this->paddingCell2<$l['max'])

-		$cell['maw']=$l['max']+$this->paddingCell2;

-}

+	if (isset($cell['nowrap'])) {

+		$l['min'] = $l['max'];

+	}

+	if (!isset($cell['miw']) || $cell['miw']-$this->paddingCell2<$l['min']) {

+			$cell['miw']=$l['min']+$this->paddingCell2;

+	}

+	if (!isset($cell['maw']) || $cell['maw']-$this->paddingCell2<$l['max']) {

+			$cell['maw']=$l['max']+$this->paddingCell2;

+	}

+	}

 

 private function _setImage(&$c, &$a){

 	$path = $a['src'];

 	if (!is_file($path)){

 		$this->Error('Image is not exists: '.$path);

-	}else{

+	} else{

 		list($u,$d) = $this->_getResolution($path);

 		$c['img'] = $path;

 		list($c['w'],$c['h'],) = getimagesize($path);

-		if (isset($a['width'])) $c['w'] = $a['width'];

-		if (isset($a['height'])) $c['h'] = $a['height'];

+		if (isset($a['width'])) {

+			$c['w'] = $a['width'];

+		}

+		if (isset($a['height'])) {

+			$c['h'] = $a['height'];

+		}

 		$scale = 1;

-		if ($u==1) $scale = 25.4/$d;

-		elseif ($u==2) $scale = 10/$d;

+		if ($u==1) {

+			$scale = 25.4/$d;

+		} elseif ($u==2) {

+			$scale = 10/$d;

+		}

 		$c['w'] = intval($c['w']*$scale);

 		$c['h'] = intval($c['h']*$scale);

 	}

 }

 private function _getResolution($path){

 	$pos=strrpos($path,'.');

-	if(!$pos)

-		$this->Error('Image file has no extension and no type was specified: '.$path);

+	if(!$pos) {

+			$this->Error('Image file has no extension and no type was specified: '.$path);

+	}

 	$type=substr($path,$pos+1);

 	$type=strtolower($type);

-	if($type=='jpeg')

-		$type='jpg';

-	if ($type!='jpg')

-		$this->Error('Unsupported image type: '.$path);

+	if($type=='jpeg') {

+			$type='jpg';

+	}

+	if ($type!='jpg') {

+			$this->Error('Unsupported image type: '.$path);

+	}

 	$f = fopen($path,'r');

 	fseek($f,13,SEEK_SET);

 	$info = fread($f,3);

@@ -429,19 +544,35 @@ 
 		for ($i=0;$i<$nr;$i++){

 			if (isset($cs[$i][$j]['miw'])){

 				$c   = &$cs[$i][$j];

-				if (isset($c['nowrap'])) $c['miw'] = $c['maw'];

+				if (isset($c['nowrap'])) {

+					$c['miw'] = $c['maw'];

+				}

 				if (isset($c['w'])){

-					if ($c['miw']<$c['w']) $c['miw'] = $c['w'];

-					elseif ($c['miw']>$c['w']) $c['w'] = $c['miw']+$this->paddingCell2;

-					if (!isset($wc['w'])) $wc['w'] = 1;

+					if ($c['miw']<$c['w']) {

+						$c['miw'] = $c['w'];

+					} elseif ($c['miw']>$c['w']) {

+						$c['w'] = $c['miw']+$this->paddingCell2;

+					}

+					if (!isset($wc['w'])) {

+						$wc['w'] = 1;

+					}

+				}

+				if ($c['maw']<$c['miw']) {

+					$c['maw'] = $c['miw'];

 				}

-				if ($c['maw']<$c['miw']) $c['maw'] = $c['miw'];

 				if (!isset($c['colspan'])){

-					if ($wc['miw'] < $c['miw']) $wc['miw']=$c['miw'];

-					if ($wc['maw'] < $c['maw']) $wc['maw']=$c['maw'];

-					if (isset($wc['w']) && $wc['w'] < $wc['miw'])

-						$wc['w']=$wc['miw'];

-				}else $listspan[] = array($i,$j);

+					if ($wc['miw'] < $c['miw']) {

+						$wc['miw']=$c['miw'];

+					}

+					if ($wc['maw'] < $c['maw']) {

+						$wc['maw']=$c['maw'];

+					}

+					if (isset($wc['w']) && $wc['w'] < $wc['miw']) {

+											$wc['w']=$wc['miw'];

+					}

+				} else {

+					$listspan[] = array($i,$j);

+				}

 			}

 		}

 	}

@@ -451,7 +582,9 @@ 
 		list($i,$j) = $span;

 		$c = &$cs[$i][$j];

 		$lc = $j + $c['colspan'];

-		if ($lc > $nc) $lc = $nc;

+		if ($lc > $nc) {

+			$lc = $nc;

+		}

 

 		$wis = $wisa = 0;

 		$was = $wasa = 0;

@@ -467,28 +600,36 @@ 
 		}

 		if ($c['miw'] > $wis){

 			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['miw'] = $c['miw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+				for($k=$j;$k<$lc;$k++) {

+					$wc[$k]['miw'] = $c['miw']/$c['colspan'];

+				}

+			} elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['miw'] - $wis;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for($k=$j;$k<$lc;$k++) {

+									$wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi;

+				}

+			} else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['miw'] - $wis;

-				foreach ($list as $_z2=>$k)

-					$wc[$k]['miw'] += ($wc[$k]['miw']/$wisa)*$wi;

+				foreach ($list as $_z2=>$k) {

+									$wc[$k]['miw'] += ($wc[$k]['miw']/$wisa)*$wi;

+				}

 			}

 		}

 		if ($c['maw'] > $was){

 			if (!$wis){//Cac cot chua co kich thuoc => chia deu

-				for($k=$j;$k<$lc;$k++) $wc[$k]['maw'] = $c['maw']/$c['colspan'];

-			}elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

+				for($k=$j;$k<$lc;$k++) {

+					$wc[$k]['maw'] = $c['maw']/$c['colspan'];

+				}

+			} elseif (!count($list)){//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = $c['maw'] - $was;

-				for($k=$j;$k<$lc;$k++)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi;

-			}else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

+				for($k=$j;$k<$lc;$k++) {

+									$wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi;

+				}

+			} else{//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = $c['maw'] - $was;

-				foreach ($list as $_z2=>$k)

-					$wc[$k]['maw'] += ($wc[$k]['maw']/$wasa)*$wi;

+				foreach ($list as $_z2=>$k) {

+									$wc[$k]['maw'] += ($wc[$k]['maw']/$wasa)*$wi;

+				}

 			}

 		}

 	}

@@ -504,7 +645,9 @@ 
 	for ($i=0;$i<$nc;$i++){

 		$a += isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

 	}

-	if ($a > $this->width) $table['w'] = $this->width;

+	if ($a > $this->width) {

+		$table['w'] = $this->width;

+	}

 

 	if (isset($table['w'])){

 		$wis = $wisa = 0;

@@ -517,13 +660,15 @@ 
 			if (!count($list)){

 				//Khong co cot nao co kich thuoc auto => chia deu phan du cho tat ca

 				$wi = ($table['w'] - $wis)/$nc;

-				for($k=0;$k<$nc;$k++)

-					$wc[$k]['miw'] += $wi;

-			}else{

+				for($k=0;$k<$nc;$k++) {

+									$wc[$k]['miw'] += $wi;

+				}

+			} else{

 				//Co mot so cot co kich thuoc auto => chia deu phan du cho cac cot auto

 				$wi = ($table['w'] - $wis)/count($list);

-				foreach ($list as $k)

-					$wc[$k]['miw'] += $wi;

+				foreach ($list as $k) {

+									$wc[$k]['miw'] += $wi;

+				}

 			}

 		}

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

@@ -531,7 +676,7 @@ 
 			unset($wc[$i]);

 			$wc[$i] = $a;

 		}

-	}else{

+	} else{

 		$table['w'] = $a;

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

 			$a = isset($wc[$i]['w']) ? $wc[$i]['miw'] : $wc[$i]['maw'];

@@ -557,10 +702,15 @@ 
 				$ch = $this->_cellHeight($c);

 				$c['ch'] = $ch;

 

-				if (isset($c['h']) && $c['h'] > $ch) $ch = $c['h'];

+				if (isset($c['h']) && $c['h'] > $ch) {

+					$ch = $c['h'];

+				}

 

-				if (isset($c['rowspan'])) $listspan[] = array($i,$j);

-				elseif ($hr < $ch) $hr = $ch;

+				if (isset($c['rowspan'])) {

+					$listspan[] = array($i,$j);

+				} elseif ($hr < $ch) {

+					$hr = $ch;

+				}

 				$c['mih'] = $ch;

 			}

 		}

@@ -570,7 +720,9 @@ 
 		list($i,$j) = $span;

 		$c = &$cs[$i][$j];

 		$lr = $i + $c['rowspan'];

-		if ($lr > $nr) $lr = $nr;

+		if ($lr > $nr) {

+			$lr = $nr;

+		}

 		$hs = $hsa = 0;

 		$list = array();

 		for($k=$i;$k<$lr;$k++){

@@ -582,26 +734,36 @@ 
 		}

 		if ($c['mih'] > $hs){

 			if (!$hs){//Cac dong chua co kich thuoc => chia deu

-				for($k=$i;$k<$lr;$k++) $hr[$k] = $c['mih']/$c['rowspan'];

-			}elseif (!count($list)){

+				for($k=$i;$k<$lr;$k++) {

+					$hr[$k] = $c['mih']/$c['rowspan'];

+				}

+			} elseif (!count($list)){

 				//Khong co dong nao co kich thuoc auto => chia deu phan du cho tat ca

 				$hi = $c['mih'] - $hs;

-				for($k=$i;$k<$lr;$k++)

-					$hr[$k] += ($hr[$k]/$hs)*$hi;

-			}else{

+				for($k=$i;$k<$lr;$k++) {

+									$hr[$k] += ($hr[$k]/$hs)*$hi;

+				}

+			} else{

 				//Co mot so dong co kich thuoc auto => chia deu phan du cho cac dong auto

 				$hi = $c['mih'] - $hsa;

-				foreach ($list as $k)

-					$hr[$k] += ($hr[$k]/$hsa)*$hi;

+				foreach ($list as $k) {

+									$hr[$k] += ($hr[$k]/$hsa)*$hi;

+				}

 			}

 		}

 	}

 	$table['repeatH'] = 0;

 	if (count($table['repeat'])){

-		foreach ($table['repeat'] as $i) $table['repeatH'] += $hr[$i];

-	}else $table['repeat'] = 0;

+		foreach ($table['repeat'] as $i) {

+			$table['repeatH'] += $hr[$i];

+		}

+	} else {

+		$table['repeat'] = 0;

+	}

 	$tth = 0;

-	foreach ($hr as $v) $tth+=$v;

+	foreach ($hr as $v) {

+		$tth+=$v;

+	}

 	$table['tth'] = $tth;

 }

 

@@ -611,14 +773,19 @@ 
 private function _tableGetWCell(&$table, $i,$j){

 	$c = &$table['cells'][$i][$j];

 	if ($c){

-		if (isset($c['x0'])) return array($c['x0'], $c['w0']);

+		if (isset($c['x0'])) {

+			return array($c['x0'], $c['w0']);

+		}

 		$x = 0;

 		$wc = &$table['wc'];

-		for ($k=0;$k<$j;$k++) $x += $wc[$k];

+		for ($k=0;$k<$j;$k++) {

+			$x += $wc[$k];

+		}

 		$w = $wc[$j];

 		if (isset($c['colspan'])){

-			for ($k=$j+$c['colspan']-1;$k>$j;$k--)

-				$w += @$wc[$k];

+			for ($k=$j+$c['colspan']-1;$k>$j;$k--) {

+							$w += @$wc[$k];

+			}

 		}

 		$c['x0'] = $x;

 		$c['w0'] = $w;

@@ -630,12 +797,15 @@ 
 private function _tableGetHCell(&$table, $i,$j){

 	$c = &$table['cells'][$i][$j];

 	if ($c){

-		if (isset($c['h0'])) return $c['h0'];

+		if (isset($c['h0'])) {

+			return $c['h0'];

+		}

 		$hr = &$table['hr'];

 		$h = $hr[$i];

 		if (isset($c['rowspan'])){

-			for ($k=$i+$c['rowspan']-1;$k>$i;$k--)

-				$h += $hr[$k];

+			for ($k=$i+$c['rowspan']-1;$k>$i;$k--) {

+							$h += $hr[$k];

+			}

 		}

 		$c['h0'] = $h;

 		return $h;

@@ -647,14 +817,21 @@ 
 	if (strlen($type)==4)

 	{

 		$x2 = $x + $w; $y2 = $y + $h;

-		if (intval($type{0})) $this->Line($x , $y , $x2, $y );

-		if (intval($type{1})) $this->Line($x2, $y , $x2, $y2);

-		if (intval($type{2})) $this->Line($x , $y2, $x2, $y2);

-		if (intval($type{3})) $this->Line($x , $y , $x , $y2);

-	}

-	elseif ((int)$type===1)

-		$this->Rect($x, $y, $w, $h);

-	elseif ((int)$type>1 && (int)$type<11)

+		if (intval($type{0})) {

+			$this->Line($x , $y , $x2, $y );

+		}

+		if (intval($type{1})) {

+			$this->Line($x2, $y , $x2, $y2);

+		}

+		if (intval($type{2})) {

+			$this->Line($x , $y2, $x2, $y2);

+		}

+		if (intval($type{3})) {

+			$this->Line($x , $y , $x , $y2);

+		}

+	} elseif ((int)$type===1) {

+			$this->Rect($x, $y, $w, $h);

+	} elseif ((int)$type>1 && (int)$type<11)

 	{

 		$width = $this->LineWidth;

 		$this->SetLineWidth($type * $this->LineWidth);

@@ -676,7 +853,9 @@ 
 	$maxh = 0;

 	for ($j=0;$j<$table['nc'];$j++){

 		$h = $this->_tableGetHCell($table, $i, $j);

-		if ($maxh < $h) $maxh = $h;

+		if ($maxh < $h) {

+			$maxh = $h;

+		}

 	}

 	return $maxh;

 }

@@ -697,19 +876,25 @@ 
 	if ($table['multipage']){

 		$newpage = 0;

 		if ($table['lasty']+$maxh>$this->bottom){

-			if ($this->_checkLimitHeight($table, $maxh)) return;

+			if ($this->_checkLimitHeight($table, $maxh)) {

+				return;

+			}

 			$newpage = 1;

-		}elseif (isset($table['pbr'][$i])){

+		} elseif (isset($table['pbr'][$i])){

 			$newpage = 1;

 			unset($table['pbr'][$i]);

-		}elseif (isset($table['knext'][$i])&&$i<$table['nr']-1){

+		} elseif (isset($table['knext'][$i])&&$i<$table['nr']-1){

 			$mrowh = $maxh;

 			for($j=$i+1;$j<$table['nr'];$j++){

 				$mrowh += $this->_getRowHeight($table, $j);

-				if (!isset($table['knext'][$j])) break;

+				if (!isset($table['knext'][$j])) {

+					break;

+				}

 				unset($table['knext'][$j]);

 			}

-			if ($this->_checkLimitHeight($table, $mrowh)) return;

+			if ($this->_checkLimitHeight($table, $mrowh)) {

+				return;

+			}

 			$newpage = $table['lasty']+$mrowh>$this->bottom;

 		}

 		if ($newpage){

@@ -719,7 +904,9 @@ 
 			$table['lasty'] = $this->y;

 			if ($table['repeat']){

 				foreach ($table['repeat'] as $r){

-					if ($r==$i) continue;

+					if ($r==$i) {

+						continue;

+					}

 					$this->_tableWriteRow($table,$r,$x0);

 				}

 			}

@@ -745,14 +932,15 @@ 
 			//Content

 			if (isset($c['img'])){

 				$this->Image($c['img'],$x,$y,$c['w'],$c['h']);

-			}else{

+			} else{

 				$this->_drawCellAligned($x,$y,$c);

 			}

 			//Border

 			if (isset($c['border'])){

 				$table['listborder'][] = array($x,$y,$w,$h,$c['border']);

-			}elseif (isset($table['border']) && $table['border'])

-				$table['listborder'][] = array($x,$y,$w,$h,$table['border']);

+			} elseif (isset($table['border']) && $table['border']) {

+							$table['listborder'][] = array($x,$y,$w,$h,$table['border']);

+			}

 		}

 	}

 	$table['lasty'] += $table['hr'][$i];

@@ -770,13 +958,19 @@ 
 private function _setFontText(&$f){

 	if (isset($f['size']) && ($f['size'] >0)){

 		$fontSize   = $f['size'];

-	}else $fontSize   = $this->defaultFontSize;

+	} else {

+		$fontSize   = $this->defaultFontSize;

+	}

 	if (isset($f['family'])){

 		$fontFamily = $f['family'];

-	}else $fontFamily = $this->defaultFontFamily;

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

-		$fontStyle  = $f['style'];

-	else $fontStyle = $this->defaultFontStyle;

+	} else {

+		$fontFamily = $this->defaultFontFamily;

+	}

+	if (isset($f['style'])) {

+			$fontStyle  = $f['style'];

+	} else {

+		$fontStyle = $this->defaultFontStyle;

+	}

 	$this->SetFont($fontFamily, $fontStyle, $fontSize);

 	return $fontSize;

 }

@@ -784,14 +978,18 @@ 
 	if ($this->CurOrientation == 'P' && $table['w']>$this->width+5){

 		$this->AddPage('L');

 	}

-	if ($this->x==null)$this->x = $this->lMargin;

-	if ($this->y==null)$this->y = $this->tMargin;

+	if ($this->x==null) {

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

+	}

+	if ($this->y==null) {

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

+	}

 	$x0 = $this->x;

 	$y0 = $this->y;

 	if (isset($table['a'])){

 		if ($table['a']=='C'){

 			$x0 += (($this->right-$x0) - $table['w'])/2;

-		}elseif ($table['a']=='R'){

+		} elseif ($table['a']=='R'){

 			$x0 = $this->right - $table['w'];

 		}

 	}

@@ -799,11 +997,14 @@ 
 		&& $table['tth']+$y0>$this->bottom && $table['multipage']){

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

 		$table['lasty'] = $this->y;

-	}else

-		$table['lasty'] = $y0;

+	} else {

+			$table['lasty'] = $y0;

+	}

 	

 	$table['listborder'] = array();

-	for ($i=0;$i<$table['nr'];$i++) $this->_tableWriteRow($table, $i, $x0);

+	for ($i=0;$i<$table['nr'];$i++) {

+		$this->_tableWriteRow($table, $i, $x0);

+	}

 	$this->_tableDrawBorder($table);

 	$this->x = $x0;

 }

@@ -817,7 +1018,9 @@ 
 	$x = $this->x;

 	foreach ($HTML as $i=>$table){	

 		$this->x = $x;

-		if (strlen($table)<6) continue;

+		if (strlen($table)<6) {

+			continue;

+		}

 		$table = '<table' . $table;

 		$table = $this->_tableParser($table);

 		$table['multipage'] = $multipage;

@@ -832,16 +1035,21 @@ 
 function _putinfo(){

 	$this->_out('/Producer '.$this->_textstring('PDFTable '.

 		PDFTABLE_VERSION.' based on 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')));

 }

 private function getAlign($v){