iNextrix / ASTPP

web_interface/astpp/system/libraries/User_agent.php

Spacing +5 added lines, -5 removed lines

@@ -28,10 +28,10 @@ 
  */
 class CI_User_agent {
 
-	var $agent		= NULL;
+	var $agent = NULL;
 
-	var $is_browser	= FALSE;
-	var $is_robot	= FALSE;
+	var $is_browser = FALSE;
+	var $is_robot = FALSE;
 	var $is_mobile	= FALSE;
 
 	var $languages	= array();
@@ -42,11 +42,11 @@ 
 	var $mobiles	= array();
 	var $robots		= array();
 
-	var $platform	= '';
+	var $platform = '';
 	var $browser	= '';
 	var $version	= '';
 	var $mobile		= '';
-	var $robot		= '';
+	var $robot = '';
 
 	/**
 	 * Constructor

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/Fpdf.php

Spacing +502 added lines, -502 removed lines

@@ -7,68 +7,68 @@ 
 * Author:  Olivier PLATHEY                                                     *

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

 

-if(!class_exists('FPDF'))

+if ( ! class_exists('FPDF'))

 {

-define('FPDF_VERSION','1.7');

+define('FPDF_VERSION', '1.7');

 

 class FPDF

 {

-var $page;               // current page number

-var $n;                  // current object number

-var $offsets;            // array of object offsets

-var $buffer;             // buffer holding in-memory PDF

-var $pages;              // array containing pages

-var $state;              // current document state

-var $compress;           // compression flag

-var $k;                  // scale factor (number of points in user unit)

-var $DefOrientation;     // default orientation

-var $CurOrientation;     // current orientation

-var $StdPageSizes;       // standard page sizes

-var $DefPageSize;        // default page size

-var $CurPageSize;        // current page size

-var $PageSizes;          // used for pages with non default sizes or orientations

-var $wPt, $hPt;          // dimensions of current page in points

-var $w, $h;              // dimensions of current page in user unit

-var $lMargin;            // left margin

-var $tMargin;            // top margin

-var $rMargin;            // right margin

-var $bMargin;            // page break margin

-var $cMargin;            // cell margin

-var $x, $y;              // current position in user unit

-var $lasth;              // height of last printed cell

-var $LineWidth;          // line width in user unit

-var $fontpath;           // path containing fonts

-var $CoreFonts;          // array of core font names

-var $fonts;              // array of used fonts

-var $FontFiles;          // array of font files

-var $diffs;              // array of encoding differences

-var $FontFamily;         // current font family

-var $FontStyle;          // current font style

-var $underline;          // underlining flag

-var $CurrentFont;        // current font info

-var $FontSizePt;         // current font size in points

-var $FontSize;           // current font size in user unit

-var $DrawColor;          // commands for drawing color

-var $FillColor;          // commands for filling color

-var $TextColor;          // commands for text color

-var $ColorFlag;          // indicates whether fill and text colors are different

-var $ws;                 // word spacing

-var $images;             // array of used images

-var $PageLinks;          // array of links in pages

-var $links;              // array of internal links

-var $AutoPageBreak;      // automatic page breaking

-var $PageBreakTrigger;   // threshold used to trigger page breaks

-var $InHeader;           // flag set when processing header

-var $InFooter;           // flag set when processing footer

-var $ZoomMode;           // zoom display mode

-var $LayoutMode;         // layout display mode

-var $title;              // title

-var $subject;            // subject

-var $author;             // author

-var $keywords;           // keywords

-var $creator;            // creator

-var $AliasNbPages;       // alias for total number of pages

-var $PDFVersion;         // PDF version number

+var $page; // current page number

+var $n; // current object number

+var $offsets; // array of object offsets

+var $buffer; // buffer holding in-memory PDF

+var $pages; // array containing pages

+var $state; // current document state

+var $compress; // compression flag

+var $k; // scale factor (number of points in user unit)

+var $DefOrientation; // default orientation

+var $CurOrientation; // current orientation

+var $StdPageSizes; // standard page sizes

+var $DefPageSize; // default page size

+var $CurPageSize; // current page size

+var $PageSizes; // used for pages with non default sizes or orientations

+var $wPt, $hPt; // dimensions of current page in points

+var $w, $h; // dimensions of current page in user unit

+var $lMargin; // left margin

+var $tMargin; // top margin

+var $rMargin; // right margin

+var $bMargin; // page break margin

+var $cMargin; // cell margin

+var $x, $y; // current position in user unit

+var $lasth; // height of last printed cell

+var $LineWidth; // line width in user unit

+var $fontpath; // path containing fonts

+var $CoreFonts; // array of core font names

+var $fonts; // array of used fonts

+var $FontFiles; // array of font files

+var $diffs; // array of encoding differences

+var $FontFamily; // current font family

+var $FontStyle; // current font style

+var $underline; // underlining flag

+var $CurrentFont; // current font info

+var $FontSizePt; // current font size in points

+var $FontSize; // current font size in user unit

+var $DrawColor; // commands for drawing color

+var $FillColor; // commands for filling color

+var $TextColor; // commands for text color

+var $ColorFlag; // indicates whether fill and text colors are different

+var $ws; // word spacing

+var $images; // array of used images

+var $PageLinks; // array of links in pages

+var $links; // array of internal links

+var $AutoPageBreak; // automatic page breaking

+var $PageBreakTrigger; // threshold used to trigger page breaks

+var $InHeader; // flag set when processing header

+var $InFooter; // flag set when processing footer

+var $ZoomMode; // zoom display mode

+var $LayoutMode; // layout display mode

+var $title; // title

+var $subject; // subject

+var $author; // author

+var $keywords; // keywords

+var $creator; // creator

+var $AliasNbPages; // alias for total number of pages

+var $PDFVersion; // PDF version number

 

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

 *                                                                              *

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

@@ -113,44 +113,44 @@ 
 	$this->ColorFlag = false;

 	$this->ws = 0;

 	// Font path

-	if(defined('FPDF_FONTPATH'))

+	if (defined('FPDF_FONTPATH'))

 	{

 		$this->fontpath = FPDF_FONTPATH;

-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')

+		if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\')

 			$this->fontpath .= '/';

 	}

-	elseif(is_dir(dirname(__FILE__).'/font'))

+	elseif (is_dir(dirname(__FILE__).'/font'))

 		$this->fontpath = dirname(__FILE__).'/font/';

 	else

 		$this->fontpath = '';	

 	// Core fonts

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

 	// Scale factor

-	if($unit=='pt')

+	if ($unit == 'pt')

 		$this->k = 1;

-	elseif($unit=='mm')

-		$this->k = 72/25.4;

-	elseif($unit=='cm')

-		$this->k = 72/2.54;

-	elseif($unit=='in')

+	elseif ($unit == 'mm')

+		$this->k = 72 / 25.4;

+	elseif ($unit == 'cm')

+		$this->k = 72 / 2.54;

+	elseif ($unit == 'in')

 		$this->k = 72;

 	else

 		$this->Error('Incorrect unit: '.$unit);

 	// Page sizes

-	$this->StdPageSizes = array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),

-		'letter'=>array(612,792), 'legal'=>array(612,1008));

+	$this->StdPageSizes = array('a3'=>array(841.89, 1190.55), 'a4'=>array(595.28, 841.89), 'a5'=>array(420.94, 595.28),

+		'letter'=>array(612, 792), 'legal'=>array(612, 1008));

 	$size = $this->_getpagesize($size);

 	$this->DefPageSize = $size;

 	$this->CurPageSize = $size;

 	// Page orientation

 	$orientation = strtolower($orientation);

-	if($orientation=='p' || $orientation=='portrait')

+	if ($orientation == 'p' || $orientation == 'portrait')

 	{

 		$this->DefOrientation = 'P';

 		$this->w = $size[0];

 		$this->h = $size[1];

 	}

-	elseif($orientation=='l' || $orientation=='landscape')

+	elseif ($orientation == 'l' || $orientation == 'landscape')

 	{

 		$this->DefOrientation = 'L';

 		$this->w = $size[1];

@@ -159,17 +159,17 @@ 
 	else

 		$this->Error('Incorrect orientation: '.$orientation);

 	$this->CurOrientation = $this->DefOrientation;

-	$this->wPt = $this->w*$this->k;

-	$this->hPt = $this->h*$this->k;

+	$this->wPt = $this->w * $this->k;

+	$this->hPt = $this->h * $this->k;

 	// Page margins (1 cm)

-	$margin = 28.35/$this->k;

-	$this->SetMargins($margin,$margin);

+	$margin = 28.35 / $this->k;

+	$this->SetMargins($margin, $margin);

 	// Interior cell margin (1 mm)

-	$this->cMargin = $margin/10;

+	$this->cMargin = $margin / 10;

 	// Line width (0.2 mm)

-	$this->LineWidth = .567/$this->k;

+	$this->LineWidth = .567 / $this->k;

 	// Automatic page break

-	$this->SetAutoPageBreak(true,2*$margin);

+	$this->SetAutoPageBreak(true, 2 * $margin);

 	// Default display mode

 	$this->SetDisplayMode('default');

 	// Enable compression

@@ -178,12 +178,12 @@ 
 	$this->PDFVersion = '1.3';

 }

 

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

 }

@@ -192,7 +192,7 @@ 
 {

 	// Set left margin

 	$this->lMargin = $margin;

-	if($this->page>0 && $this->x<$margin)

+	if ($this->page > 0 && $this->x < $margin)

 		$this->x = $margin;

 }

 

@@ -208,22 +208,22 @@ 
 	$this->rMargin = $margin;

 }

 

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

 }

 

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

@@ -232,53 +232,53 @@ 
 function SetCompression($compress)

 {

 	// Set page compression

-	if(function_exists('gzcompress'))

+	if (function_exists('gzcompress'))

 		$this->compress = $compress;

 	else

 		$this->compress = false;

 }

 

-function SetTitle($title, $isUTF8=false)

+function SetTitle($title, $isUTF8 = false)

 {

 	// Title of document

-	if($isUTF8)

+	if ($isUTF8)

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

 	$this->title = $title;

 }

 

-function SetSubject($subject, $isUTF8=false)

+function SetSubject($subject, $isUTF8 = false)

 {

 	// Subject of document

-	if($isUTF8)

+	if ($isUTF8)

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

 	$this->subject = $subject;

 }

 

-function SetAuthor($author, $isUTF8=false)

+function SetAuthor($author, $isUTF8 = false)

 {

 	// Author of document

-	if($isUTF8)

+	if ($isUTF8)

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

 	$this->author = $author;

 }

 

-function SetKeywords($keywords, $isUTF8=false)

+function SetKeywords($keywords, $isUTF8 = false)

 {

 	// Keywords of document

-	if($isUTF8)

+	if ($isUTF8)

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

 	$this->keywords = $keywords;

 }

 

-function SetCreator($creator, $isUTF8=false)

+function SetCreator($creator, $isUTF8 = false)

 {

 	// Creator of document

-	if($isUTF8)

+	if ($isUTF8)

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

 	$this->creator = $creator;

 }

 

-function AliasNbPages($alias='{nb}')

+function AliasNbPages($alias = '{nb}')

 {

 	// Define an alias for total number of pages

 	$this->AliasNbPages = $alias;

@@ -299,9 +299,9 @@ 
 function Close()

 {

 	// Terminate document

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

+	if ($this->state == 3)

 		return;

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

+	if ($this->page == 0)

 		$this->AddPage();

 	// Page footer

 	$this->InFooter = true;

@@ -313,10 +313,10 @@ 
 	$this->_enddoc();

 }

 

-function AddPage($orientation='', $size='')

+function AddPage($orientation = '', $size = '')

 {

 	// Start a new page

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

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

 		$this->Open();

 	$family = $this->FontFamily;

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

@@ -326,7 +326,7 @@ 
 	$fc = $this->FillColor;

 	$tc = $this->TextColor;

 	$cf = $this->ColorFlag;

-	if($this->page>0)

+	if ($this->page > 0)

 	{

 		// Page footer

 		$this->InFooter = true;

@@ -336,21 +336,21 @@ 
 		$this->_endpage();

 	}

 	// Start new page

-	$this->_beginpage($orientation,$size);

+	$this->_beginpage($orientation, $size);

 	// Set line cap style to square

 	$this->_out('2 J');

 	// Set line width

 	$this->LineWidth = $lw;

-	$this->_out(sprintf('%.2F w',$lw*$this->k));

+	$this->_out(sprintf('%.2F w', $lw * $this->k));

 	// Set font

-	if($family)

-		$this->SetFont($family,$style,$fontsize);

+	if ($family)

+		$this->SetFont($family, $style, $fontsize);

 	// Set colors

 	$this->DrawColor = $dc;

-	if($dc!='0 G')

+	if ($dc != '0 G')

 		$this->_out($dc);

 	$this->FillColor = $fc;

-	if($fc!='0 g')

+	if ($fc != '0 g')

 		$this->_out($fc);

 	$this->TextColor = $tc;

 	$this->ColorFlag = $cf;

@@ -359,21 +359,21 @@ 
 	$this->Header();

 	$this->InHeader = false;

 	// Restore line width

-	if($this->LineWidth!=$lw)

+	if ($this->LineWidth != $lw)

 	{

 		$this->LineWidth = $lw;

-		$this->_out(sprintf('%.2F w',$lw*$this->k));

+		$this->_out(sprintf('%.2F w', $lw * $this->k));

 	}

 	// Restore font

-	if($family)

-		$this->SetFont($family,$style,$fontsize);

+	if ($family)

+		$this->SetFont($family, $style, $fontsize);

 	// Restore colors

-	if($this->DrawColor!=$dc)

+	if ($this->DrawColor != $dc)

 	{

 		$this->DrawColor = $dc;

 		$this->_out($dc);

 	}

-	if($this->FillColor!=$fc)

+	if ($this->FillColor != $fc)

 	{

 		$this->FillColor = $fc;

 		$this->_out($fc);

@@ -398,37 +398,37 @@ 
 	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);

 }

 

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

@@ -438,66 +438,66 @@ 
 	$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));

 }

 

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

 }

 

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

@@ -505,42 +505,42 @@ 
 	$this->fonts[$fontkey] = $info;

 }

 

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

@@ -549,37 +549,37 @@ 
 	$this->FontFamily = $family;

 	$this->FontStyle = $style;

 	$this->FontSizePt = $size;

-	$this->FontSize = $size/$this->k;

+	$this->FontSize = $size / $this->k;

 	$this->CurrentFont = &$this->fonts[$fontkey];

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	if ($this->page > 0)

+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

 }

 

 function SetFontSize($size)

 {

 	// Set font size in points

-	if($this->FontSizePt==$size)

+	if ($this->FontSizePt == $size)

 		return;

 	$this->FontSizePt = $size;

-	$this->FontSize = $size/$this->k;

-	if($this->page>0)

-		$this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+	$this->FontSize = $size / $this->k;

+	if ($this->page > 0)

+		$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

 }

 

 function AddLink()

 {

 	// Create a new internal link

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

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

 	$this->links[$n] = array(0, 0);

 	return $n;

 }

 

-function SetLink($link, $y=0, $page=-1)

+function SetLink($link, $y = 0, $page = -1)

 {

 	// Set destination of internal link

-	if($y==-1)

+	if ($y == -1)

 		$y = $this->y;

-	if($page==-1)

+	if ($page == -1)

 		$page = $this->page;

 	$this->links[$link] = array($page, $y);

 }

@@ -587,16 +587,16 @@ 
 function Link($x, $y, $w, $h, $link)

 {

 	// Put a link on the page

-	$this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);

+	$this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);

 }

 

 function Text($x, $y, $txt)

 {

 	// Output a string

-	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));

-	if($this->underline && $txt!='')

-		$s .= ' '.$this->_dounderline($x,$y,$txt);

-	if($this->ColorFlag)

+	$s = sprintf('BT %.2F %.2F Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->_escape($txt));

+	if ($this->underline && $txt != '')

+		$s .= ' '.$this->_dounderline($x, $y, $txt);

+	if ($this->ColorFlag)

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

 	$this->_out($s);

 }

@@ -607,100 +607,100 @@ 
 	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

 		$this->x += $w;

 }

 

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

@@ -709,11 +709,11 @@ 
 		else

 		{

 			$b2 = '';

-			if(strpos($border,'L')!==false)

+			if (strpos($border, 'L') !== false)

 				$b2 .= 'L';

-			if(strpos($border,'R')!==false)

+			if (strpos($border, 'R') !== false)

 				$b2 .= 'R';

-			$b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;

+			$b = (strpos($border, 'T') !== false) ? $b2.'T' : $b2;

 		}

 	}

 	$sep = -1;

@@ -722,153 +722,153 @@ 
 	$l = 0;

 	$ns = 0;

 	$nl = 1;

-	while($i<$nb)

+	while ($i < $nb)

 	{

 		// Get next character

 		$c = $s[$i];

-		if($c=="\n")

+		if ($c == "\n")

 		{

 			// Explicit line break

-			if($this->ws>0)

+			if ($this->ws > 0)

 			{

 				$this->ws = 0;

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

 			}

-			$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+			$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

 			$i++;

 			$sep = -1;

 			$j = $i;

 			$l = 0;

 			$ns = 0;

 			$nl++;

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

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

 				$b = $b2;

 			continue;

 		}

-		if($c==' ')

+		if ($c == ' ')

 		{

 			$sep = $i;

 			$ls = $l;

 			$ns++;

 		}

 		$l += $cw[$c];

-		if($l>$wmax)

+		if ($l > $wmax)

 		{

 			// Automatic line break

-			if($sep==-1)

+			if ($sep == -1)

 			{

-				if($i==$j)

+				if ($i == $j)

 					$i++;

-				if($this->ws>0)

+				if ($this->ws > 0)

 				{

 					$this->ws = 0;

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

 				}

-				$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+				$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

 			}

 			else

 			{

-				if($align=='J')

+				if ($align == 'J')

 				{

-					$this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;

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

+					$this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0;

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

 				}

-				$this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);

-				$i = $sep+1;

+				$this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);

+				$i = $sep + 1;

 			}

 			$sep = -1;

 			$j = $i;

 			$l = 0;

 			$ns = 0;

 			$nl++;

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

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

 				$b = $b2;

 		}

 		else

 			$i++;

 	}

 	// Last chunk

-	if($this->ws>0)

+	if ($this->ws > 0)

 	{

 		$this->ws = 0;

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

 	}

-	if($border && strpos($border,'B')!==false)

+	if ($border && strpos($border, 'B') !== false)

 		$b .= 'B';

-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+	$this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

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

 }

 

-function Write($h, $txt, $link='')

+function Write($h, $txt, $link = '')

 {

 	// Output text in flowing mode

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

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

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

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

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

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

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

 	$nb = strlen($s);

 	$sep = -1;

 	$i = 0;

 	$j = 0;

 	$l = 0;

 	$nl = 1;

-	while($i<$nb)

+	while ($i < $nb)

 	{

 		// Get next character

 		$c = $s[$i];

-		if($c=="\n")

+		if ($c == "\n")

 		{

 			// Explicit line break

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

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

 			$i++;

 			$sep = -1;

 			$j = $i;

 			$l = 0;

-			if($nl==1)

+			if ($nl == 1)

 			{

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

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

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

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

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

 			}

 			$nl++;

 			continue;

 		}

-		if($c==' ')

+		if ($c == ' ')

 			$sep = $i;

 		$l += $cw[$c];

-		if($l>$wmax)

+		if ($l > $wmax)

 		{

 			// Automatic line break

-			if($sep==-1)

+			if ($sep == -1)

 			{

-				if($this->x>$this->lMargin)

+				if ($this->x > $this->lMargin)

 				{

 					// Move to next line

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

 					$this->y += $h;

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

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

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

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

 					$i++;

 					$nl++;

 					continue;

 				}

-				if($i==$j)

+				if ($i == $j)

 					$i++;

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

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

 			}

 			else

 			{

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

-				$i = $sep+1;

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

+				$i = $sep + 1;

 			}

 			$sep = -1;

 			$j = $i;

 			$l = 0;

-			if($nl==1)

+			if ($nl == 1)

 			{

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

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

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

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

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

 			}

 			$nl++;

 		}

@@ -876,81 +876,81 @@ 
 			$i++;

 	}

 	// Last chunk

-	if($i!=$j)

-		$this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);

+	if ($i != $j)

+		$this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', 0, $link);

 }

 

-function Ln($h=null)

+function Ln($h = null)

 {

 	// Line feed; default value is last cell height

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

-	if($h===null)

+	if ($h === null)

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

 	else

 		$this->y += $h;

 }

 

-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')

+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')

 {

 	// Put an image on the page

-	if(!isset($this->images[$file]))

+	if ( ! isset($this->images[$file]))

 	{

 		// First use of this image, get info

-		if($type=='')

+		if ($type == '')

 		{

-			$pos = strrpos($file,'.');

-			if(!$pos)

+			$pos = strrpos($file, '.');

+			if ( ! $pos)

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

-			$type = substr($file,$pos+1);

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

 		}

 		$type = strtolower($type);

-		if($type=='jpeg')

+		if ($type == 'jpeg')

 			$type = 'jpg';

 		$mtd = '_parse'.$type;

-		if(!method_exists($this,$mtd))

+		if ( ! method_exists($this, $mtd))

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

 		$info = $this->$mtd($file);

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

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

 		$this->images[$file] = $info;

 	}

 	else

 		$info = $this->images[$file];

 

 	// Automatic width and height calculation if needed

-	if($w==0 && $h==0)

+	if ($w == 0 && $h == 0)

 	{

 		// Put image at 96 dpi

 		$w = -96;

 		$h = -96;

 	}

-	if($w<0)

-		$w = -$info['w']*72/$w/$this->k;

-	if($h<0)

-		$h = -$info['h']*72/$h/$this->k;

-	if($w==0)

-		$w = $h*$info['w']/$info['h'];

-	if($h==0)

-		$h = $w*$info['h']/$info['w'];

+	if ($w < 0)

+		$w = -$info['w'] * 72 / $w / $this->k;

+	if ($h < 0)

+		$h = -$info['h'] * 72 / $h / $this->k;

+	if ($w == 0)

+		$w = $h * $info['w'] / $info['h'];

+	if ($h == 0)

+		$h = $w * $info['h'] / $info['w'];

 

 	// Flowing mode

-	if($y===null)

+	if ($y === null)

 	{

-		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

 			$x2 = $this->x;

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

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

 			$this->x = $x2;

 		}

 		$y = $this->y;

 		$this->y += $h;

 	}

 

-	if($x===null)

+	if ($x === null)

 		$x = $this->x;

-	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));

-	if($link)

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

+	$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));

+	if ($link)

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

 }

 

 function GetX()

@@ -962,10 +962,10 @@ 
 function SetX($x)

 {

 	// Set x position

-	if($x>=0)

+	if ($x >= 0)

 		$this->x = $x;

 	else

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

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

 }

 

 function GetY()

@@ -978,10 +978,10 @@ 
 {

 	// Set y position and reset x

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

-	if($y>=0)

+	if ($y >= 0)

 		$this->y = $y;

 	else

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

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

 }

 

 function SetXY($x, $y)

@@ -991,15 +991,15 @@ 
 	$this->SetX($x);

 }

 

-function Output($name='', $dest='')

+function Output($name = '', $dest = '')

 {

 	// Output PDF to some destination

-	if($this->state<3)

+	if ($this->state < 3)

 		$this->Close();

 	$dest = strtoupper($dest);

-	if($dest=='')

+	if ($dest == '')

 	{

-		if($name=='')

+		if ($name == '')

 		{

 			$name = 'doc.pdf';

 			$dest = 'I';

@@ -1007,12 +1007,12 @@ 
 		else

 			$dest = 'F';

 	}

-	switch($dest)

+	switch ($dest)

 	{

 		case 'I':

 			// Send to standard output

 			$this->_checkoutput();

-			if(PHP_SAPI!='cli')

+			if (PHP_SAPI != 'cli')

 			{

 				// We send to a browser

 				header('Content-Type: application/pdf');

@@ -1034,10 +1034,10 @@ 
 			break;

 		case 'F':

 			// Save to local file

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

-			if(!$f)

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

+			if ( ! $f)

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

-			fwrite($f,$this->buffer,strlen($this->buffer));

+			fwrite($f, $this->buffer, strlen($this->buffer));

 			fclose($f);

 			break;

 		case 'S':

@@ -1057,27 +1057,27 @@ 
 function _dochecks()

 {

 	// Check availability of %F

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

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

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

 	// Check mbstring overloading

-	if(ini_get('mbstring.func_overload') & 2)

+	if (ini_get('mbstring.func_overload') & 2)

 		$this->Error('mbstring overloading must be disabled');

 	// Ensure runtime magic quotes are disabled

-	if(get_magic_quotes_runtime())

+	if (get_magic_quotes_runtime())

 		@set_magic_quotes_runtime(0);

 }

 

 function _checkoutput()

 {

-	if(PHP_SAPI!='cli')

+	if (PHP_SAPI != 'cli')

 	{

-		if(headers_sent($file,$line))

+		if (headers_sent($file, $line))

 			$this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");

 	}

-	if(ob_get_length())

+	if (ob_get_length())

 	{

 		// The output buffer is not empty

-		if(preg_match('/^(\xEF\xBB\xBF)?\s*$/',ob_get_contents()))

+		if (preg_match('/^(\xEF\xBB\xBF)?\s*$/', ob_get_contents()))

 		{

 			// It contains only a UTF-8 BOM and/or whitespace, let's clean it

 			ob_clean();

@@ -1089,17 +1089,17 @@ 
 

 function _getpagesize($size)

 {

-	if(is_string($size))

+	if (is_string($size))

 	{

 		$size = strtolower($size);

-		if(!isset($this->StdPageSizes[$size]))

+		if ( ! isset($this->StdPageSizes[$size]))

 			$this->Error('Unknown page size: '.$size);

 		$a = $this->StdPageSizes[$size];

-		return array($a[0]/$this->k, $a[1]/$this->k);

+		return array($a[0] / $this->k, $a[1] / $this->k);

 	}

 	else

 	{

-		if($size[0]>$size[1])

+		if ($size[0] > $size[1])

 			return array($size[1], $size[0]);

 		else

 			return $size;

@@ -1115,18 +1115,18 @@ 
 	$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];

@@ -1136,13 +1136,13 @@ 
 			$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);

 }

 

@@ -1156,7 +1156,7 @@ 
 	// Load a font definition file from the font directory

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

 	$a = get_defined_vars();

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

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

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

 	return $a;

 }

@@ -1164,10 +1164,10 @@ 
 function _escape($s)

 {

 	// Escape special characters in strings

-	$s = str_replace('\\','\\\\',$s);

-	$s = str_replace('(','\\(',$s);

-	$s = str_replace(')','\\)',$s);

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

+	$s = str_replace('\\', '\\\\', $s);

+	$s = str_replace('(', '\\(', $s);

+	$s = str_replace(')', '\\)', $s);

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

 	return $s;

 }

 

@@ -1183,23 +1183,23 @@ 
 	$res = "\xFE\xFF";

 	$nb = strlen($s);

 	$i = 0;

-	while($i<$nb)

+	while ($i < $nb)

 	{

 		$c1 = ord($s[$i++]);

-		if($c1>=224)

+		if ($c1 >= 224)

 		{

 			// 3-byte character

 			$c2 = ord($s[$i++]);

 			$c3 = ord($s[$i++]);

-			$res .= chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));

-			$res .= chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));

+			$res .= chr((($c1 & 0x0F) << 4) + (($c2 & 0x3C) >> 2));

+			$res .= chr((($c2 & 0x03) << 6) + ($c3 & 0x3F));

 		}

-		elseif($c1>=192)

+		elseif ($c1 >= 192)

 		{

 			// 2-byte character

 			$c2 = ord($s[$i++]);

-			$res .= chr(($c1 & 0x1C)>>2);

-			$res .= chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));

+			$res .= chr(($c1 & 0x1C) >> 2);

+			$res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F));

 		}

 		else

 		{

@@ -1215,21 +1215,21 @@ 
 	// Underline text

 	$up = $this->CurrentFont['up'];

 	$ut = $this->CurrentFont['ut'];

-	$w = $this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');

-	return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);

+	$w = $this->GetStringWidth($txt) + $this->ws * substr_count($txt, ' ');

+	return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);

 }

 

 function _parsejpg($file)

 {

 	// Extract info from a JPEG file

 	$a = getimagesize($file);

-	if(!$a)

+	if ( ! $a)

 		$this->Error('Missing or incorrect image file: '.$file);

-	if($a[2]!=2)

+	if ($a[2] != 2)

 		$this->Error('Not a JPEG file: '.$file);

-	if(!isset($a['channels']) || $a['channels']==3)

+	if ( ! isset($a['channels']) || $a['channels'] == 3)

 		$colspace = 'DeviceRGB';

-	elseif($a['channels']==4)

+	elseif ($a['channels'] == 4)

 		$colspace = 'DeviceCMYK';

 	else

 		$colspace = 'DeviceGray';

@@ -1241,10 +1241,10 @@ 
 function _parsepng($file)

 {

 	// Extract info from a PNG file

-	$f = fopen($file,'rb');

-	if(!$f)

+	$f = fopen($file, 'rb');

+	if ( ! $f)

 		$this->Error('Can\'t open image file: '.$file);

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

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

 	fclose($f);

 	return $info;

 }

@@ -1252,35 +1252,35 @@ 
 function _parsepngstream($f, $file)

 {

 	// Check signature

-	if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

+	if ($this->_readstream($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))

 		$this->Error('Not a PNG file: '.$file);

 

 	// Read header chunk

-	$this->_readstream($f,4);

-	if($this->_readstream($f,4)!='IHDR')

+	$this->_readstream($f, 4);

+	if ($this->_readstream($f, 4) != 'IHDR')

 		$this->Error('Incorrect PNG file: '.$file);

 	$w = $this->_readint($f);

 	$h = $this->_readint($f);

-	$bpc = ord($this->_readstream($f,1));

-	if($bpc>8)

+	$bpc = ord($this->_readstream($f, 1));

+	if ($bpc > 8)

 		$this->Error('16-bit depth not supported: '.$file);

-	$ct = ord($this->_readstream($f,1));

-	if($ct==0 || $ct==4)

+	$ct = ord($this->_readstream($f, 1));

+	if ($ct == 0 || $ct == 4)

 		$colspace = 'DeviceGray';

-	elseif($ct==2 || $ct==6)

+	elseif ($ct == 2 || $ct == 6)

 		$colspace = 'DeviceRGB';

-	elseif($ct==3)

+	elseif ($ct == 3)

 		$colspace = 'Indexed';

 	else

 		$this->Error('Unknown color type: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Unknown compression method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Unknown filter method: '.$file);

-	if(ord($this->_readstream($f,1))!=0)

+	if (ord($this->_readstream($f, 1)) != 0)

 		$this->Error('Interlacing not supported: '.$file);

-	$this->_readstream($f,4);

-	$dp = '/Predictor 15 /Colors '.($colspace=='DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;

+	$this->_readstream($f, 4);

+	$dp = '/Predictor 15 /Colors '.($colspace == 'DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;

 

 	// Scan chunks looking for palette, transparency and image data

 	$pal = '';

@@ -1289,85 +1289,85 @@ 
 	do

 	{

 		$n = $this->_readint($f);

-		$type = $this->_readstream($f,4);

-		if($type=='PLTE')

+		$type = $this->_readstream($f, 4);

+		if ($type == 'PLTE')

 		{

 			// Read palette

-			$pal = $this->_readstream($f,$n);

-			$this->_readstream($f,4);

+			$pal = $this->_readstream($f, $n);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='tRNS')

+		elseif ($type == 'tRNS')

 		{

 			// Read transparency info

-			$t = $this->_readstream($f,$n);

-			if($ct==0)

-				$trns = array(ord(substr($t,1,1)));

-			elseif($ct==2)

-				$trns = array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));

+			$t = $this->_readstream($f, $n);

+			if ($ct == 0)

+				$trns = array(ord(substr($t, 1, 1)));

+			elseif ($ct == 2)

+				$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));

 			else

 			{

-				$pos = strpos($t,chr(0));

-				if($pos!==false)

+				$pos = strpos($t, chr(0));

+				if ($pos !== false)

 					$trns = array($pos);

 			}

-			$this->_readstream($f,4);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='IDAT')

+		elseif ($type == 'IDAT')

 		{

 			// Read image data block

-			$data .= $this->_readstream($f,$n);

-			$this->_readstream($f,4);

+			$data .= $this->_readstream($f, $n);

+			$this->_readstream($f, 4);

 		}

-		elseif($type=='IEND')

+		elseif ($type == 'IEND')

 			break;

 		else

-			$this->_readstream($f,$n+4);

+			$this->_readstream($f, $n + 4);

 	}

-	while($n);

+	while ($n);

 

-	if($colspace=='Indexed' && empty($pal))

+	if ($colspace == 'Indexed' && empty($pal))

 		$this->Error('Missing palette in '.$file);

 	$info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);

-	if($ct>=4)

+	if ($ct >= 4)

 	{

 		// Extract alpha channel

-		if(!function_exists('gzuncompress'))

+		if ( ! function_exists('gzuncompress'))

 			$this->Error('Zlib not available, can\'t handle alpha channel: '.$file);

 		$data = gzuncompress($data);

 		$color = '';

 		$alpha = '';

-		if($ct==4)

+		if ($ct == 4)

 		{

 			// Gray image

-			$len = 2*$w;

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

+			$len = 2 * $w;

+			for ($i = 0; $i < $h; $i++)

 			{

-				$pos = (1+$len)*$i;

+				$pos = (1 + $len) * $i;

 				$color .= $data[$pos];

 				$alpha .= $data[$pos];

-				$line = substr($data,$pos+1,$len);

-				$color .= preg_replace('/(.)./s','$1',$line);

-				$alpha .= preg_replace('/.(.)/s','$1',$line);

+				$line = substr($data, $pos + 1, $len);

+				$color .= preg_replace('/(.)./s', '$1', $line);

+				$alpha .= preg_replace('/.(.)/s', '$1', $line);

 			}

 		}

 		else

 		{

 			// RGB image

-			$len = 4*$w;

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

+			$len = 4 * $w;

+			for ($i = 0; $i < $h; $i++)

 			{

-				$pos = (1+$len)*$i;

+				$pos = (1 + $len) * $i;

 				$color .= $data[$pos];

 				$alpha .= $data[$pos];

-				$line = substr($data,$pos+1,$len);

-				$color .= preg_replace('/(.{3})./s','$1',$line);

-				$alpha .= preg_replace('/.{3}(.)/s','$1',$line);

+				$line = substr($data, $pos + 1, $len);

+				$color .= preg_replace('/(.{3})./s', '$1', $line);

+				$alpha .= preg_replace('/.{3}(.)/s', '$1', $line);

 			}

 		}

 		unset($data);

 		$data = gzcompress($color);

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

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

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

 			$this->PDFVersion = '1.4';

 	}

 	$info['data'] = $data;

@@ -1378,15 +1378,15 @@ 
 {

 	// Read n bytes from stream

 	$res = '';

-	while($n>0 && !feof($f))

+	while ($n > 0 && ! feof($f))

 	{

-		$s = fread($f,$n);

-		if($s===false)

+		$s = fread($f, $n);

+		if ($s === false)

 			$this->Error('Error while reading stream');

 		$n -= strlen($s);

 		$res .= $s;

 	}

-	if($n>0)

+	if ($n > 0)

 		$this->Error('Unexpected end of stream');

 	return $res;

 }

@@ -1394,41 +1394,41 @@ 
 function _readint($f)

 {

 	// Read a 4-byte integer from stream

-	$a = unpack('Ni',$this->_readstream($f,4));

+	$a = unpack('Ni', $this->_readstream($f, 4));

 	return $a['i'];

 }

 

 function _parsegif($file)

 {

 	// Extract info from a GIF file (via PNG conversion)

-	if(!function_exists('imagepng'))

+	if ( ! function_exists('imagepng'))

 		$this->Error('GD extension is required for GIF support');

-	if(!function_exists('imagecreatefromgif'))

+	if ( ! function_exists('imagecreatefromgif'))

 		$this->Error('GD has no GIF read support');

 	$im = imagecreatefromgif($file);

-	if(!$im)

+	if ( ! $im)

 		$this->Error('Missing or incorrect image file: '.$file);

-	imageinterlace($im,0);

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

-	if($f)

+	imageinterlace($im, 0);

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

+	if ($f)

 	{

 		// Perform conversion in memory

 		ob_start();

 		imagepng($im);

 		$data = ob_get_clean();

 		imagedestroy($im);

-		fwrite($f,$data);

+		fwrite($f, $data);

 		rewind($f);

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

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

 		fclose($f);

 	}

 	else

 	{

 		// Use temporary file

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

-		if(!$tmp)

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

+		if ( ! $tmp)

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

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

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

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

 		imagedestroy($im);

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

@@ -1455,7 +1455,7 @@ 
 function _out($s)

 {

 	// Add a line to the document

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

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

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

 	else

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

@@ -1464,54 +1464,54 @@ 
 function _putpages()

 {

 	$nb = $this->page;

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

+	if ( ! empty($this->AliasNbPages))

 	{

 		// Replace number of pages

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

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

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

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

 	}

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

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

 	{

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

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

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

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

 	}

 	else

 	{

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

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

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

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

 	}

 	$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';

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

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

 	{

 		// Page

 		$this->_newobj();

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

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

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

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

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

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

 		$this->_out('/Resources 2 0 R');

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

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

 		{

 			// Links

 			$annots = '/Annots [';

-			foreach($this->PageLinks[$n] as $pl)

+			foreach ($this->PageLinks[$n] as $pl)

 			{

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

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

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

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

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

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

 				else

 				{

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

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

-					$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);

+					$annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', 1 + 2 * $l[0], $h - $l[1] * $this->k);

 				}

 			}

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

 		}

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

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

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

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

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

 		$this->_out('endobj');

 		// Page content

 		$p = ($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];

@@ -1525,11 +1525,11 @@ 
 	$this->_out('1 0 obj');

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

 	$kids = '/Kids [';

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

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

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

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

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

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

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

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

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

 	$this->_out('endobj');

 }

@@ -1537,53 +1537,53 @@ 
 function _putfonts()

 {

 	$nf = $this->n;

-	foreach($this->diffs as $diff)

+	foreach ($this->diffs as $diff)

 	{

 		// Encodings

 		$this->_newobj();

 		$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');

 		$this->_out('endobj');

 	}

-	foreach($this->FontFiles as $file=>$info)

+	foreach ($this->FontFiles as $file=>$info)

 	{

 		// Font file embedding

 		$this->_newobj();

 		$this->FontFiles[$file]['n'] = $this->n;

-		$font = file_get_contents($this->fontpath.$file,true);

-		if(!$font)

+		$font = file_get_contents($this->fontpath.$file, true);

+		if ( ! $font)

 			$this->Error('Font file not found: '.$file);

-		$compressed = (substr($file,-2)=='.z');

-		if(!$compressed && isset($info['length2']))

-			$font = substr($font,6,$info['length1']).substr($font,6+$info['length1']+6,$info['length2']);

+		$compressed = (substr($file, -2) == '.z');

+		if ( ! $compressed && isset($info['length2']))

+			$font = substr($font, 6, $info['length1']).substr($font, 6 + $info['length1'] + 6, $info['length2']);

 		$this->_out('<</Length '.strlen($font));

-		if($compressed)

+		if ($compressed)

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

 		$this->_out('/Length1 '.$info['length1']);

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

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

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

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

 		$this->_putstream($font);

 		$this->_out('endobj');

 	}

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

+	foreach ($this->fonts as $k=>$font)

 	{

 		// Font objects

-		$this->fonts[$k]['n'] = $this->n+1;

+		$this->fonts[$k]['n'] = $this->n + 1;

 		$type = $font['type'];

 		$name = $font['name'];

-		if($type=='Core')

+		if ($type == 'Core')

 		{

 			// Core font

 			$this->_newobj();

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

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

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

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

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

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

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

 			$this->_out('endobj');

 		}

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

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

 		{

 			// Additional Type1 or TrueType/OpenType font

 			$this->_newobj();

@@ -1591,10 +1591,10 @@ 
 			$this->_out('/BaseFont /'.$name);

 			$this->_out('/Subtype /'.$type);

 			$this->_out('/FirstChar 32 /LastChar 255');

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

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

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

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

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

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

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

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

 			else

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

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

@@ -1603,17 +1603,17 @@ 
 			$this->_newobj();

 			$cw = &$font['cw'];

 			$s = '[';

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

+			for ($i = 32; $i <= 255; $i++)

 				$s .= $cw[chr($i)].' ';

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

 			$this->_out('endobj');

 			// Descriptor

 			$this->_newobj();

 			$s = '<</Type /FontDescriptor /FontName /'.$name;

-			foreach($font['desc'] as $k=>$v)

+			foreach ($font['desc'] as $k=>$v)

 				$s .= ' /'.$k.' '.$v;

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

-				$s .= ' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';

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

+				$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';

 			$this->_out($s.'>>');

 			$this->_out('endobj');

 		}

@@ -1621,7 +1621,7 @@ 
 		{

 			// Allow for additional types

 			$mtd = '_put'.strtolower($type);

-			if(!method_exists($this,$mtd))

+			if ( ! method_exists($this, $mtd))

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

 			$this->$mtd($font);

 		}

@@ -1630,7 +1630,7 @@ 
 

 function _putimages()

 {

-	foreach(array_keys($this->images) as $file)

+	foreach (array_keys($this->images) as $file)

 	{

 		$this->_putimage($this->images[$file]);

 		unset($this->images[$file]['data']);

@@ -1646,40 +1646,40 @@ 
 	$this->_out('/Subtype /Image');

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

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

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

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

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

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

 	else

 	{

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

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

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

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

 	}

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

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

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

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

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

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

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

-	if(isset($info['trns']) && is_array($info['trns']))

+	if (isset($info['trns']) && is_array($info['trns']))

 	{

 		$trns = '';

-		for($i=0;$i<count($info['trns']);$i++)

+		for ($i = 0; $i < count($info['trns']); $i++)

 			$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';

 		$this->_out('/Mask ['.$trns.']');

 	}

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

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

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

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

 	$this->_out('/Length '.strlen($info['data']).'>>');

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

 	$this->_out('endobj');

 	// Soft mask

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

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

 	{

 		$dp = '/Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$info['w'];

 		$smask = array('w'=>$info['w'], 'h'=>$info['h'], 'cs'=>'DeviceGray', 'bpc'=>8, 'f'=>$info['f'], 'dp'=>$dp, 'data'=>$info['smask']);

 		$this->_putimage($smask);

 	}

 	// Palette

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

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

 	{

 		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';

 		$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];

@@ -1692,7 +1692,7 @@ 
 

 function _putxobjectdict()

 {

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

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

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

 }

 

@@ -1700,7 +1700,7 @@ 
 {

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

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

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

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

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

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

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

@@ -1724,15 +1724,15 @@ 
 function _putinfo()

 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 	$this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));

 }

@@ -1741,19 +1741,19 @@ 
 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 }

 

@@ -1764,9 +1764,9 @@ 
 

 function _puttrailer()

 {

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

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

 	$this->_out('/Root '.$this->n.' 0 R');

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

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

 }

 

 function _enddoc()

@@ -1789,10 +1789,10 @@ 
 	// Cross-ref

 	$o = strlen($this->buffer);

 	$this->_out('xref');

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

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

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

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

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

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

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

 	// Trailer

 	$this->_out('trailer');

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

@@ -1807,7 +1807,7 @@ 
 }

 

 // Handle special IE contype request

-if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')

+if (isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'contype')

 {

 	header('Content-Type: application/pdf');

 	exit;

web_interface/astpp/system/libraries/Form_validation.php

Spacing +64 added lines, -64 removed lines

@@ -27,21 +27,21 @@ 
 class CI_Form_validation {
 
 	protected $CI;
-	protected $_field_data			= array();
+	protected $_field_data = array();
 	protected $_config_rules		= array();
 	protected $_error_array			= array();
-	protected $_error_messages		= array();
+	protected $_error_messages = array();
 	protected $_error_prefix		= '<p>';
 	protected $_error_suffix		= '</p>';
 	protected $error_string			= '';
-	protected $_safe_form_data		= FALSE;
+	protected $_safe_form_data = FALSE;
 
 	/**
 	 * Constructor
 	 */
 	public function __construct($rules = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// Validation rules can be stored in a config file.
 		$this->_config_rules = $rules;
@@ -101,7 +101,7 @@ 
 		}
 
 		// No fields? Nothing to do...
-		if ( ! is_string($field) OR  ! is_string($rules) OR $field == '')
+		if ( ! is_string($field) OR ! is_string($rules) OR $field == '')
 		{
 			return $this;
 		}
@@ -131,8 +131,8 @@ 
 		}
 		else
 		{
-			$indexes	= array();
-			$is_array	= FALSE;
+			$indexes = array();
+			$is_array = FALSE;
 		}
 
 		// Build our master array
