iNextrix / ASTPP

web_interface/astpp/application/modules/invoices/views/view_invoice_edit_manually.php

Spacing +2 added lines, -2 removed lines

@@ -158,13 +158,13 @@
 	        </tr>
 	<tr>
 		<td>
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
 		 </td>
 	</tr>
 	<tr>
 		<td>
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
+				echo date('Y-m-d', strtotime($payment_due_date));
 		?></span>
 		 </td>
 	</tr>

web_interface/astpp/application/modules/invoices/views/view_invoice_payment.php

Spacing +23 added lines, -23 removed lines

@@ -100,13 +100,13 @@ 
 	        </tr>
 	<tr>
 		<td>
-		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)) ; ?></span>
+		 		<b>From Date : </b><span style="color:#a09d9d;"> <?php echo date('Y-m-d', strtotime($from_date)); ?></span>
 		 </td>
 	</tr>
 	<tr>
 		<td>
  		<b>Due Date : </b><span style="color:#a09d9d;"><?php 
-				echo date('Y-m-d', strtotime($payment_due_date)) ;
+				echo date('Y-m-d', strtotime($payment_due_date));
 		?></span>
 		 </td>
 	</tr>
@@ -140,24 +140,24 @@ 
 	   </th>
 	 </tr> 
 	 <?php
