iNextrix / ASTPP

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

web_interface/astpp/system/libraries/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	{
 		// Set and validate the supplied month/year
 		if ($year == '') {
-					$year  = date("Y", $this->local_time);
+					$year = date("Y", $this->local_time);
 		}
 
 		if ($month == '') {

web_interface/astpp/system/libraries/Xmlrpc.php

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;

web_interface/astpp/system/database/DB_active_rec.php

Spacing +1 added lines, -1 removed lines

@@ -2132,7 +2132,7 @@
 	 */
 		 function _insert_on_duplicate_update_batch($table, $keys, $values)
 		 {
-				  foreach($keys as $key)
+				  foreach ($keys as $key)
 				  $update_fields[] = $key.'=VALUES('.$key.')';
            
 				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);

web_interface/astpp/system/helpers/template_inheritance_helper.php

Spacing +3 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
 */
-	if (! defined('TI_VIEWS_DIR') ) {
+	if ( ! defined('TI_VIEWS_DIR')) {
 		if (defined('APPPATH')) {
 			define('TI_VIEWS_DIR', APPPATH.'views/');
 		} else {
@@ -285,7 +285,7 @@ 
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 		else {
-			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+			include realpath(TI_VIEWS_DIR.$GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	function block_rendering_neccessary() {
 		// check if no child did override this block
-		if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
+		if ( ! array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
 			return true;
 		}
 		// check if there is an extension marker in the child blocks data. If so, the

web_interface/astpp/system/helpers/form_helper.php

Spacing +47 added lines, -47 removed lines

@@ -80,11 +80,11 @@ 
 		return $form;

 	}

 }

-if(!function_exists('form_breadcrumb')){

-	function form_breadcrumb($info=''){

-	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+if ( ! function_exists('form_breadcrumb')) {

+	function form_breadcrumb($info = '') {

+	 $form = false;

+	 if ( ! empty($info))

+ 	$form .= "<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

 		</div>";

 	return $form;

@@ -212,7 +212,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else {

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -226,7 +226,7 @@ 
 	{

 				//  echo '<pre>'; print_r($data); exit;

 			//$data["class"] = "col-md-5 form-control";

-			$data['value']='Delete';

+			$data['value'] = 'Delete';

 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');

 

 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";

@@ -377,21 +377,21 @@ 
 

 		if ($extra != '') $extra = ' '.$extra;

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-				if(is_array($name)){

-					 $str=null;

-					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+				if (is_array($name)) {

+					 $str = null;

+					 foreach ($name as $key=>$value) {

+					  if ($key != 'class' && $key != 'disabled')

+					  $str .= $key."='$value' ";

 					 }

-					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

-					  $str.='disabled = "disabled"';

+					 if (isset($name['disabled']) && $name['disabled'] == 'disabled') {

+					  $str .= 'disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

-					if(!empty($extra)){

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

+				} else {

+					if ( ! empty($extra)) {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

+					} else {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

 //                if($extra != '' ){

@@ -418,12 +418,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 //echo $form; exit;

@@ -449,21 +449,21 @@ 
 			}

 		}

 		if ($extra != '') $extra = ' '.$extra;

-				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+				$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

 				}

-				else{

-					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

+				else {

+					$form = '<select name="'.$name.'"'.$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

 		$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -481,12 +481,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 

@@ -517,35 +517,35 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && ! is_array($extra)) $extra = ' '.$extra;

 			/**********************************************************/

 

-		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+		$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				/*

 		  ASTPP  3.0  For Search Display In

 		*/

-				if(empty($extra)){

+				if (empty($extra)) {

 				/*********************************/

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

-					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				} else {

+					$form = '<select name="'.$name.'"'.$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else {

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

 		//$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -685,13 +685,13 @@ 
 		{

 			unset($defaults['checked']);

 		}

-		$class=NULL;

+		$class = NULL;

 

 //echo "<pre>".$value; print_r($extra); exit;

-		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

-		$class='onoffswitch-inner';

-		}else{

-		$class='onoffswitch-inner';

+		if (isset($extra[$value]) && ! empty($extra) && $extra[$value] == '0') {

+		$class = 'onoffswitch-inner';

+		} else {

+		$class = 'onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){

 	      if(isset($extra[0])){

freeswitch/fs/lib/astpp.cdr.php

Spacing +88 added lines, -88 removed lines

@@ -46,15 +46,15 @@ 
 
 	if ($dataVariable['billsec'] == 0 && $dataVariable['hangup_cause'] == 'NORMAL_CLEARING')
 	{
-		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause'];
-	}else{
+		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause']) ? $dataVariable['last_bridge_hangup_cause'] : $dataVariable['hangup_cause'];
+	} else {
 		$hangup_cause = $dataVariable['hangup_cause'];
 	}   
 
 	if ($dataVariable['error_cdr'] == '1')
 	{
 		//Get actual hangup cause 
-		$hangup_cause= (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause']); 
+		$hangup_cause = (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause']) ? $dataVariable['last_bridge_hangup_cause'] : $dataVariable['hangup_cause']); 
 	}
 
 	/*#### PATCH FOR ONE WAY AUDIO ####*/
@@ -65,14 +65,14 @@ 
 	/*#### ************* END *************####*/
 
 	//Don't thing this will be useful anytime. Need to remove it after testing. 
-	if($hangup_cause == "NONE")
+	if ($hangup_cause == "NONE")
 	{
 		$hangup_cause = $dataVariable['current_application_data'];
 	}
 
 	$dataVariable['hangup_cause'] = $hangup_cause;
 
-	if ( ($dataVariable['hangup_cause'] != 'NORMAL_CLEARING') && ($dataVariable['hangup_cause'] != 'ALLOTTED_TIMEOUT')) {
+	if (($dataVariable['hangup_cause'] != 'NORMAL_CLEARING') && ($dataVariable['hangup_cause'] != 'ALLOTTED_TIMEOUT')) {
 	  	$dataVariable['billsec'] = 0;
 	}
 
@@ -86,13 +86,13 @@ 
 	$actual_calltype = $dataVariable['calltype'];
 	
 	//Normalize origination and termination rates array 		   
-	if(isset($dataVariable['origination_rates']))
+	if (isset($dataVariable['origination_rates']))
 	   $origination_rate = normalize_origination_rate($dataVariable['origination_rates']);
-	if(isset($dataVariable['termination_rates']))
+	if (isset($dataVariable['termination_rates']))
 	   $termination_rate = normalize_rate($dataVariable['termination_rates']);
 
 	//If receiver account id found then explicitly set call direction and call type 
-	if(isset($dataVariable['receiver_accid']))
+	if (isset($dataVariable['receiver_accid']))
 	{
 		$dataVariable['call_direction'] = "outbound";
 		$dataVariable['calltype'] = "STANDARD";
@@ -101,23 +101,23 @@ 
 	//Check if cusotmer have any package seconds left to use
 	if ($actual_duration > 0)			
 	{
-			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
-			if(!empty($package_array))
+			$package_array = package_calculation($dataVariable['effective_destination_number'], $origination_rate[$accountid]['RATEGROUP'], $actual_duration, $dataVariable['call_direction'], $accountid, $db, $logger);
+			if ( ! empty($package_array))
 			{
 				$dataVariable['calltype'] = "FREE";
-				$dataVariable['package_id']= $package_array['package_id'];
+				$dataVariable['package_id'] = $package_array['package_id'];
 			}
 	}
 	
 	//Calculate debit of customer call 			
-	$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
+	$debit = calc_cost($dataVariable, $origination_rate[$accountid], $logger, $decimal_points);
 
 	//Calculate cost for customer call for provider
-	$provider_cost = calc_cost($dataVariable,$termination_rate,$logger,$decimal_points);
+	$provider_cost = calc_cost($dataVariable, $termination_rate, $logger, $decimal_points);
 
 	//Calculate parent cost if customer have any parent 
-	$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
-	$logger->log("Debit :".$debit ." Cost : ".$cost ." Provider Cost : ".$parent_cost);
+	$parent_cost = ($parentid > 0) ? calc_cost($dataVariable, $origination_rate[$parentid], $logger, $decimal_points) : $provider_cost;
+	$logger->log("Debit :".$debit." Cost : ".$cost." Provider Cost : ".$parent_cost);
     
 	//Initialize final cost variable to use for billing
 	$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;    
@@ -125,33 +125,33 @@ 
 	//Outbound call entry for all type of calls 
 	$logger->log("*********************** OUTBOUND CALL ENTRY START *************");
 
-	$cdr_string = get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger);
+	$cdr_string = get_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost, $logger);
 
 	$query = "INSERT INTO cdrs (uniqueid,accountid,type,callerid,callednum,billseconds,trunk_id,trunkip,callerip,disposition,callstart,debit,cost,provider_id,pricelist_id,package_id,pattern,notes,rate_cost,reseller_id,reseller_code,reseller_code_destination,reseller_cost,provider_code,provider_code_destination,provider_cost,provider_call_cost,call_direction,calltype,profile_start_stamp,answer_stamp,bridge_stamp,progress_stamp,progress_media_stamp,end_stamp,billmsec,answermsec,waitmsec,progress_mediamsec,flow_billmsec)  values ($cdr_string)";
 	$logger->log($query);
 	$db->run($query);
 	
 	//Update customer balance
-	if($debit > 0 && $dataVariable['calltype'] != "FREE")
+	if ($debit > 0 && $dataVariable['calltype'] != "FREE")
 	{
 		update_balance($accountid, $debit, 0, $logger, $db);
 	}
 
 	//Update parent or provider balance
-	if($parent_cost > 0){
+	if ($parent_cost > 0) {
 		update_balance($termination_rate['PROVIDER'], ($parent_cost * -1), 3, $logger, $db);
 	}
 
 	//Resellers CDR entry
 	$flag_parent = false;
-	insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
+	insert_parent_data($dataVariable, $actual_calltype, $parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points);
 
 	$logger->log("*********************** OUTBOUND CALL ENTRY END *************");
 
    
 	//************ ADDING EXTRA ENTRY For local/DID Inbound call ****************************
-	$receiver_parentid=0;
-	if(isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "")
+	$receiver_parentid = 0;
+	if (isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "")
 	{
 		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING START *************");            
 
@@ -160,7 +160,7 @@ 
 		$dataVariable['calltype'] = "DID";
 
 		//Override variables if call for DID PSTN
-		if(isset($dataVariable['caller_did_account_id']))
+		if (isset($dataVariable['caller_did_account_id']))
 		{
 			$dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
 			$dataVariable['call_direction'] = "outbound";
@@ -171,17 +171,17 @@ 
         
 
 		//Get call receiver account information 
-		$receiver_carddata = get_accounts($dataVariable['receiver_accid'],$logger,$db);
+		$receiver_carddata = get_accounts($dataVariable['receiver_accid'], $logger, $db);
 		$receiver_parentid = $receiver_carddata['reseller_id'];
 
 		//For additional cdr entry of receiver
-		insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$receiver_parentid,$flag_parent,$dataVariable['receiver_accid'],$logger,$db,$decimal_points);
+		insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $receiver_parentid, $flag_parent, $dataVariable['receiver_accid'], $logger, $db, $decimal_points);
 
 		$flag_parent = true;
 		$dataVariable['uuid'] = $dataVariable['uuid'].$dataVariable['calltype']."_".$receiver_parentid;
 
 		//Insert parent reseller cdr
-		insert_parent_data($dataVariable,$actual_calltype,$receiver_parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
+		insert_parent_data($dataVariable, $actual_calltype, $receiver_parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points);
 		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING END *************");            
 	}
 	//*****************************************************************************************
@@ -193,16 +193,16 @@ 
  * @param string $provider_cost
  * @param boolean $flag_parent
  */
-function insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points)
+function insert_parent_data($dataVariable, $actual_calltype, $parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points)
 {
-	while($parentid > 0 )
+	while ($parentid > 0)
 	{
 		$logger->log("*************** IN PARENT DATA SECTION ********");
 		$dataVariable['calltype'] = $actual_calltype;
-		$carddata = get_accounts($parentid,$logger,$db);
+		$carddata = get_accounts($parentid, $logger, $db);
 		$accountid = $carddata['id'];
 
-		$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
+		$debit = calc_cost($dataVariable, $origination_rate[$accountid], $logger, $decimal_points);
 
 		//If receiver account id found then explicitly set call direction and call type
 		/*if(isset($dataVariable['receiver_accid']))
@@ -212,31 +212,31 @@ 
         }*/
 
 		//Check if reseller have any package seconds left to use        
-		if ($actual_duration > 0)		{
-			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
-			if(!empty($package_array))
+		if ($actual_duration > 0) {
+			$package_array = package_calculation($dataVariable['effective_destination_number'], $origination_rate[$accountid]['RATEGROUP'], $actual_duration, $dataVariable['call_direction'], $accountid, $db, $logger);
+			if ( ! empty($package_array))
 			{
 				$dataVariable['calltype'] = "FREE";
-				$dataVariable['package_id']= $package_array['package_id'];
+				$dataVariable['package_id'] = $package_array['package_id'];
 			}
 		}	
 
 		//Get parent id for cost calculation 
 		$parentid = $carddata['reseller_id'];
-		$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
+		$parent_cost = ($parentid > 0) ? calc_cost($dataVariable, $origination_rate[$parentid], $logger, $decimal_points) : $provider_cost;
 		$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;
 	
-		if(isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "" && $flag_parent == true)
+		if (isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "" && $flag_parent == true)
 		{
 			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY START ******");
 			$flag_parent = true;
-			insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points);
+			insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $parentid, $flag_parent, $accountid, $logger, $db, $decimal_points);
 			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY END ******");
 			return true;	
 
-		} else{
+		} else {
 
-			$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);	
+			$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);	
 
  			$query = "INSERT INTO reseller_cdrs (uniqueid,accountid,callerid,callednum,billseconds,disposition,callstart,debit,cost,pricelist_id,package_id,pattern,notes,rate_cost,
 		reseller_id,reseller_code,reseller_code_destination,reseller_cost,call_direction,calltype) values ($cdr_string)";
@@ -257,38 +257,38 @@ 
 /**
  * @param boolean $flag_parent
  */
-function insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points)
+function insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $parentid, $flag_parent, $accountid, $logger, $db, $decimal_points)
 {
 		$localVariable = $dataVariable;
 		$localVariable['call_direction'] = "inbound";
 		$localVariable['uuid'] = $localVariable['uuid'].$dataVariable['calltype']."_".$accountid;
 		
-		if($dataVariable['calltype'] == "LOCAL")
+		if ($dataVariable['calltype'] == "LOCAL")
 		{
 			$origination_rate[$accountid]['CODE'] = $dataVariable['effective_destination_number'];
 			$origination_rate[$accountid]['DESTINATION'] = $dataVariable['calltype'];
-			if($flag_parent == false){
-				$cdr_string = get_cdr_string($localVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,0,0,$logger);
-			} else{
-				$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);
+			if ($flag_parent == false) {
+				$cdr_string = get_cdr_string($localVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, 0, 0, $logger);
+			} else {
+				$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);
 			}
-		} else{
+		} else {
 
 			$origination_rate_did = normalize_origination_rate($dataVariable['origination_rates_did']);
-			$debit = calc_cost($dataVariable,$origination_rate_did[$accountid],$logger,$decimal_points);
+			$debit = calc_cost($dataVariable, $origination_rate_did[$accountid], $logger, $decimal_points);
 
-			if($flag_parent == false){
+			if ($flag_parent == false) {
 				
-				$cdr_string = get_cdr_string($localVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate_did,$provider_cost,$parentid,$debit,0,$logger);
-			} else{
-				$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);
+				$cdr_string = get_cdr_string($localVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate_did, $provider_cost, $parentid, $debit, 0, $logger);
+			} else {
+				$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);
 			}
 		}
 	  
-		if($flag_parent == false)
+		if ($flag_parent == false)
 		{
 			$query = "INSERT INTO cdrs(uniqueid,accountid,type,callerid,callednum,billseconds,trunk_id,trunkip,callerip,disposition,callstart,debit,cost,provider_id,pricelist_id,package_id,pattern,notes,rate_cost,reseller_id,reseller_code,reseller_code_destination,reseller_cost,provider_code,provider_code_destination,provider_cost,provider_call_cost,call_direction,calltype,profile_start_stamp,answer_stamp,bridge_stamp,progress_stamp,progress_media_stamp,end_stamp,billmsec,answermsec,waitmsec,progress_mediamsec,flow_billmsec) values ($cdr_string)";
-		} else{
+		} else {
 			$query = "INSERT INTO reseller_cdrs (uniqueid,accountid,callerid,callednum,billseconds,disposition,callstart,debit,cost,pricelist_id,package_id,pattern,notes,rate_cost,
 	reseller_id,reseller_code,reseller_code_destination,reseller_cost,call_direction,calltype) values ($cdr_string)";
 		}
@@ -304,22 +304,22 @@ 
 }
 
 //Generate CDR string for insert query for customer.
-function get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger)
+function get_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost, $logger)
 {
 
-		$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
+		$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
 
-		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."',".(($termination_rate['TRUNK']) ? $termination_rate['TRUNK'] : '0').",".(($dataVariable['sip_via_host']) ? "'".$dataVariable['sip_via_host']."'" : '').",".(($dataVariable['sip_contact_host']) ? "'".$dataVariable['sip_contact_host']."'" : '').",'".($dataVariable['hangup_cause'])."','".urldecode($dataVariable['callstart'])."','".$debit."','".$cost."',".(($termination_rate['PROVIDER']) ? $termination_rate['PROVIDER'] : '0').",'".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".htmlentities($origination_rate[$accountid]['DESTINATION'],ENT_COMPAT, 'UTF-8')."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",
-'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($termination_rate['CODE']) ? "'".$termination_rate['CODE']."'" : "'".''."'" ).",
+		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."',".(($termination_rate['TRUNK']) ? $termination_rate['TRUNK'] : '0').",".(($dataVariable['sip_via_host']) ? "'".$dataVariable['sip_via_host']."'" : '').",".(($dataVariable['sip_contact_host']) ? "'".$dataVariable['sip_contact_host']."'" : '').",'".($dataVariable['hangup_cause'])."','".urldecode($dataVariable['callstart'])."','".$debit."','".$cost."',".(($termination_rate['PROVIDER']) ? $termination_rate['PROVIDER'] : '0').",'".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".htmlentities($origination_rate[$accountid]['DESTINATION'], ENT_COMPAT, 'UTF-8')."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",
+'".$parentid."',".(($origination_rate[$parentid]['CODE']) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ? "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ? "'".$origination_rate[$parentid]['COST']."'" : '0').",".(($termination_rate['CODE']) ? "'".$termination_rate['CODE']."'" : "'".''."'").",
 ".(($termination_rate['DESTINATION']) ? "'".$termination_rate['DESTINATION']."'" : "'".''."'").",".(($termination_rate['COST']) ? "'".$termination_rate['COST']."'" : '0').",'".$provider_cost."',".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."','".convert_to_gmt(urldecode($dataVariable['profile_start_stamp']))."','".convert_to_gmt(urldecode($dataVariable['answer_stamp']))."','".convert_to_gmt(urldecode($dataVariable['bridge_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_media_stamp']))."','".convert_to_gmt(urldecode($dataVariable['end_stamp']))."',".$dataVariable['billmsec'].",'".$dataVariable['answermsec']."','".$dataVariable['waitmsec']."','".$dataVariable['progress_mediamsec']."','".$dataVariable['flow_billmsec']."'";
 
 }
 
 //Generate CDR string for insert query for reseller
-function get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost)
+function get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost)
 {
-        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
-	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
+        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
+	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE']) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ? "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ? "'".$origination_rate[$parentid]['COST']."'" : '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
 }
 
 //Update user balance
@@ -328,8 +328,8 @@ 
  */
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
     $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-    $query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
-    $logger->log("Balance update : " . $query);
+    $query = "UPDATE accounts SET balance=balance-".$amount." WHERE id=".$user_id;
+    $logger->log("Balance update : ".$query);
     $db->run($query);
 }
 
@@ -388,46 +388,46 @@ 
     
 			if ($billseconds > 0)
 			{
-				$call_cost += (ceil($billseconds/$rates['INC'])*$rates['INC'])*($rates['COST']/60);
+				$call_cost += (ceil($billseconds / $rates['INC']) * $rates['INC']) * ($rates['COST'] / 60);
 			}
 	}
-	$call_cost = number_format($call_cost,$decimal_points);
+	$call_cost = number_format($call_cost, $decimal_points);
 	$logger->log("Return cost ".$call_cost);
 	return $call_cost;
 }
 
 // get intial package information
-function package_calculation($destination_number,$pricelist_id,$duration,$call_direction,$accountid,$db,$logger)
+function package_calculation($destination_number, $pricelist_id, $duration, $call_direction, $accountid, $db, $logger)
 {
 	$package_array = array();
-	$custom_destination = number_loop($destination_number,"patterns",$db);
+	$custom_destination = number_loop($destination_number, "patterns", $db);
 
 	$query = "SELECT * FROM packages  as P inner join package_patterns as PKGPTR on P.id = PKGPTR.package_id WHERE ".$custom_destination." AND status = 0 AND pricelist_id = ".$pricelist_id." ORDER BY LENGTH(PKGPTR.patterns) DESC LIMIT 1";
 
 	$package_info = $db->run($query);
-	if($package_info){
+	if ($package_info) {
 		$package_info = $package_info[0];
 
-		if( ($package_info['applicable_for'] == "0" && $call_direction == "outbound") || ($package_info['applicable_for'] == "1" && $call_direction == "inbound") || ($package_info['applicable_for'] == "2") ) {
+		if (($package_info['applicable_for'] == "0" && $call_direction == "outbound") || ($package_info['applicable_for'] == "1" && $call_direction == "inbound") || ($package_info['applicable_for'] == "2")) {
 	
-			$counter_info =  get_counters($accountid,$package_info['package_id'],$db,$logger);
+			$counter_info = get_counters($accountid, $package_info['package_id'], $db, $logger);
 
-			if(!$counter_info) {
+			if ( ! $counter_info) {
 				$Insert_Query = "INSERT INTO counters (package_id,accountid) VALUES (".$package_info['package_id'].",".$accountid.")";		
-				$logger->log("Insert Counters  : " . $Insert_query);
+				$logger->log("Insert Counters  : ".$Insert_query);
 				$db->run($Insert_Query);
-				$counter_info =  get_counters($accountid,$package_info['package_id'],$db,$logger);
+				$counter_info = get_counters($accountid, $package_info['package_id'], $db, $logger);
 				
 			}	
 			//print_r($counter_info);
-			if ( $package_info['includedseconds'] > ($counter_info['seconds'] )) {
+			if ($package_info['includedseconds'] > ($counter_info['seconds'])) {
 				$availableseconds = $package_info['includedseconds'] - $counter_info['seconds'];
 				$freeseconds = ($availableseconds >= $duration) ? $duration : $availableseconds;
 				$duration = ($availableseconds >= $duration) ? $duration : $availableseconds;
-				$update_query = "UPDATE counters SET seconds = ".($counter_info['seconds'] + $freeseconds ). " WHERE id = ". $counter_info['id'];
-				$logger->log("Update Counters  : " . $update_query);
+				$update_query = "UPDATE counters SET seconds = ".($counter_info['seconds'] + $freeseconds)." WHERE id = ".$counter_info['id'];
+				$logger->log("Update Counters  : ".$update_query);
 				$db->run($update_query);
-				$package_array['package_id']= $package_info['package_id'];
+				$package_array['package_id'] = $package_info['package_id'];
 				$package_array['calltype'] = "FREE";
 			}						
 		} 
@@ -436,21 +436,21 @@ 
 } 
 
 // Getting used package minutes in counter table
-function get_counters($accountid,$package_id,$db,$logger)
+function get_counters($accountid, $package_id, $db, $logger)
 {
 	$query_counter = "SELECT id,seconds FROM counters  WHERE  accountid = ".$accountid." AND package_id = ".$package_id." AND status=1 LIMIT 1";
 	$counter = $db->run($query_counter);
-	$logger->log("GET Counters  : " . $query_counter);
-	if($counter)
+	$logger->log("GET Counters  : ".$query_counter);
+	if ($counter)
 		return $counter[0];	
 	else
 		return "";
 }
 
 //Get user info
-function get_accounts($parent_id,$logger, $db) {
-	$query = "SELECT * FROM accounts WHERE id=" . $parent_id;
-	$logger->log("GET configuration  : " . $query);
+function get_accounts($parent_id, $logger, $db) {
+	$query = "SELECT * FROM accounts WHERE id=".$parent_id;
+	$logger->log("GET configuration  : ".$query);
 	$res_user = $db->run($query);
 	return $res_user[0];
 }
@@ -460,7 +460,7 @@ 
 {
 	$query = "SELECT name,value FROM system WHERE name='decimal_points' and group_title = 'global'";
 	$config = $db->run($query);
-	$logger->log("GET configuration  : " . $query);
+	$logger->log("GET configuration  : ".$query);
 	return $config[0];
 }
 
@@ -468,16 +468,16 @@ 
 /**
  * @param string $field
  */
-function number_loop($destination,$field,$db)
+function number_loop($destination, $field, $db)
 {
-	$max_len_prefix  = strlen($destination);
+	$max_len_prefix = strlen($destination);
 	$number_prefix = '(';
-	while ($max_len_prefix  > 0)
+	while ($max_len_prefix > 0)
 	{
-		$number_prefix .= "$field='^".substr($destination,0,$max_len_prefix).".*' OR ";
+		$number_prefix .= "$field='^".substr($destination, 0, $max_len_prefix).".*' OR ";
 		$max_len_prefix--;
 	}
-	$number_prefix .= "$field='^defaultprefix.*')";//echo $number_prefix;exit;
+	$number_prefix .= "$field='^defaultprefix.*')"; //echo $number_prefix;exit;
 	return $number_prefix;
 }
 
@@ -487,6 +487,6 @@ 
  */
 function convert_to_gmt($date)
 {
-	return gmdate('Y-m-d H:i:s', strtotime($date) );
+	return gmdate('Y-m-d H:i:s', strtotime($date));
 }
 ?>

freeswitch/fs/lib/astpp.xml.php

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 //Build acl xml
-function load_acl($logger, $db,$config) {
+function load_acl($logger, $db, $config) {
 	$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 	$xml .= "<document type=\"freeswitch/xml\">\n";
 	$xml .= "   <section name=\"Configuration\" description=\"Configuration\">\n";
@@ -46,29 +46,29 @@ 
 	
 	//For customer and provider ips
 	$query = "SELECT ip FROM ip_map,accounts WHERE ip_map.accountid=accounts.id AND accounts.status=0 AND deleted=0";
-	$logger->log("ACL Query : " . $query);
+	$logger->log("ACL Query : ".$query);
 	$res_acl = $db->run($query);
 	$logger->log($res_acl);
 
 	foreach ($res_acl as $res_acl_key => $res_acl_value) {
-		$xml .= "       <node type=\"allow\" cidr=\"" . $res_acl_value['ip'] . "\"/>\n";
+		$xml .= "       <node type=\"allow\" cidr=\"".$res_acl_value['ip']."\"/>\n";
 	}
 
 	//For gateways
 	$query = "SELECT * FROM gateways WHERE status=0";
-	$logger->log("Sofia Gateway Query : " . $query);
+	$logger->log("Sofia Gateway Query : ".$query);
 	$sp_gw = $db->run($query);
 	$logger->log($sp_gw);
 
 	foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
 
-			$sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+			$sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
 			foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
 				if ($sp_gw_settings_value != "" && $sp_gw_settings_key == "proxy")
 				{
-					$tmp_ip_arr = explode(":",$sp_gw_settings_value);
-					if (!filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
-						$xml .= "   <node type=\"allow\" cidr=\"" . $tmp_ip_arr[0] . "/32\"/>\n";
+					$tmp_ip_arr = explode(":", $sp_gw_settings_value);
+					if ( ! filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
+						$xml .= "   <node type=\"allow\" cidr=\"".$tmp_ip_arr[0]."/32\"/>\n";
 					}
 				}
 	   	}
@@ -77,7 +77,7 @@ 
 
 
 	//For opensips
-	if($config['opensips'] == '0')
+	if ($config['opensips'] == '0')
 	{
 		$xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";     
 	}
@@ -85,7 +85,7 @@ 
 	$xml .= "       </list>\n";
 
 	//For loopback 
-	if($config['opensips'] == '0')
+	if ($config['opensips'] == '0')
 	{
 		$xml .= "<list name=\"loopback.auto\" default=\"allow\">\n";
 			$xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";
@@ -94,7 +94,7 @@ 
 
 	//For event handing
 	$xml .= "<list name=\"event\" default=\"deny\">\n";
-		$xml .= ($config['opensips'] == "0")?"<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n":"\n";
+		$xml .= ($config['opensips'] == "0") ? "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n" : "\n";
 		$xml .= "<node type=\"allow\" cidr=\"127.0.0.0/8\"/>\n";
 	$xml .= "</list>\n";
 	$xml .= "           </network-lists>\n";
@@ -114,7 +114,7 @@ 
 	$xml .= "   <profiles>\n";
 
 	$query = "SELECT * FROM sip_profiles WHERE status=0";
-	$logger->log("Sofia Query : " . $query);
+	$logger->log("Sofia Query : ".$query);
 	$res_sp = $db->run($query);
 	//$logger->log($res_sp);
 
@@ -122,40 +122,40 @@ 
 
 		$settings = json_decode($sp_value['profile_data'], true);
 		//$logger->log(print_r($settings,true));
-		$xml .= "   <profile name=\"" . $sp_value['name'] . "\">\n";
+		$xml .= "   <profile name=\"".$sp_value['name']."\">\n";
 
 		$xml .= "   <domains>\n";
-			$xml .= "       <domain name=\"" . $sp_value['sip_ip'] . "\" alias=\"true\" parse=\"true\"/>\n";
+			$xml .= "       <domain name=\"".$sp_value['sip_ip']."\" alias=\"true\" parse=\"true\"/>\n";
 		$xml .= "   </domains>\n";
 		/*$xml .= "   <aliases>\n";
             $xml .= "       <alias name=\"" . $sp_value['sip_ip'] . "\"/>\n";
         $xml .= "   </aliases>\n";*/
 
 	$xml .= "   <settings>\n";
-	$xml .= "       <param name=\"sip-ip\" value=\"" . $sp_value['sip_ip'] . "\"/>\n";
-	$xml .= "       <param name=\"sip-port\" value=\"" . $sp_value['sip_port'] . "\"/>\n";    
-	foreach($settings as $set_key => $set_val)
+	$xml .= "       <param name=\"sip-ip\" value=\"".$sp_value['sip_ip']."\"/>\n";
+	$xml .= "       <param name=\"sip-port\" value=\"".$sp_value['sip_port']."\"/>\n";    
+	foreach ($settings as $set_key => $set_val)
 	{
-			$xml .= "       <param name=\"" . $set_key . "\" value=\"" . $set_val . "\"/>\n";
+			$xml .= "       <param name=\"".$set_key."\" value=\"".$set_val."\"/>\n";
 	}
 		$xml .= "   </settings>\n";
 	
 
 		//Gateway block start 
 		$xml .= "   <gateways>\n";
-		$query = "SELECT * FROM gateways WHERE sip_profile_id=" . $sp_value['id'] . " AND status=0";
-		$logger->log("Sofia Gateway Query : " . $query);
+		$query = "SELECT * FROM gateways WHERE sip_profile_id=".$sp_value['id']." AND status=0";
+		$logger->log("Sofia Gateway Query : ".$query);
 		$sp_gw = $db->run($query);
 		$logger->log($sp_gw);
 		foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
-			$xml .= "       <gateway name=\"" . $sp_gw_value['name'] . "\">\n";
+			$xml .= "       <gateway name=\"".$sp_gw_value['name']."\">\n";
 
 
 
-		$sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+		$sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
 			foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
 				if ($sp_gw_settings_value != "")
-					$xml .= "           <param name=\"" . $sp_gw_settings_key . "\" value=\"" . $sp_gw_settings_value . "\"/>\n";
+					$xml .= "           <param name=\"".$sp_gw_settings_key."\" value=\"".$sp_gw_settings_value."\"/>\n";
 			}
 			$xml .= "       </gateway>\n";
 		}
@@ -177,9 +177,9 @@ 
 function load_directory($logger, $db) {
 	$xml = "";
 
-	$query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='" . $_REQUEST['user']."' limit 1";
+	$query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='".$_REQUEST['user']."' limit 1";
 	
-	$logger->log("Directory Query : " . $query);
+	$logger->log("Directory Query : ".$query);
 	$res_dir = $db->run($query);
 	$logger->log($res_dir);
 
@@ -187,21 +187,21 @@ 
 		$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 		$xml .= "<document type=\"freeswitch/xml\">\n";
 		$xml .= "   <section name=\"Directory\" description=\"Directory\">\n";
-		$xml .= "       <domain name=\"" . $_REQUEST['domain'] . "\" alias=\"true\">\n";
-		$xml .= "           <user id=\"" . $_REQUEST['user'] . "\">\n";
+		$xml .= "       <domain name=\"".$_REQUEST['domain']."\" alias=\"true\">\n";
+		$xml .= "           <user id=\"".$_REQUEST['user']."\">\n";
 
 	$params = json_decode($res_dir_value['dir_params'], true);
 
 	$vars   = json_decode($res_dir_value['dir_vars'], true);
 	$param_xml = $var_xml = "";
-	foreach($params as $parms_key => $res_dir_params)
+	foreach ($params as $parms_key => $res_dir_params)
 	{	
-						$param_xml .= "<param name=\"" . $parms_key . "\" value=\"" . $res_dir_params . "\"/>\n";
+						$param_xml .= "<param name=\"".$parms_key."\" value=\"".$res_dir_params."\"/>\n";
 	}
 
-	foreach($vars as $var_key => $res_dir_vars)
+	foreach ($vars as $var_key => $res_dir_vars)
 	{	
-						$var_xml .= "<variable name=\"" . $var_key . "\" value=\"" . $res_dir_vars . "\"/>\n";
+						$var_xml .= "<variable name=\"".$var_key."\" value=\"".$res_dir_vars."\"/>\n";
 	}		
 
 
@@ -214,8 +214,8 @@ 
 		$xml .= "               <variables>\n";
 		$xml .= $var_xml;
 		$xml .= "<variable name=\"sipcall\" value=\"true\"/>\n";
-		$xml .= "<variable name=\"accountcode\" value=\"" . $res_dir_value['accountcode'] . "\"/>\n";
-		$xml .= "<variable name=\"domain_name\" value=\"" . $_REQUEST['domain'] . "\"/>\n";
+		$xml .= "<variable name=\"accountcode\" value=\"".$res_dir_value['accountcode']."\"/>\n";
+		$xml .= "<variable name=\"domain_name\" value=\"".$_REQUEST['domain']."\"/>\n";
 		$xml .= "               </variables>\n";
 
 		$xml .= "           </user>\n";