@@ -412,7 +412,7 @@ 
 			{
 				if (isset($array[$keys[$i]]))
 				{
-					$array = $this->_reduce_array($array[$keys[$i]], $keys, ($i+1));
+					$array = $this->_reduce_array($array[$keys[$i]], $keys, ($i + 1));
 				}
 				else
 				{
@@ -452,18 +452,18 @@ 
 				else
 				{
 					// start with a reference
-					$post_ref =& $_POST;
+					$post_ref = & $_POST;
 
 					// before we assign values, make a reference to the right POST key
 					if (count($row['keys']) == 1)
 					{
-						$post_ref =& $post_ref[current($row['keys'])];
+						$post_ref = & $post_ref[current($row['keys'])];
 					}
 					else
 					{
 						foreach ($row['keys'] as $val)
 						{
-							$post_ref =& $post_ref[$val];
+							$post_ref = & $post_ref[$val];
 						}
 					}
 
@@ -500,8 +500,8 @@ 
 	 */
 	protected function _execute($row, $rules, $postdata = NULL, $cycles = 0)
 	{
-	$custom_label=explode("<",$row['label']);
-	$row['label']=(isset($custom_label[1]) && !empty($custom_label[1])) ? $custom_label[0] : $row['label'];
+	$custom_label = explode("<", $row['label']);
+	$row['label'] = (isset($custom_label[1]) && ! empty($custom_label[1])) ? $custom_label[0] : $row['label'];
 		// If the $_POST data is an array we will run a recursive call
 		if (is_array($postdata))
 		{
@@ -518,7 +518,7 @@ 
 
 		// If the field is blank, but NOT required, no further tests are necessary
 		$callback = FALSE;
-		if ( (! in_array('required', $rules) AND ! in_array('dropdown', $rules)) AND is_null($postdata))
+		if (( ! in_array('required', $rules) AND ! in_array('dropdown', $rules)) AND is_null($postdata))
 		{
 			// Before we bail out, does the rule contain a callback?
 			if (preg_match("/(callback_\w+(\[.*?\])?)/", implode(' ', $rules), $match))
@@ -541,7 +541,7 @@ 
 			
 				// Set the message type
                             
-				$type = (in_array('required', $rules)) ? 'required' : ((in_array('dropdown',$rules)) ? 'dropdown':'isset' );
+				$type = (in_array('required', $rules)) ? 'required' : ((in_array('dropdown', $rules)) ? 'dropdown' : 'isset');
 				if ( ! isset($this->_error_messages[$type]))
 				{
 					if (FALSE === ($line = $this->CI->lang->line($type)))
@@ -610,7 +610,7 @@ 
 			if (preg_match("/(.*?)\[(.*)\]/", $rule, $match))
 			{
 				$rule	= $match[1];
-				$param	= $match[2];
+				$param = $match[2];
 			}
 
 			// Call the function that corresponds to the rule
@@ -648,13 +648,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);
 
@@ -990,20 +990,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;
          }
 
@@ -1190,7 +1190,7 @@ 
 	 */
 	public function numeric($str)
 	{
-		return (bool)preg_match( '/^[\-+]?[0-9]*\.?[0-9]+$/', $str);
+		return (bool)preg_match('/^[\-+]?[0-9]*\.?[0-9]+$/', $str);
 
 	}
 
@@ -1219,7 +1219,7 @@ 
 	 */
 	public function integer($str)
 	{
-		return (bool) preg_match('/^[\-+]?[0-9]+$/', $str);
+		return (bool)preg_match('/^[\-+]?[0-9]+$/', $str);
 	}
 
 	// --------------------------------------------------------------------
@@ -1233,7 +1233,7 @@ 
 	 */
 	public function decimal($str)
 	{
-		return (bool) preg_match('/^[\-+]?[0-9]+\.[0-9]+$/', $str);
+		return (bool)preg_match('/^[\-+]?[0-9]+\.[0-9]+$/', $str);
 	}
 
 	// --------------------------------------------------------------------
@@ -1283,7 +1283,7 @@ 
 	 */
 	public function is_natural($str)
 	{
-		return (bool) preg_match( '/^[0-9]+$/', $str);
+		return (bool)preg_match('/^[0-9]+$/', $str);
 	}
 
 	// --------------------------------------------------------------------
@@ -1297,7 +1297,7 @@ 
 	 */
 	public function is_natural_no_zero($str)
 	{
-		if ( ! preg_match( '/^[0-9]+$/', $str))
+		if ( ! preg_match('/^[0-9]+$/', $str))
 		{
 			return FALSE;
 		}
@@ -1324,7 +1324,7 @@ 
 	 */
 	public function valid_base64($str)
 	{
-		return (bool) ! preg_match('/[^a-zA-Z0-9\/\+=]/', $str);
+		return (bool)! preg_match('/[^a-zA-Z0-9\/\+=]/', $str);
 	}
 
 	// --------------------------------------------------------------------
@@ -1422,7 +1422,7 @@ 
 	 */
 	public function encode_php_tags($str)
 	{
-		return str_replace(array('<?php', '<?PHP', '<?', '?>'),  array('&lt;?php', '&lt;?PHP', '&lt;?', '?&gt;'), $str);
+		return str_replace(array('<?php', '<?PHP', '<?', '?>'), array('&lt;?php', '&lt;?PHP', '&lt;?', '?&gt;'), $str);
 	}
 	         public function destination($str)
         {
@@ -1436,54 +1436,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/Calendar.php

Spacing +18 added lines, -18 removed lines

@@ -32,11 +32,11 @@ 
 	var $lang;
 	var $local_time;
 	var $template		= '';
-	var $start_day		= 'sunday';
-	var $month_type		= 'long';
+	var $start_day = 'sunday';
+	var $month_type = 'long';
 	var $day_type		= 'abr';
-	var $show_next_prev	= FALSE;
-	var $next_prev_url	= '';
+	var $show_next_prev = FALSE;
+	var $next_prev_url = '';
 
 	/**
 	 * Constructor
@@ -45,7 +45,7 @@ 
 	 */
 	public function __construct($config = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		if ( ! in_array('calendar_lang.php', $this->CI->lang->is_loaded, TRUE))
 		{
@@ -115,8 +115,8 @@ 
 
 		$adjusted_date = $this->adjust_date($month, $year);
 
-		$month	= $adjusted_date['month'];
-		$year	= $adjusted_date['year'];
+		$month = $adjusted_date['month'];
+		$year = $adjusted_date['year'];
 
 		// Determine the total days in the month
 		$total_days = $this->get_total_days($month, $year);
@@ -137,9 +137,9 @@ 
 
 		// Set the current month/year/day
 		// We use this to determine the "today" date
-		$cur_year	= date("Y", $this->local_time);
-		$cur_month	= date("m", $this->local_time);
-		$cur_day	= date("j", $this->local_time);
+		$cur_year = date("Y", $this->local_time);
+		$cur_month = date("m", $this->local_time);
+		$cur_day = date("j", $this->local_time);
 
 		$is_current_month = ($cur_year == $year AND $cur_month == $month) ? TRUE : FALSE;
 
@@ -158,7 +158,7 @@ 
 		if ($this->show_next_prev == TRUE)
 		{
 			// Add a trailing slash to the  URL if needed
-			$this->next_prev_url = preg_replace("/(.+?)\/*$/", "\\1/",  $this->next_prev_url);
+			$this->next_prev_url = preg_replace("/(.+?)\/*$/", "\\1/", $this->next_prev_url);
 
 			$adjusted_date = $this->adjust_date($month - 1, $year);
 			$out .= str_replace('{previous_url}', $this->next_prev_url.$adjusted_date['year'].'/'.$adjusted_date['month'], $this->temp['heading_previous_cell']);
@@ -192,9 +192,9 @@ 
 
 		$day_names = $this->get_day_names();
 
-		for ($i = 0; $i < 7; $i ++)
+		for ($i = 0; $i < 7; $i++)
 		{
-			$out .= str_replace('{week_day}', $day_names[($start_day + $i) %7], $this->temp['week_day_cell']);
+			$out .= str_replace('{week_day}', $day_names[($start_day + $i) % 7], $this->temp['week_day_cell']);
 		}
 
 		$out .= "\n";
@@ -338,8 +338,8 @@ 
 	{
 		$date = array();
 
-		$date['month']	= $month;
-		$date['year']	= $year;
+		$date['month'] = $month;
+		$date['year'] = $year;
 
 		while ($date['month'] > 12)
 		{
@@ -373,7 +373,7 @@ 
 	 */
 	function get_total_days($month, $year)
 	{
-		$days_in_month	= array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 		if ($month < 1 OR $month > 12)
 		{
@@ -404,7 +404,7 @@ 
 	 */
 	function default_template()
 	{
-		return  array (
+		return  array(
 						'table_open'				=> '<table border="0" cellpadding="4" cellspacing="0">',
 						'heading_row_start'			=> '<tr>',
 						'heading_previous_cell'		=> '<th><a href="{previous_url}">&lt;&lt;</a></th>',
@@ -451,7 +451,7 @@ 
 
 		$today = array('cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today');
 
-		foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content',  'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val)
+		foreach (array('table_open', 'table_close', 'heading_row_start', 'heading_previous_cell', 'heading_title_cell', 'heading_next_cell', 'heading_row_end', 'week_row_start', 'week_day_cell', 'week_row_end', 'cal_row_start', 'cal_cell_start', 'cal_cell_content', 'cal_cell_no_content', 'cal_cell_blank', 'cal_cell_end', 'cal_row_end', 'cal_cell_start_today', 'cal_cell_content_today', 'cal_cell_no_content_today', 'cal_cell_end_today') as $val)
 		{
 			if (preg_match("/\{".$val."\}(.*?)\{\/".$val."\}/si", $this->template, $match))
 			{

web_interface/astpp/system/libraries/Migration.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
 
 		foreach ($config as $key => $val)
 		{
-			$this->{'_' . $key} = $val;
+			$this->{'_'.$key} = $val;
 		}
 
 		log_message('debug', 'Migrations class initialized');
@@ -57,7 +57,7 @@ 
 		}
 
 		// If not set, set it
-		$this->_migration_path == '' OR $this->_migration_path = APPPATH . 'migrations/';
+		$this->_migration_path == '' OR $this->_migration_path = APPPATH.'migrations/';
 
 		// Add trailing slash if not set
 		$this->_migration_path = rtrim($this->_migration_path, '/').'/';
@@ -119,7 +119,7 @@ 
 		// But first let's make sure that everything is the way it should be
 		for ($i = $start; $i != $stop; $i += $step)
 		{
-			$f = glob(sprintf($this->_migration_path . '%03d_*.php', $i));
+			$f = glob(sprintf($this->_migration_path.'%03d_*.php', $i));
 
 			// Only one migration per step is permitted
 			if (count($f) > 1)
@@ -160,7 +160,7 @@ 
 				}
 
 				include $f[0];
-				$class = 'Migration_' . ucfirst($match[1]);
+				$class = 'Migration_'.ucfirst($match[1]);
 
 				if ( ! class_exists($class))
 				{
@@ -183,7 +183,7 @@ 
 			}
 		}
 
-		log_message('debug', 'Current migration: ' . $current_version);
+		log_message('debug', 'Current migration: '.$current_version);
 
 		$version = $i + ($step == 1 ? -1 : 0);
 
@@ -193,13 +193,13 @@ 
 			return TRUE;
 		}
 
-		log_message('debug', 'Migrating from ' . $method . ' to version ' . $version);
+		log_message('debug', 'Migrating from '.$method.' to version '.$version);
 
 		// Loop through the migrations
 		foreach ($migrations AS $migration)
 		{
 			// Run the migration class
-			$class = 'Migration_' . ucfirst(strtolower($migration));
+			$class = 'Migration_'.ucfirst(strtolower($migration));
 			call_user_func(array(new $class, $method));
 
 			$current_version += $step;
@@ -231,7 +231,7 @@ 
 		
 		// Calculate the last migration step from existing migration
 		// filenames and procceed to the standard version migration
-		return $this->version((int) substr($last_migration, 0, 3));
+		return $this->version((int)substr($last_migration, 0, 3));
 	}
 
 	// --------------------------------------------------------------------
@@ -271,7 +271,7 @@ 
 	protected function find_migrations()
 	{
 		// Load all *_*.php files in the migrations path
-		$files = glob($this->_migration_path . '*_*.php');
+		$files = glob($this->_migration_path.'*_*.php');
 		$file_count = count($files);
 		
 		for ($i = 0; $i < $file_count; $i++)

web_interface/astpp/system/libraries/Trackback.php

Spacing +25 added lines, -25 removed lines

@@ -28,12 +28,12 @@ 
  */
 class CI_Trackback {
 
-	var $time_format	= 'local';
-	var $charset		= 'UTF-8';
-	var $data			= array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
-	var $convert_ascii	= TRUE;
-	var $response		= '';
-	var $error_msg		= array();
+	var $time_format = 'local';
+	var $charset = 'UTF-8';
+	var $data = array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
+	var $convert_ascii = TRUE;
+	var $response = '';
+	var $error_msg = array();
 
 	/**
 	 * Constructor
@@ -251,12 +251,12 @@ 
 		}
 
 		// Transfer the data
-		fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" );
-		fputs ($fp, "Host: " . $target['host'] . "\r\n" );
-		fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" );
-		fputs ($fp, "Content-length: " . strlen($data) . "\r\n" );
-		fputs ($fp, "Connection: close\r\n\r\n" );
-		fputs ($fp, $data);
+		fputs($fp, "POST ".$path." HTTP/1.0\r\n");
+		fputs($fp, "Host: ".$target['host']."\r\n");
+		fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n");
+		fputs($fp, "Content-length: ".strlen($data)."\r\n");
+		fputs($fp, "Connection: close\r\n\r\n");
+		fputs($fp, $data);
 
 		// Was it successful?
 		$this->response = "";
@@ -359,30 +359,30 @@ 
 		if (strpos($url, '?') !== FALSE)
 		{
 			$tb_array = explode('/', $url);
-			$tb_end   = $tb_array[count($tb_array)-1];
+			$tb_end   = $tb_array[count($tb_array) - 1];
 
 			if ( ! is_numeric($tb_end))
 			{
-				$tb_end  = $tb_array[count($tb_array)-2];
+				$tb_end  = $tb_array[count($tb_array) - 2];
 			}
 
 			$tb_array = explode('=', $tb_end);
-			$tb_id	= $tb_array[count($tb_array)-1];
+			$tb_id = $tb_array[count($tb_array) - 1];
 		}
 		else
 		{
 			$url = rtrim($url, '/');
 
 			$tb_array = explode('/', $url);
-			$tb_id	= $tb_array[count($tb_array)-1];
+			$tb_id = $tb_array[count($tb_array) - 1];
 
 			if ( ! is_numeric($tb_id))
 			{
-				$tb_id  = $tb_array[count($tb_array)-2];
+				$tb_id = $tb_array[count($tb_array) - 2];
 			}
 		}
 
-		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
+		if ( ! preg_match("/^([0-9]+)$/", $tb_id))
 		{
 			return FALSE;
 		}
@@ -406,14 +406,14 @@ 
 		$temp = '__TEMP_AMPERSANDS__';
 
 		$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
-		$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
+		$str = preg_replace("/&(\w+);/", "$temp\\1;", $str);
 
-		$str = str_replace(array("&","<",">","\"", "'", "-"),
+		$str = str_replace(array("&", "<", ">", "\"", "'", "-"),
 							array("&amp;", "&lt;", "&gt;", "&quot;", "&#39;", "&#45;"),
 							$str);
 
-		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
-		$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+		$str = preg_replace("/$temp(\d+);/", "&#\\1;", $str);
+		$str = preg_replace("/$temp(\w+);/", "&\\1;", $str);
 
 		return $str;
 	}
@@ -470,9 +470,9 @@ 
 	 */
 	function convert_ascii($str)
 	{
-		$count	= 1;
-		$out	= '';
-		$temp	= array();
+		$count = 1;
+		$out = '';
+		$temp = array();
 
 		for ($i = 0, $s = strlen($str); $i < $s; $i++)
 		{

web_interface/astpp/system/libraries/Upload.php

Spacing +47 added lines, -47 removed lines

@@ -26,33 +26,33 @@ 
  */
 class CI_Upload {
 
-	public $max_size				= 0;
-	public $max_width				= 0;
-	public $max_height				= 0;
-	public $max_filename			= 0;
-	public $allowed_types			= "";
+	public $max_size = 0;
+	public $max_width = 0;
+	public $max_height = 0;
+	public $max_filename = 0;
+	public $allowed_types = "";
 	public $file_temp				= "";
 	public $file_name				= "";
 	public $orig_name				= "";
 	public $file_type				= "";
 	public $file_size				= "";
-	public $file_ext				= "";
+	public $file_ext = "";
 	public $upload_path				= "";
 	public $overwrite				= FALSE;
 	public $encrypt_name			= FALSE;
-	public $is_image				= FALSE;
+	public $is_image = FALSE;
 	public $image_width				= '';
 	public $image_height			= '';
-	public $image_type				= '';
-	public $image_size_str			= '';
+	public $image_type = '';
+	public $image_size_str = '';
 	public $error_msg				= array();
-	public $mimes					= array();
-	public $remove_spaces			= TRUE;
+	public $mimes = array();
+	public $remove_spaces = TRUE;
 	public $xss_clean				= FALSE;
 	public $temp_prefix				= "temp_file_";
 	public $client_name				= '';
 
-	protected $_file_name_override	= '';
+	protected $_file_name_override = '';
 
 	/**
 	 * Constructor
@@ -162,7 +162,7 @@ 
 		{
 			$error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
 
-			switch($error)
+			switch ($error)
 			{
 				case 1:	// UPLOAD_ERR_INI_SIZE
 					$this->set_error('upload_file_exceeds_limit');
@@ -224,7 +224,7 @@ 
 			// An extension was provided, lets have it!
 			else
 			{
-				$this->file_ext	 = $this->get_extension($this->_file_name_override);
+				$this->file_ext = $this->get_extension($this->_file_name_override);
 			}
 
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -237,7 +237,7 @@ 
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
-			$this->file_size = round($this->file_size/1024, 2);
+			$this->file_size = round($this->file_size / 1024, 2);
 		}
 
 		// Is the file size within the allowed maximum?
@@ -342,7 +342,7 @@ 
 	 */
 	public function data()
 	{
-		return array (
+		return array(
 						'file_name'			=> $this->file_name,
 						'file_type'			=> $this->file_type,
 						'file_path'			=> $this->upload_path,
@@ -433,7 +433,7 @@ 
 	 */
 	public function set_max_filesize($n)
 	{
-		$this->max_size = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_size = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -446,7 +446,7 @@ 
 	 */
 	public function set_max_filename($n)
 	{
-		$this->max_filename = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_filename = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -459,7 +459,7 @@ 
 	 */
 	public function set_max_width($n)
 	{
-		$this->max_width = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_width = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -472,7 +472,7 @@ 
 	 */
 	public function set_max_height($n)
 	{
-		$this->max_height = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_height = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -516,10 +516,10 @@ 
 			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
-				$this->image_width		= $D['0'];
-				$this->image_height		= $D['1'];
-				$this->image_type		= ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
-				$this->image_size_str	= $D['3'];  // string containing height and width
+				$this->image_width = $D['0'];
+				$this->image_height = $D['1'];
+				$this->image_type = ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
+				$this->image_size_str = $D['3']; // string containing height and width
 			}
 		}
 	}
@@ -643,7 +643,7 @@ 
 	 */
 	public function is_allowed_filesize()
 	{
-		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
+		if ($this->max_size != 0 AND $this->file_size > $this->max_size)
 		{
 			return FALSE;
 		}
@@ -722,7 +722,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
+		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/", $this->upload_path);
 		return TRUE;
 	}
 
@@ -765,17 +765,17 @@ 
 						'/',
 						"%20",
 						"%22",
-						"%3c",		// <
-						"%253c",	// <
-						"%3e",		// >
-						"%0e",		// >
-						"%28",		// (
-						"%29",		// )
-						"%2528",	// (
-						"%26",		// &
-						"%24",		// $
-						"%3f",		// ?
-						"%3b",		// ;
+						"%3c", // <
+						"%253c", // <
+						"%3e", // >
+						"%0e", // >
+						"%28", // (
+						"%29", // )
+						"%2528", // (
+						"%26", // &
+						"%24", // $
+						"%3f", // ?
+						"%3b", // ;
 						"%3d"		// =
 					);
 
@@ -802,9 +802,9 @@ 
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
+			$parts = explode('.', $filename);
+			$ext = '.'.array_pop($parts);
+			$filename = implode('.', $parts);
 		}
 
 		return substr($filename, 0, ($length - strlen($ext))).$ext;
@@ -875,7 +875,7 @@ 
 			return FALSE;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->security->xss_clean($data, TRUE);
 	}
 
@@ -889,7 +889,7 @@ 
 	 */
 	public function set_error($msg)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('upload');
 
 		if (is_array($msg))
@@ -984,9 +984,9 @@ 
 			return $filename;
 		}
 
-		$parts		= explode('.', $filename);
-		$ext		= array_pop($parts);
-		$filename	= array_shift($parts);
+		$parts = explode('.', $filename);
+		$ext = array_pop($parts);
+		$filename = array_shift($parts);
 
 		foreach ($parts as $part)
 		{
@@ -1019,7 +1019,7 @@ 
 	protected function _file_mime_type($file)
 	{
 		// Use if the Fileinfo extension, if available (only versions above 5.3 support the FILEINFO_MIME_TYPE flag)
-		if ( (float) substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
+		if ((float)substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
 		{
 			$finfo = new finfo(FILEINFO_MIME_TYPE);
 			if ($finfo !== FALSE) // This is possible, if there is no magic MIME database file found on the system
@@ -1055,7 +1055,7 @@ 
 		if (DIRECTORY_SEPARATOR !== '\\' && function_exists('exec'))
 		{
 			$output = array();
-			@exec('file --brief --mime-type ' . escapeshellarg($file['tmp_path']), $output, $return_code);
+			@exec('file --brief --mime-type '.escapeshellarg($file['tmp_path']), $output, $return_code);
 			if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution
 			{
 				$this->file_type = rtrim($output[0]);

web_interface/astpp/system/libraries/Email.php

Spacing +96 added lines, -96 removed lines

@@ -29,51 +29,51 @@ 
 class CI_Email {
 
 	var	$useragent		= "CodeIgniter";
-	var	$mailpath		= "/usr/sbin/sendmail";	// Sendmail path
-	var	$protocol		= "mail";	// mail/sendmail/smtp
-	var	$smtp_host		= "";		// SMTP Server.  Example: mail.earthlink.net
-	var	$smtp_user		= "";		// SMTP Username
-	var	$smtp_pass		= "";		// SMTP Password
-	var	$smtp_port		= "25";		// SMTP Port
-	var	$smtp_timeout	= 5;		// SMTP Timeout in seconds
-	var	$smtp_crypto	= "";		// SMTP Encryption. Can be null, tls or ssl.
-	var	$wordwrap		= TRUE;		// TRUE/FALSE  Turns word-wrap on/off
-	var	$wrapchars		= "76";		// Number of characters to wrap at.
-	var	$mailtype		= "text";	// text/html  Defines email formatting
-	var	$charset		= "utf-8";	// Default char set: iso-8859-1 or us-ascii
-	var	$multipart		= "mixed";	// "mixed" (in the body) or "related" (separate)
-	var $alt_message	= '';		// Alternative message for HTML emails
-	var	$validate		= FALSE;	// TRUE/FALSE.  Enables email validation
-	var	$priority		= "3";		// Default priority (1 - 5)
-	var	$newline		= "\n";		// Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
-	var $crlf			= "\n";		// The RFC 2045 compliant CRLF for quoted-printable is "\r\n".  Apparently some servers,
+	var	$mailpath		= "/usr/sbin/sendmail"; // Sendmail path
+	var	$protocol		= "mail"; // mail/sendmail/smtp
+	var	$smtp_host		= ""; // SMTP Server.  Example: mail.earthlink.net
+	var	$smtp_user		= ""; // SMTP Username
+	var	$smtp_pass		= ""; // SMTP Password
+	var	$smtp_port		= "25"; // SMTP Port
+	var	$smtp_timeout = 5; // SMTP Timeout in seconds
+	var	$smtp_crypto = ""; // SMTP Encryption. Can be null, tls or ssl.
+	var	$wordwrap		= TRUE; // TRUE/FALSE  Turns word-wrap on/off
+	var	$wrapchars		= "76"; // Number of characters to wrap at.
+	var	$mailtype		= "text"; // text/html  Defines email formatting
+	var	$charset = "utf-8"; // Default char set: iso-8859-1 or us-ascii
+	var	$multipart		= "mixed"; // "mixed" (in the body) or "related" (separate)
+	var $alt_message = ''; // Alternative message for HTML emails
+	var	$validate		= FALSE; // TRUE/FALSE.  Enables email validation
+	var	$priority		= "3"; // Default priority (1 - 5)
+	var	$newline = "\n"; // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+	var $crlf = "\n"; // The RFC 2045 compliant CRLF for quoted-printable is "\r\n".  Apparently some servers,
 									// even on the receiving end think they need to muck with CRLFs, so using "\n", while
 									// distasteful, is the only thing that seems to work for all environments.
-	var $send_multipart	= TRUE;		// TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override.  Set to FALSE for Yahoo.
-	var	$bcc_batch_mode	= FALSE;	// TRUE/FALSE  Turns on/off Bcc batch feature
-	var	$bcc_batch_size	= 200;		// If bcc_batch_mode = TRUE, sets max number of Bccs in each batch
+	var $send_multipart	= TRUE; // TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override.  Set to FALSE for Yahoo.
+	var	$bcc_batch_mode	= FALSE; // TRUE/FALSE  Turns on/off Bcc batch feature
+	var	$bcc_batch_size	= 200; // If bcc_batch_mode = TRUE, sets max number of Bccs in each batch
 	var $_safe_mode		= FALSE;
-	var	$_subject		= "";
-	var	$_body			= "";
+	var	$_subject = "";
+	var	$_body = "";
 	var	$_finalbody		= "";
 	var	$_alt_boundary	= "";
 	var	$_atc_boundary	= "";
 	var	$_header_str	= "";
 	var	$_smtp_connect	= "";
-	var	$_encoding		= "8bit";
-	var $_IP			= FALSE;
+	var	$_encoding = "8bit";
+	var $_IP = FALSE;
 	var	$_smtp_auth		= FALSE;
-	var $_replyto_flag	= FALSE;
+	var $_replyto_flag = FALSE;
 	var	$_debug_msg		= array();
 	var	$_recipients	= array();
-	var	$_cc_array		= array();
+	var	$_cc_array = array();
 	var	$_bcc_array		= array();
-	var	$_headers		= array();
+	var	$_headers = array();
 	var	$_attach_name	= array();
 	var	$_attach_type	= array();
 	var	$_attach_disp	= array();
 	var	$_protocols		= array('mail', 'sendmail', 'smtp');
-	var	$_base_charsets	= array('us-ascii', 'iso-2022-');	// 7-bit charsets (excluding language suffix)
+	var	$_base_charsets = array('us-ascii', 'iso-2022-'); // 7-bit charsets (excluding language suffix)
 	var	$_bit_depths	= array('7bit', '8bit');
 	var	$_priorities	= array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');
 
@@ -143,9 +143,9 @@ 
 	 */
 	public function clear($clear_attachments = FALSE)
 	{
-		$this->_subject		= "";
-		$this->_body		= "";
-		$this->_finalbody	= "";
+		$this->_subject = "";
+		$this->_body = "";
+		$this->_finalbody = "";
 		$this->_header_str	= "";
 		$this->_replyto_flag = FALSE;
 		$this->_recipients	= array();
@@ -179,7 +179,7 @@ 
 	 */
 	public function from($from, $name = '')
 	{
-		if (preg_match( '/\<(.*)\>/', $from, $match))
+		if (preg_match('/\<(.*)\>/', $from, $match))
 		{
 			$from = $match['1'];
 		}
@@ -222,7 +222,7 @@ 
 	 */
 	public function reply_to($replyto, $name = '')
 	{
-		if (preg_match( '/\<(.*)\>/', $replyto, $match))
+		if (preg_match('/\<(.*)\>/', $replyto, $match))
 		{
 			$replyto = $match['1'];
 		}
@@ -554,11 +554,11 @@ 
 	{
 		if ($newline != "\n" AND $newline != "\r\n" AND $newline != "\r")
 		{
-			$this->newline	= "\n";
+			$this->newline = "\n";
 			return;
 		}
 
-		$this->newline	= $newline;
+		$this->newline = $newline;
 
 		return $this;
 	}
@@ -576,11 +576,11 @@ 
 	{
 		if ($crlf != "\n" AND $crlf != "\r\n" AND $crlf != "\r")
 		{
-			$this->crlf	= "\n";
+			$this->crlf = "\n";
 			return;
 		}
 
-		$this->crlf	= $crlf;
+		$this->crlf = $crlf;
 
 		return $this;
 	}
@@ -673,15 +673,15 @@ 
 	 */
 	protected function _get_content_type()
 	{
-		if	($this->mailtype == 'html' &&  count($this->_attach_name) == 0)
+		if ($this->mailtype == 'html' && count($this->_attach_name) == 0)
 		{
 			return 'html';
 		}
-		elseif	($this->mailtype == 'html' &&  count($this->_attach_name)  > 0)
+		elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0)
 		{
 			return 'html-attach';
 		}
-		elseif	($this->mailtype == 'text' &&  count($this->_attach_name)  > 0)
+		elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0)
 		{
 			return 'plain-attach';
 		}
@@ -704,7 +704,7 @@ 
 		$timezone = date("Z");
 		$operator = (strncmp($timezone, '-', 1) == 0) ? '-' : '+';
 		$timezone = abs($timezone);
-		$timezone = floor($timezone/3600) * 100 + ($timezone % 3600 ) / 60;
+		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
 
 		return sprintf("%s %s%04d", date("D, j M Y H:i:s"), $operator, $timezone);
 	}
@@ -792,7 +792,7 @@ 
 
 		foreach ($email as $addy)
 		{
-			if (preg_match( '/\<(.*)\>/', $addy, $match))
+			if (preg_match('/\<(.*)\>/', $addy, $match))
 			{
 				$clean_email[] = $match['1'];
 			}
@@ -835,14 +835,14 @@ 
 		}
 
 		$body = trim(strip_tags($body));
-		$body = preg_replace( '#<!--(.*)--\>#', "", $body);
+		$body = preg_replace('#<!--(.*)--\>#', "", $body);
 		$body = str_replace("\t", "", $body);
 
 		for ($i = 20; $i >= 3; $i--)
 		{
 			$n = "";
 
-			for ($x = 1; $x <= $i; $x ++)
+			for ($x = 1; $x <= $i; $x++)
 			{
 				$n .= "\n";
 			}
@@ -919,8 +919,8 @@ 
 				}
 
 				// Trim the word down
-				$temp .= substr($line, 0, $charlim-1);
-				$line = substr($line, $charlim-1);
+				$temp .= substr($line, 0, $charlim - 1);
+				$line = substr($line, $charlim - 1);
 			}
 
 			// If $temp contains data it means we had to split up an over-length
@@ -1012,7 +1012,7 @@ 
 	 */
 	protected function _build_message()
 	{
-		if ($this->wordwrap === TRUE  AND  $this->mailtype != 'html')
+		if ($this->wordwrap === TRUE AND $this->mailtype != 'html')
 		{
 			$this->_body = $this->word_wrap($this->_body);
 		}
@@ -1027,8 +1027,8 @@ 
 		{
 			case 'plain' :
 
-				$hdr .= "Content-Type: text/plain; charset=" . $this->charset . $this->newline;
-				$hdr .= "Content-Transfer-Encoding: " . $this->_get_encoding();
+				$hdr .= "Content-Type: text/plain; charset=".$this->charset.$this->newline;
+				$hdr .= "Content-Transfer-Encoding: ".$this->_get_encoding();
 
 				if ($this->_get_protocol() == 'mail')
 				{
@@ -1037,7 +1037,7 @@ 
 				}
 				else
 				{
-					$this->_finalbody = $hdr . $this->newline . $this->newline . $this->_body;
+					$this->_finalbody = $hdr.$this->newline.$this->newline.$this->_body;
 				}
 
 				return;
@@ -1047,25 +1047,25 @@ 
 
 				if ($this->send_multipart === FALSE)
 				{
-					$hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
+					$hdr .= "Content-Type: text/html; charset=".$this->charset.$this->newline;
 					$hdr .= "Content-Transfer-Encoding: quoted-printable";
 				}
 				else
 				{
-					$hdr .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline . $this->newline;
+					$hdr .= "Content-Type: multipart/alternative; boundary=\"".$this->_alt_boundary."\"".$this->newline.$this->newline;
 
-					$body .= $this->_get_mime_message() . $this->newline . $this->newline;
-					$body .= "--" . $this->_alt_boundary . $this->newline;
+					$body .= $this->_get_mime_message().$this->newline.$this->newline;
+					$body .= "--".$this->_alt_boundary.$this->newline;
 
-					$body .= "Content-Type: text/plain; charset=" . $this->charset . $this->newline;
-					$body .= "Content-Transfer-Encoding: " . $this->_get_encoding() . $this->newline . $this->newline;
-					$body .= $this->_get_alt_message() . $this->newline . $this->newline . "--" . $this->_alt_boundary . $this->newline;
+					$body .= "Content-Type: text/plain; charset=".$this->charset.$this->newline;
+					$body .= "Content-Transfer-Encoding: ".$this->_get_encoding().$this->newline.$this->newline;
+					$body .= $this->_get_alt_message().$this->newline.$this->newline."--".$this->_alt_boundary.$this->newline;
 
-					$body .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
-					$body .= "Content-Transfer-Encoding: quoted-printable" . $this->newline . $this->newline;
+					$body .= "Content-Type: text/html; charset=".$this->charset.$this->newline;
+					$body .= "Content-Transfer-Encoding: quoted-printable".$this->newline.$this->newline;
 				}
 
-				$this->_finalbody = $body . $this->_prep_quoted_printable($this->_body) . $this->newline . $this->newline;
+				$this->_finalbody = $body.$this->_prep_quoted_printable($this->_body).$this->newline.$this->newline;
 
 
 				if ($this->_get_protocol() == 'mail')
@@ -1074,13 +1074,13 @@ 
 				}
 				else
 				{
-					$this->_finalbody = $hdr . $this->_finalbody;
+					$this->_finalbody = $hdr.$this->_finalbody;
 				}
 
 
 				if ($this->send_multipart !== FALSE)
 				{
-					$this->_finalbody .= "--" . $this->_alt_boundary . "--";
+					$this->_finalbody .= "--".$this->_alt_boundary."--";
 				}
 
 				return;
@@ -1088,46 +1088,46 @@ 
 			break;
 			case 'plain-attach' :
 
-				$hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline . $this->newline;
+				$hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"".$this->_atc_boundary."\"".$this->newline.$this->newline;
 
 				if ($this->_get_protocol() == 'mail')
 				{
 					$this->_header_str .= $hdr;
 				}
 
-				$body .= $this->_get_mime_message() . $this->newline . $this->newline;
-				$body .= "--" . $this->_atc_boundary . $this->newline;
+				$body .= $this->_get_mime_message().$this->newline.$this->newline;
+				$body .= "--".$this->_atc_boundary.$this->newline;
 
-				$body .= "Content-Type: text/plain; charset=" . $this->charset . $this->newline;
-				$body .= "Content-Transfer-Encoding: " . $this->_get_encoding() . $this->newline . $this->newline;
+				$body .= "Content-Type: text/plain; charset=".$this->charset.$this->newline;
+				$body .= "Content-Transfer-Encoding: ".$this->_get_encoding().$this->newline.$this->newline;
 
-				$body .= $this->_body . $this->newline . $this->newline;
+				$body .= $this->_body.$this->newline.$this->newline;
 
 			break;
 			case 'html-attach' :
 
-				$hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline . $this->newline;
+				$hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"".$this->_atc_boundary."\"".$this->newline.$this->newline;
 
 				if ($this->_get_protocol() == 'mail')
 				{
 					$this->_header_str .= $hdr;
 				}
 
-				$body .= $this->_get_mime_message() . $this->newline . $this->newline;
-				$body .= "--" . $this->_atc_boundary . $this->newline;
+				$body .= $this->_get_mime_message().$this->newline.$this->newline;
+				$body .= "--".$this->_atc_boundary.$this->newline;
 
-				$body .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline .$this->newline;
-				$body .= "--" . $this->_alt_boundary . $this->newline;
+				$body .= "Content-Type: multipart/alternative; boundary=\"".$this->_alt_boundary."\"".$this->newline.$this->newline;
+				$body .= "--".$this->_alt_boundary.$this->newline;
 
-				$body .= "Content-Type: text/plain; charset=" . $this->charset . $this->newline;
-				$body .= "Content-Transfer-Encoding: " . $this->_get_encoding() . $this->newline . $this->newline;
-				$body .= $this->_get_alt_message() . $this->newline . $this->newline . "--" . $this->_alt_boundary . $this->newline;
+				$body .= "Content-Type: text/plain; charset=".$this->charset.$this->newline;
+				$body .= "Content-Transfer-Encoding: ".$this->_get_encoding().$this->newline.$this->newline;
+				$body .= $this->_get_alt_message().$this->newline.$this->newline."--".$this->_alt_boundary.$this->newline;
 
-				$body .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
-				$body .= "Content-Transfer-Encoding: quoted-printable" . $this->newline . $this->newline;
+				$body .= "Content-Type: text/html; charset=".$this->charset.$this->newline;
+				$body .= "Content-Transfer-Encoding: quoted-printable".$this->newline.$this->newline;
 
-				$body .= $this->_prep_quoted_printable($this->_body) . $this->newline . $this->newline;
-				$body .= "--" . $this->_alt_boundary . "--" . $this->newline . $this->newline;
+				$body .= $this->_prep_quoted_printable($this->_body).$this->newline.$this->newline;
+				$body .= "--".$this->_alt_boundary."--".$this->newline.$this->newline;
 
 			break;
 		}
@@ -1136,7 +1136,7 @@ 
 
 		$z = 0;
 
-		for ($i=0; $i < count($this->_attach_name); $i++)
+		for ($i = 0; $i < count($this->_attach_name); $i++)
 		{
 			$filename = $this->_attach_name[$i];
 			$basename = basename($filename);
@@ -1155,7 +1155,7 @@ 
 			$h .= "Content-Transfer-Encoding: base64".$this->newline;
 
 			$attachment[$z++] = $h;
-			$file = filesize($filename) +1;
+			$file = filesize($filename) + 1;
 
 			if ( ! $fp = fopen($filename, FOPEN_READ))
 			{
@@ -1176,7 +1176,7 @@ 
 		}
 		else
 		{
-			$this->_finalbody = $hdr . $body;
+			$this->_finalbody = $hdr.$body;
 		}
 
 		return;
@@ -1250,7 +1250,7 @@ 
 				// encode = signs
 				if ($ascii == '61')
 				{
-					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii))); // =3D
 				}
 
 				// If we're at the character limit, add the line to the output,
@@ -1362,7 +1362,7 @@ 
 			$this->reply_to($this->_headers['From']);
 		}
 
-		if (( ! isset($this->_recipients) AND ! isset($this->_headers['To']))  AND
+		if (( ! isset($this->_recipients) AND ! isset($this->_headers['To'])) AND
 			( ! isset($this->_bcc_array) AND ! isset($this->_headers['Bcc'])) AND
 			( ! isset($this->_headers['Cc'])))
 		{
@@ -1372,7 +1372,7 @@ 
 
 		$this->_build_headers();
 
-		if ($this->bcc_batch_mode  AND  count($this->_bcc_array) > 0)
+		if ($this->bcc_batch_mode AND count($this->_bcc_array) > 0)
 		{
 			if (count($this->_bcc_array) > $this->bcc_batch_size)
 				return $this->batch_bcc_send();
@@ -1400,7 +1400,7 @@ 
 	 */
 	public function batch_bcc_send()
 	{
-		$float = $this->bcc_batch_size -1;
+		$float = $this->bcc_batch_size - 1;
 
 		$set = "";
 
@@ -1420,7 +1420,7 @@ 
 				$set = "";
 			}
 
-			if ($i == count($this->_bcc_array)-1)
+			if ($i == count($this->_bcc_array) - 1)
 			{
 				$chunk[] = substr($set, 1);
 			}
@@ -1571,7 +1571,7 @@ 
 	 */
 	protected function _send_with_sendmail()
 	{
-		$fp = @popen($this->mailpath . " -oi -f ".$this->clean_email($this->_headers['From'])." -t", 'w');
+		$fp = @popen($this->mailpath." -oi -f ".$this->clean_email($this->_headers['From'])." -t", 'w');
 
 		if ($fp === FALSE OR $fp === NULL)
 		{
@@ -1650,7 +1650,7 @@ 
 		$this->_send_command('data');
 
 		// perform dot transformation on any lines that begin with a dot
-		$this->_send_data($this->_header_str . preg_replace('/^\./m', '..$1', $this->_finalbody));
+		$this->_send_data($this->_header_str.preg_replace('/^\./m', '..$1', $this->_finalbody));
 
 		$this->_send_data('.');
 
@@ -1794,7 +1794,7 @@ 
 			return TRUE;
 		}
 
-		if ($this->smtp_user == ""  AND  $this->smtp_pass == "")
+		if ($this->smtp_user == "" AND $this->smtp_pass == "")
 		{
 			$this->_set_error_message('lang:email_no_smtp_unpw');
 			return FALSE;
@@ -1843,7 +1843,7 @@ 
 	 */
 	protected function _send_data($data)
 	{
-		if ( ! fwrite($this->_smtp_connect, $data . $this->newline))
+		if ( ! fwrite($this->_smtp_connect, $data.$this->newline))
 		{
 			$this->_set_error_message('lang:email_smtp_data_failure', $data);
 			return FALSE;
@@ -1922,7 +1922,7 @@ 
 			$this->_IP = end($x);
 		}
 
-		if ( ! preg_match( "/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $this->_IP))
+		if ( ! preg_match("/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/", $this->_IP))
 		{
 			$this->_IP = '0.0.0.0';
 		}
@@ -1969,7 +1969,7 @@ 
 	 */
 	protected function _set_error_message($msg, $val = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('email');
 
 		if (substr($msg, 0, 5) != 'lang:' || FALSE === ($line = $CI->lang->line(substr($msg, 5))))
@@ -1993,7 +1993,7 @@ 
 	 */
 	protected function _mime_types($ext = "")
 	{
-		$mimes = array(	'hqx'	=>	'application/mac-binhex40',
+		$mimes = array('hqx'	=>	'application/mac-binhex40',
 						'cpt'	=>	'application/mac-compactpro',
 						'doc'	=>	'application/msword',
 						'bin'	=>	'application/macbinary',