-$paypal=0;
- foreach($invoice_final_query as $value){
+$paypal = 0;
+ foreach ($invoice_final_query as $value) {
  
-	if($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT')    {
-	   $debit=$value['debit'];
-	   $credit=$value['credit'];
-	   $paypal+=$credit;
-	   $created_date=$value['created_date'];
-	   $paypalid=$value['item_id'];
-	   $outstanding=$amount-$paypal;
-	   $amount_visible='0000';
+	if ($value['item_type'] != 'INVPAY' && $value['item_type'] != 'PAYMENT') {
+	   $debit = $value['debit'];
+	   $credit = $value['credit'];
+	   $paypal += $credit;
+	   $created_date = $value['created_date'];
+	   $paypalid = $value['item_id'];
+	   $outstanding = $amount - $paypal;
+	   $amount_visible = '0000';
       
       
      
 ?>	
  	 <tr style="height:20px;">
 			 <td><?php echo $value['description']; ?>  </td>
-			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency;  ?></div></td>
+			 <td><div class="pull-right"><?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?> <?php  echo $to_currency; ?></div></td>
 			 <input type="hidden" name="new_amount" value="<?php echo $this->common->currency_decimal($this->common_model->calculate_currency($debit)); ?>">
 			 
 			
@@ -196,18 +196,18 @@ 
 			
 	 </tr> 
 	 <?php
-$paypal=0;
-if($invoice_date){
- foreach($invoice_total_query as $value){
+$paypal = 0;
+if ($invoice_date) {
+ foreach ($invoice_total_query as $value) {
  
      
-	   $debit=$value['debit'];
-	   $credit=$value['credit'];
-	   $paypal+=$credit;
-	   $created_date=$value['created_date'];
-	   $paypalid=$value['item_id'];
-	   $outstanding=$amount-$paypal;
-	   $amount_visible='0000';
+	   $debit = $value['debit'];
+	   $credit = $value['credit'];
+	   $paypal += $credit;
+	   $created_date = $value['created_date'];
+	   $paypalid = $value['item_id'];
+	   $outstanding = $amount - $paypal;
+	   $amount_visible = '0000';
       
       
      

web_interface/astpp/cron/cron.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 		unset($argv[1]);
 //        $argv = array_merge($argv, $config["argv"][$path]);
 		$argv[0] = $argv[0];
-		$argv[1] =$config["argv"][$path];
+		$argv[1] = $config["argv"][$path];
 		$_SERVER['argv'] = $argv;
 	} else
 		die('Use: php cron.php controller/method');
@@ -41,11 +41,11 @@ 
 ob_start();
 
 // 	chdir( dirname( CRON_CI_INDEX ) );
-require( CRON_CI_INDEX );           // main CI index.php file
+require(CRON_CI_INDEX); // main CI index.php file
 $output = ob_get_contents();
 
 if (CRON_FLUSH_BUFFERS === TRUE)
-	while (@ob_end_flush());          // display buffer contents
+	while (@ob_end_flush()); // display buffer contents
 		else
 	ob_end_clean();
 

web_interface/astpp/index.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
  * as this file.
  *
  */
-	   $assets_path='assets';
+	   $assets_path = 'assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME

web_interface/astpp/system/core/URI.php

Spacing +2 added lines, -2 removed lines

@@ -162,9 +162,9 @@
 		$str = remove_invisible_characters($str, FALSE);
 //================ITPL=======================
   $pos = strpos($str, "_json");
- if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
+ if ($pos > 0 && ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
 	   $this->uri_string = str_replace('_json', '', trim($str, '/'));
- }else{
+ } else {
 		// If the URI contains only a slash we'll kill it
 		$this->uri_string = ($str == '/') ? '' : $str;
 }

web_interface/astpp/system/core/Common.php

Spacing +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
 				}
 			}
 		}
-		$_config[0] =& $config;
+		$_config[0] = & $config;
 				return $_config[0];
 
 	}

web_interface/astpp/system/libraries/Form_validation.php

Spacing +41 added lines, -41 removed lines

@@ -640,13 +640,13 @@ 
 					// Users can use any native PHP function call that has one param.
 					if (function_exists($rule))
 					{
-					  $str=null;
-					  if(is_array($postdata)){
-						foreach($postdata as $key=>$value){
-						  $str.=$value.",";
+					  $str = null;
+					  if (is_array($postdata)) {
+						foreach ($postdata as $key=>$value) {
+						  $str .= $value.",";
 						}
-						$str=rtrim($str,',');
-						$postdata=$str;  
+						$str = rtrim($str, ',');
+						$postdata = $str;  
 					  }
 						$result = $rule($postdata);
 
@@ -974,20 +974,20 @@ 
 	 */
 	public function is_unique($str, $field)
 	{
-				$id='';
-		$data =explode('.', $field);
-				$table=$data[0];
-				$field=$data[1];
-				if(isset($data[2]))
-				$id=$data[2];
-				$where=array($field => $str);
-				if($id != ''){
-				 $where['id !=']=$id;
+				$id = '';
+		$data = explode('.', $field);
+				$table = $data[0];
+				$field = $data[1];
+				if (isset($data[2]))
+				$id = $data[2];
+				$where = array($field => $str);
+				if ($id != '') {
+				 $where['id !='] = $id;
 				}
-				if($table == 'accounts'){
-		  $where['deleted']=0;
+				if ($table == 'accounts') {
+		  $where['deleted'] = 0;
 				}
-				$query = $this->CI->db->limit(1)->get_where($table,$where );
+				$query = $this->CI->db->limit(1)->get_where($table, $where);
 		return $query->num_rows() > 0 ? FALSE : TRUE;
 		 }
 
@@ -1421,54 +1421,54 @@ 
 	{
 			return ( ! preg_match("/^([.a-z0-9])+$/i", $str)) ? FALSE : TRUE;
 	}
-	public function valid_decimal($str){
-			return (bool) preg_match('#^\d+(?:\.\d{1,5})?$#', $str);
+	public function valid_decimal($str) {
+			return (bool)preg_match('#^\d+(?:\.\d{1,5})?$#', $str);
 		}
 		public function alpha_numeric_space($str)
 	{
 		return ( ! preg_match("/^[A-Za-z0-9\s]+$/", $str)) ? FALSE : TRUE;
 	}
-		public function alpha_space($str){
+		public function alpha_space($str) {
 		return ( ! preg_match("/^[A-Za-z\s]+$/", $str)) ? FALSE : TRUE;
 //                return ( ! preg_match("/^([-a-z0-9_-\s])+$/i", $str)) ? FALSE : TRUE;
 	}
-		public function currency_decimal($str){
-			return (bool) preg_match('#^\d{0,5}+(?:\.\d{1,5})?$#', $str);
+		public function currency_decimal($str) {
+			return (bool)preg_match('#^\d{0,5}+(?:\.\d{1,5})?$#', $str);
 //            test(num)
 		}
 		/* ASTPP  3.0 
          * For Old Password checking
          */
-		public function password_check($str,$table){
+		public function password_check($str, $table) {
 		  $this->CI->db->select('password');
-		  $this->CI->db->where('id',$_POST['id']);
-		  $result=$this->CI->db->get($table);
-		  if($result->num_rows() > 0 ){
-			  $result=(array)$result->first_row();
-			  $password=$this->CI->common->decode($result['password']);
-			  if($password && $password == $str){
+		  $this->CI->db->where('id', $_POST['id']);
+		  $result = $this->CI->db->get($table);
+		  if ($result->num_rows() > 0) {
+			  $result = (array)$result->first_row();
+			  $password = $this->CI->common->decode($result['password']);
+			  if ($password && $password == $str) {
 				  return true;
-			  }else{
+			  } else {
 				  return false;
 			  }
-		  }else{
+		  } else {
 			  return false;
 		  }
 		}
-		public function did_account_checking($str){
-		  $post_array=$this->CI->input->post();
-		  if($str > 0){
-		  $this->CI->db->where("id",$str);
+		public function did_account_checking($str) {
+		  $post_array = $this->CI->input->post();
+		  if ($str > 0) {
+		  $this->CI->db->where("id", $str);
 		  $this->CI->db->select('posttoexternal,balance,credit_limit');
-		  $acc_result=$this->CI->db->get('accounts');
-		  $customer_info=(array)$acc_result->first_row();
+		  $acc_result = $this->CI->db->get('accounts');
+		  $customer_info = (array)$acc_result->first_row();
 		  $available_bal = ($customer_info["balance"]) + $customer_info["posttoexternal"] * ($customer_info["credit_limit"]);
-		  if($available_bal >= $post_array['setup']){
+		  if ($available_bal >= $post_array['setup']) {
 		   return TRUE;
-		  }else{
+		  } else {
 		   return FALSE;
 		  }
-		  }else{
+		  } else {
 		   return TRUE;
 		  }
 		}

web_interface/astpp/system/libraries/Fpdf.php

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';

web_interface/astpp/system/libraries/pdf.php

Spacing +68 added lines, -68 removed lines

@@ -11,25 +11,25 @@ 
   
   
 	$this->page++;
-	if(!isset($this->pages[$this->page])) // solves the problem of overwriting a page if it already exists
+	if ( ! isset($this->pages[$this->page])) // solves the problem of overwriting a page if it already exists
 		$this->pages[$this->page] = '';
-	$this->state  =2;
+	$this->state = 2;
 	$this->x = $this->lMargin;
 	$this->y = $this->tMargin;
 	$this->FontFamily = '';
 	// Check page size and orientation
-	if($orientation=='')
+	if ($orientation == '')
 		$orientation = $this->DefOrientation;
 	else
 		$orientation = strtoupper($orientation[0]);
-	if($size=='')
+	if ($size == '')
 		$size = $this->DefPageSize;
 	else
 		$size = $this->_getpagesize($size);
-	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
+	if ($orientation != $this->CurOrientation || $size[0] != $this->CurPageSize[0] || $size[1] != $this->CurPageSize[1])
 	{
 		// New size or orientation
-		if($orientation=='P')
+		if ($orientation == 'P')
 		{
 			$this->w = $size[0];
 			$this->h = $size[1];
@@ -39,28 +39,28 @@ 
 			$this->w = $size[1];
 			$this->h = $size[0];
 		}
-		$this->wPt = $this->w*$this->k;
-		$this->hPt = $this->h*$this->k;
-		$this->PageBreakTrigger = $this->h-$this->bMargin;
+		$this->wPt = $this->w * $this->k;
+		$this->hPt = $this->h * $this->k;
+		$this->PageBreakTrigger = $this->h - $this->bMargin;
 		$this->CurOrientation = $orientation;
 		$this->CurPageSize = $size;
 	}
-	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
+	if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1])
 		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
 }
 
 function Footer() {
 	// Check if Footer for this page already exists (do the same for Header())
-	if(!isset($this->footerset[$this->page])) {
+	if ( ! isset($this->footerset[$this->page])) {
 		$this->SetY(-15);
 		// Page number
-		$this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C');
+		$this->Cell(0, 10, 'Page '.$this->PageNo().'/{nb}', 0, 0, 'C');
 		// set footerset
 		$this->footerset[$this->page] = true;
 	}
 }
 
-function morepagestable($datas, $lineheight=8) {
+function morepagestable($datas, $lineheight = 8) {
 	// some things to set and 'remember'
 	$l = $this->lMargin;
 	$startheight = $h = $this->GetY();
@@ -68,32 +68,32 @@ 
 
 	// calculate the whole width
 	$fullwidth = 0;
-	foreach($this->tablewidths AS $width) {
+	foreach ($this->tablewidths AS $width) {
 		$fullwidth += $width;
 	}
 
 	// Now let's start to write the table
-	foreach($datas AS $row => $data) {
+	foreach ($datas AS $row => $data) {
 		$this->page = $currpage;
 		// write the horizontal borders
 	 
 		// write the content and remember the height of the highest col
-		foreach($data AS $col => $txt) {
+		foreach ($data AS $col => $txt) {
 			$this->page = $currpage;
-			$this->SetXY($l,$h);
+			$this->SetXY($l, $h);
 
-		if($col == 5)
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
+		if ($col == 5)
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, "R");
 			else
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt);
 			$l += $this->tablewidths[$col];
 
-			if(!isset($tmpheight[$row.'-'.$this->page]))
+			if ( ! isset($tmpheight[$row.'-'.$this->page]))
 				$tmpheight[$row.'-'.$this->page] = 0;
-			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+			if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
 				$tmpheight[$row.'-'.$this->page] = $this->GetY();
 			}
-			if($this->page > $maxpage)
+			if ($this->page > $maxpage)
 				$maxpage = $this->page;
 		}
 
@@ -107,17 +107,17 @@ 
 	// draw the borders
 	// we start adding a horizontal line on the last page
 	$this->page = $maxpage;
-	$this->Line($l,$h,$fullwidth+$l,$h);
+	$this->Line($l, $h, $fullwidth + $l, $h);
 	// now we start at the top of the document and walk down
-	for($i = $startpage; $i <= $maxpage; $i++) {
+	for ($i = $startpage; $i <= $maxpage; $i++) {
 		$this->page = $i;
 		$l = $this->lMargin;
 		$t  = ($i == $startpage) ? $startheight : $this->tMargin;
-		$lh = ($i == $maxpage)   ? $h : $this->h-$this->bMargin;
-		$this->Line($l,$t,$l,$lh);
-		foreach($this->tablewidths AS $width) {
+		$lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
+		$this->Line($l, $t, $l, $lh);
+		foreach ($this->tablewidths AS $width) {
 			$l += $width;
-			$this->Line($l,$t,$l,$lh);
+			$this->Line($l, $t, $l, $lh);
 		}
 	}
 	// set it to the last page, if not it'll cause some problems
@@ -126,7 +126,7 @@ 
 
 
 
-function table_total($datas, $lineheight=8) {
+function table_total($datas, $lineheight = 8) {
 	// some things to set and 'remember'
 	$l = $this->lMargin;
 	$startheight = $h = $this->GetY();
@@ -134,37 +134,37 @@ 
 
 	// calculate the whole width
 	$fullwidth = 0;
-	foreach($this->tablewidths AS $width) {
+	foreach ($this->tablewidths AS $width) {
 		$fullwidth += $width;
 	}
 
 	// Now let's start to write the table
-	foreach($datas AS $row => $data) {
+	foreach ($datas AS $row => $data) {
 		$this->page = $currpage;
 		// write the horizontal borders
-	if($data != "")
-		$this->Line(100,$h,200,$h);
+	if ($data != "")
+		$this->Line(100, $h, 200, $h);
 		// write the content and remember the height of the highest col
-		foreach($data AS $col => $txt) {
+		foreach ($data AS $col => $txt) {
 			$this->page = $currpage;
-			$this->SetXY($l,$h);
+			$this->SetXY($l, $h);
             
-			if($col == 3)
+			if ($col == 3)
 		  $this->SetFont('Arial', 'B', 8);
 		else
 		  $this->SetFont('Arial', '', 8);
-		if($col == 5)
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
+		if ($col == 5)
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, "R");
 			else
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt);
 			$l += $this->tablewidths[$col];
 
-			if(!isset($tmpheight[$row.'-'.$this->page]))
+			if ( ! isset($tmpheight[$row.'-'.$this->page]))
 				$tmpheight[$row.'-'.$this->page] = 0;
-			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+			if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
 				$tmpheight[$row.'-'.$this->page] = $this->GetY();
 			}
-			if($this->page > $maxpage)
+			if ($this->page > $maxpage)
 				$maxpage = $this->page;
 		}
 
@@ -179,21 +179,21 @@ 
 	// we start adding a horizontal line on the last page
 	$this->page = $maxpage;
     
-	$this->Line(100,$h,200,$h);
+	$this->Line(100, $h, 200, $h);
 
 	// now we start at the top of the document and walk down
-	for($i = $startpage; $i <= $maxpage; $i++) {
+	for ($i = $startpage; $i <= $maxpage; $i++) {
 		$this->page = $i;
 		$l = $this->lMargin;
 		$t  = ($i == $startpage) ? $startheight : $this->tMargin;
-		$lh = ($i == $maxpage)   ? $h : $this->h-$this->bMargin;
+		$lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
 
-		foreach($this->tablewidths AS $width) {
+		foreach ($this->tablewidths AS $width) {
 		$l += $width;
-		if($width != '30')
+		if ($width != '30')
 		{
-		  $this->Line(100,$t,100,$lh);
-		  $this->Line($l,$t,$l,$lh);
+		  $this->Line(100, $t, 100, $lh);
+		  $this->Line($l, $t, $l, $lh);
 		}
 		}
 	}
@@ -202,7 +202,7 @@ 
 }
 
 
-function export_pdf($datas, $lineheight=8) {
+function export_pdf($datas, $lineheight = 8) {
 	// some things to set and 'remember'
 	$l = $this->lMargin;
 	$startheight = $h = $this->GetY();
@@ -210,32 +210,32 @@ 
 
 	// calculate the whole width
 	$fullwidth = 0;
-	foreach($this->tablewidths AS $width) {
+	foreach ($this->tablewidths AS $width) {
 		$fullwidth += $width;
 	}
 
 	// Now let's start to write the table
-	foreach($datas AS $row => $data) {
+	foreach ($datas AS $row => $data) {
 		$this->page = $currpage;
 		// write the horizontal borders
-	 $this->Line($l,$h,$fullwidth+$l,$h); 
+	 $this->Line($l, $h, $fullwidth + $l, $h); 
 		// write the content and remember the height of the highest col
-		foreach($data AS $col => $txt) {
+		foreach ($data AS $col => $txt) {
 			$this->page = $currpage;
-			$this->SetXY($l,$h);
+			$this->SetXY($l, $h);
 
-		if($col == 5)
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
+		if ($col == 5)
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, "R");
 			else
-		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+		  $this->MultiCell($this->tablewidths[$col], $lineheight, $txt);
 			$l += $this->tablewidths[$col];
 
-			if(!isset($tmpheight[$row.'-'.$this->page]))
+			if ( ! isset($tmpheight[$row.'-'.$this->page]))
 				$tmpheight[$row.'-'.$this->page] = 0;
-			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+			if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
 				$tmpheight[$row.'-'.$this->page] = $this->GetY();
 			}
-			if($this->page > $maxpage)
+			if ($this->page > $maxpage)
 				$maxpage = $this->page;
 		}
 
@@ -249,17 +249,17 @@ 
 	// draw the borders
 	// we start adding a horizontal line on the last page
 	$this->page = $maxpage;
-	$this->Line($l,$h,$fullwidth+$l,$h);
+	$this->Line($l, $h, $fullwidth + $l, $h);
 	// now we start at the top of the document and walk down
-	for($i = $startpage; $i <= $maxpage; $i++) {
+	for ($i = $startpage; $i <= $maxpage; $i++) {
 		$this->page = $i;
 		$l = $this->lMargin;
 		$t  = ($i == $startpage) ? $startheight : $this->tMargin;
-		$lh = ($i == $maxpage)   ? $h : $this->h-$this->bMargin;
-		$this->Line($l,$t,$l,$lh);
-		foreach($this->tablewidths AS $width) {
+		$lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
+		$this->Line($l, $t, $l, $lh);
+		foreach ($this->tablewidths AS $width) {
 			$l += $width;
-			$this->Line($l,$t,$l,$lh);
+			$this->Line($l, $t, $l, $lh);
 		}
 	}
 	// set it to the last page, if not it'll cause some problems