iNextrix / ASTPP

web_interface/astpp/index.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  *
  */
-        ini_set("date.timezone", "UTC");
+		ini_set("date.timezone", "UTC");
 	define('ENVIRONMENT', 'development');
 /*
  *---------------------------------------------------------------
@@ -68,7 +68,7 @@ 
  * as this file.
  *
  */
-       $assets_path='assets';
+	   $assets_path='assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME

web_interface/astpp/system/core/Output.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		// Get mime types for later
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
-		    include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+			include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
 		}
 		else
 		{

web_interface/astpp/system/core/Config.php

Indentation +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 				$uri = $str;
 			}
 		}
-	    return $uri;
+		return $uri;
 	}
 
 	// --------------------------------------------------------------------

web_interface/astpp/system/core/Common.php

Indentation +1 added lines, -1 removed lines

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

web_interface/astpp/system/core/Input.php

Indentation +100 added lines, -100 removed lines

@@ -134,13 +134,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the GET array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the GET array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function get($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -162,13 +162,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the POST array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the POST array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function post($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -191,13 +191,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from either the GET array or the POST
-	*
-	* @access	public
-	* @param	string	The index key
-	* @param	bool	XSS cleaning
-	* @return	string
-	*/
+	 * Fetch an item from either the GET array or the POST
+	 *
+	 * @access	public
+	 * @param	string	The index key
+	 * @param	bool	XSS cleaning
+	 * @return	string
+	 */
 	function get_post($index = '', $xss_clean = FALSE)
 	{
 		if ( ! isset($_POST[$index]) )
@@ -213,13 +213,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the COOKIE array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the COOKIE array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function cookie($index = '', $xss_clean = FALSE)
 	{
 		return $this->_fetch_from_array($_COOKIE, $index, $xss_clean);
@@ -228,21 +228,21 @@ 
 	// ------------------------------------------------------------------------
 
 	/**
-	* Set cookie
-	*
-	* Accepts six parameter, or you can submit an associative
-	* array in the first parameter containing all the values.
-	*
-	* @access	public
-	* @param	mixed
-	* @param	string	the value of the cookie
-	* @param	string	the number of seconds until expiration
-	* @param	string	the cookie domain.  Usually:  .yourdomain.com
-	* @param	string	the cookie path
-	* @param	string	the cookie prefix
-	* @param	bool	true makes the cookie secure
-	* @return	void
-	*/
+	 * Set cookie
+	 *
+	 * Accepts six parameter, or you can submit an associative
+	 * array in the first parameter containing all the values.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string	the value of the cookie
+	 * @param	string	the number of seconds until expiration
+	 * @param	string	the cookie domain.  Usually:  .yourdomain.com
+	 * @param	string	the cookie path
+	 * @param	string	the cookie prefix
+	 * @param	bool	true makes the cookie secure
+	 * @return	void
+	 */
 	function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = FALSE)
 	{
 		if (is_array($name))
@@ -289,13 +289,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the SERVER array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the SERVER array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function server($index = '', $xss_clean = FALSE)
 	{
 		return $this->_fetch_from_array($_SERVER, $index, $xss_clean);
@@ -304,11 +304,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch the IP Address
-	*
-	* @access	public
-	* @return	string
-	*/
+	 * Fetch the IP Address
+	 *
+	 * @access	public
+	 * @return	string
+	 */
 	function ip_address()
 	{
 		if ($this->ip_address !== FALSE)
@@ -363,14 +363,14 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Validate IP Address
-	*
-	* Updated version suggested by Geert De Deckere
-	*
-	* @access	public
-	* @param	string
-	* @return	string
-	*/
+	 * Validate IP Address
+	 *
+	 * Updated version suggested by Geert De Deckere
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
 	function valid_ip($ip)
 	{
 		$ip_segments = explode('.', $ip);
@@ -402,11 +402,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* User Agent
-	*
-	* @access	public
-	* @return	string
-	*/
+	 * User Agent
+	 *
+	 * @access	public
+	 * @return	string
+	 */
 	function user_agent()
 	{
 		if ($this->user_agent !== FALSE)
@@ -422,19 +422,19 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Sanitize Globals
-	*
-	* This function does the following:
-	*
-	* Unsets $_GET data (if query strings are not enabled)
-	*
-	* Unsets all globals if register_globals is enabled
-	*
-	* Standardizes newline characters to \n
-	*
-	* @access	private
-	* @return	void
-	*/
+	 * Sanitize Globals
+	 *
+	 * This function does the following:
+	 *
+	 * Unsets $_GET data (if query strings are not enabled)
+	 *
+	 * Unsets all globals if register_globals is enabled
+	 *
+	 * Standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @return	void
+	 */
 	function _sanitize_globals()
 	{
 		// It would be "wrong" to unset any of these GLOBALS.
@@ -527,15 +527,15 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Clean Input Data
-	*
-	* This is a helper function. It escapes data and
-	* standardizes newline characters to \n
-	*
-	* @access	private
-	* @param	string
-	* @return	string
-	*/
+	 * Clean Input Data
+	 *
+	 * This is a helper function. It escapes data and
+	 * standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
 	function _clean_input_data($str)
 	{
 		if (is_array($str))
@@ -588,16 +588,16 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Clean Keys
-	*
-	* This is a helper function. To prevent malicious users
-	* from trying to exploit keys we make sure that keys are
-	* only named with alpha-numeric text and a few other items.
-	*
-	* @access	private
-	* @param	string
-	* @return	string
-	*/
+	 * Clean Keys
+	 *
+	 * This is a helper function. To prevent malicious users
+	 * from trying to exploit keys we make sure that keys are
+	 * only named with alpha-numeric text and a few other items.
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
 	function _clean_input_keys($str)
 	{
 		if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str))

web_interface/astpp/system/core/Hooks.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
 		{
-		    include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
 		}
 		elseif (is_file(APPPATH.'config/hooks.php'))
 		{

web_interface/astpp/system/core/URI.php

Indentation +2 added lines, -2 removed lines

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

web_interface/astpp/system/libraries/pdf.php

Indentation +218 added lines, -218 removed lines

@@ -10,260 +10,260 @@
   
   
   
-    $this->page++;
-    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->x = $this->lMargin;
-    $this->y = $this->tMargin;
-    $this->FontFamily = '';
-    // Check page size and orientation
-    if($orientation=='')
-        $orientation = $this->DefOrientation;
-    else
-        $orientation = strtoupper($orientation[0]);
-    if($size=='')
-        $size = $this->DefPageSize;
-    else
-        $size = $this->_getpagesize($size);
-    if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
-    {
-        // New size or orientation
-        if($orientation=='P')
-        {
-            $this->w = $size[0];
-            $this->h = $size[1];
-        }
-        else
-        {
-            $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->CurOrientation = $orientation;
-        $this->CurPageSize = $size;
-    }
-    if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
-        $this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+	$this->page++;
+	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->x = $this->lMargin;
+	$this->y = $this->tMargin;
+	$this->FontFamily = '';
+	// Check page size and orientation
+	if($orientation=='')
+		$orientation = $this->DefOrientation;
+	else
+		$orientation = strtoupper($orientation[0]);
+	if($size=='')
+		$size = $this->DefPageSize;
+	else
+		$size = $this->_getpagesize($size);
+	if($orientation!=$this->CurOrientation || $size[0]!=$this->CurPageSize[0] || $size[1]!=$this->CurPageSize[1])
+	{
+		// New size or orientation
+		if($orientation=='P')
+		{
+			$this->w = $size[0];
+			$this->h = $size[1];
+		}
+		else
+		{
+			$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->CurOrientation = $orientation;
+		$this->CurPageSize = $size;
+	}
+	if($orientation!=$this->DefOrientation || $size[0]!=$this->DefPageSize[0] || $size[1]!=$this->DefPageSize[1])
+		$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
 }
 
 function Footer() {
-    // Check if Footer for this page already exists (do the same for Header())
-    if(!isset($this->footerset[$this->page])) {
-        $this->SetY(-15);
-        // Page number
-        $this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C');
-        // set footerset
-        $this->footerset[$this->page] = true;
-    }
+	// Check if Footer for this page already exists (do the same for Header())
+	if(!isset($this->footerset[$this->page])) {
+		$this->SetY(-15);
+		// Page number
+		$this->Cell(0,10,'Page '.$this->PageNo().'/{nb}',0,0,'C');
+		// set footerset
+		$this->footerset[$this->page] = true;
+	}
 }
 
 function morepagestable($datas, $lineheight=8) {
-    // some things to set and 'remember'
-    $l = $this->lMargin;
-    $startheight = $h = $this->GetY();
-    $startpage = $currpage = $maxpage = $this->page;
+	// some things to set and 'remember'
+	$l = $this->lMargin;
+	$startheight = $h = $this->GetY();
+	$startpage = $currpage = $maxpage = $this->page;
 
-    // calculate the whole width
-    $fullwidth = 0;
-    foreach($this->tablewidths AS $width) {
-        $fullwidth += $width;
-    }
+	// calculate the whole width
+	$fullwidth = 0;
+	foreach($this->tablewidths AS $width) {
+		$fullwidth += $width;
+	}
 
-    // Now let's start to write the table
-    foreach($datas AS $row => $data) {
-        $this->page = $currpage;
-        // write the horizontal borders
+	// Now let's start to write the table
+	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) {
-            $this->page = $currpage;
-            $this->SetXY($l,$h);
+		// write the content and remember the height of the highest col
+		foreach($data AS $col => $txt) {
+			$this->page = $currpage;
+			$this->SetXY($l,$h);
 
-	    if($col == 5)
-	      $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
-            else
-	      $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
-            $l += $this->tablewidths[$col];
+		if($col == 5)
+		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
+			else
+		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+			$l += $this->tablewidths[$col];
 
-            if(!isset($tmpheight[$row.'-'.$this->page]))
-                $tmpheight[$row.'-'.$this->page] = 0;
-            if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                $tmpheight[$row.'-'.$this->page] = $this->GetY();
-            }
-            if($this->page > $maxpage)
-                $maxpage = $this->page;
-        }
+			if(!isset($tmpheight[$row.'-'.$this->page]))
+				$tmpheight[$row.'-'.$this->page] = 0;
+			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+				$tmpheight[$row.'-'.$this->page] = $this->GetY();
+			}
+			if($this->page > $maxpage)
+				$maxpage = $this->page;
+		}
 
-        // get the height we were in the last used page
-        $h = $tmpheight[$row.'-'.$maxpage];
-        // set the "pointer" to the left margin
-        $l = $this->lMargin;
-        // set the $currpage to the last page
-        $currpage = $maxpage;
-    }
-    // draw the borders
-    // we start adding a horizontal line on the last page
-    $this->page = $maxpage;
-    $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++) {
-        $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) {
-            $l += $width;
-            $this->Line($l,$t,$l,$lh);
-        }
-    }
-    // set it to the last page, if not it'll cause some problems
-    $this->page = $maxpage;
+		// get the height we were in the last used page
+		$h = $tmpheight[$row.'-'.$maxpage];
+		// set the "pointer" to the left margin
+		$l = $this->lMargin;
+		// set the $currpage to the last page
+		$currpage = $maxpage;
+	}
+	// draw the borders
+	// we start adding a horizontal line on the last page
+	$this->page = $maxpage;
+	$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++) {
+		$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) {
+			$l += $width;
+			$this->Line($l,$t,$l,$lh);
+		}
+	}
+	// set it to the last page, if not it'll cause some problems
+	$this->page = $maxpage;
 }
 
 
 
 function table_total($datas, $lineheight=8) {
-    // some things to set and 'remember'
-    $l = $this->lMargin;
-    $startheight = $h = $this->GetY();
-    $startpage = $currpage = $maxpage = $this->page;
+	// some things to set and 'remember'
+	$l = $this->lMargin;
+	$startheight = $h = $this->GetY();
+	$startpage = $currpage = $maxpage = $this->page;
 
-    // calculate the whole width
-    $fullwidth = 0;
-    foreach($this->tablewidths AS $width) {
-        $fullwidth += $width;
-    }
+	// calculate the whole width
+	$fullwidth = 0;
+	foreach($this->tablewidths AS $width) {
+		$fullwidth += $width;
+	}
 
-    // Now let's start to write the table
-    foreach($datas AS $row => $data) {
-        $this->page = $currpage;
-        // write the horizontal borders
+	// Now let's start to write the table
+	foreach($datas AS $row => $data) {
+		$this->page = $currpage;
+		// write the horizontal borders
 	if($data != "")
-        $this->Line(100,$h,200,$h);
-        // write the content and remember the height of the highest col
-        foreach($data AS $col => $txt) {
-            $this->page = $currpage;
-            $this->SetXY($l,$h);
+		$this->Line(100,$h,200,$h);
+		// write the content and remember the height of the highest col
+		foreach($data AS $col => $txt) {
+			$this->page = $currpage;
+			$this->SetXY($l,$h);
             
-            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");
-            else
-	      $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
-            $l += $this->tablewidths[$col];
+			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");
+			else
+		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+			$l += $this->tablewidths[$col];
 
-            if(!isset($tmpheight[$row.'-'.$this->page]))
-                $tmpheight[$row.'-'.$this->page] = 0;
-            if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                $tmpheight[$row.'-'.$this->page] = $this->GetY();
-            }
-            if($this->page > $maxpage)
-                $maxpage = $this->page;
-        }
+			if(!isset($tmpheight[$row.'-'.$this->page]))
+				$tmpheight[$row.'-'.$this->page] = 0;
+			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+				$tmpheight[$row.'-'.$this->page] = $this->GetY();
+			}
+			if($this->page > $maxpage)
+				$maxpage = $this->page;
+		}
 
-        // get the height we were in the last used page
-        $h = $tmpheight[$row.'-'.$maxpage];
-        // set the "pointer" to the left margin
-        $l = $this->lMargin;
-        // set the $currpage to the last page
-        $currpage = $maxpage;
-    }
-    // draw the borders
-    // we start adding a horizontal line on the last page
-    $this->page = $maxpage;
+		// get the height we were in the last used page
+		$h = $tmpheight[$row.'-'.$maxpage];
+		// set the "pointer" to the left margin
+		$l = $this->lMargin;
+		// set the $currpage to the last page
+		$currpage = $maxpage;
+	}
+	// draw the borders
+	// 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++) {
-        $this->page = $i;
-        $l = $this->lMargin;
-        $t  = ($i == $startpage) ? $startheight : $this->tMargin;
-        $lh = ($i == $maxpage)   ? $h : $this->h-$this->bMargin;
+	// now we start at the top of the document and walk down
+	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;
 
-        foreach($this->tablewidths AS $width) {
-	    $l += $width;
-	    if($width != '30')
-	    {
-	      $this->Line(100,$t,100,$lh);
-	      $this->Line($l,$t,$l,$lh);
-	    }
-        }
-    }
-    // set it to the last page, if not it'll cause some problems
-    $this->page = $maxpage;
+		foreach($this->tablewidths AS $width) {
+		$l += $width;
+		if($width != '30')
+		{
+		  $this->Line(100,$t,100,$lh);
+		  $this->Line($l,$t,$l,$lh);
+		}
+		}
+	}
+	// set it to the last page, if not it'll cause some problems
+	$this->page = $maxpage;
 }
 
 
 function export_pdf($datas, $lineheight=8) {
-    // some things to set and 'remember'
-    $l = $this->lMargin;
-    $startheight = $h = $this->GetY();
-    $startpage = $currpage = $maxpage = $this->page;
+	// some things to set and 'remember'
+	$l = $this->lMargin;
+	$startheight = $h = $this->GetY();
+	$startpage = $currpage = $maxpage = $this->page;
 
-    // calculate the whole width
-    $fullwidth = 0;
-    foreach($this->tablewidths AS $width) {
-        $fullwidth += $width;
-    }
+	// calculate the whole width
+	$fullwidth = 0;
+	foreach($this->tablewidths AS $width) {
+		$fullwidth += $width;
+	}
 
-    // Now let's start to write the table
-    foreach($datas AS $row => $data) {
-        $this->page = $currpage;
-        // write the horizontal borders
+	// Now let's start to write the table
+	foreach($datas AS $row => $data) {
+		$this->page = $currpage;
+		// write the horizontal borders
 	 $this->Line($l,$h,$fullwidth+$l,$h); 
-        // write the content and remember the height of the highest col
-        foreach($data AS $col => $txt) {
-            $this->page = $currpage;
-            $this->SetXY($l,$h);
+		// write the content and remember the height of the highest col
+		foreach($data AS $col => $txt) {
+			$this->page = $currpage;
+			$this->SetXY($l,$h);
 
-	    if($col == 5)
-	      $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
-            else
-	      $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
-            $l += $this->tablewidths[$col];
+		if($col == 5)
+		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt,0,"R");
+			else
+		  $this->MultiCell($this->tablewidths[$col],$lineheight,$txt);
+			$l += $this->tablewidths[$col];
 
-            if(!isset($tmpheight[$row.'-'.$this->page]))
-                $tmpheight[$row.'-'.$this->page] = 0;
-            if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                $tmpheight[$row.'-'.$this->page] = $this->GetY();
-            }
-            if($this->page > $maxpage)
-                $maxpage = $this->page;
-        }
+			if(!isset($tmpheight[$row.'-'.$this->page]))
+				$tmpheight[$row.'-'.$this->page] = 0;
+			if($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+				$tmpheight[$row.'-'.$this->page] = $this->GetY();
+			}
+			if($this->page > $maxpage)
+				$maxpage = $this->page;
+		}
 
-        // get the height we were in the last used page
-        $h = $tmpheight[$row.'-'.$maxpage];
-        // set the "pointer" to the left margin
-        $l = $this->lMargin;
-        // set the $currpage to the last page
-        $currpage = $maxpage;
-    }
-    // draw the borders
-    // we start adding a horizontal line on the last page
-    $this->page = $maxpage;
-    $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++) {
-        $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) {
-            $l += $width;
-            $this->Line($l,$t,$l,$lh);
-        }
-    }
-    // set it to the last page, if not it'll cause some problems
-    $this->page = $maxpage;
+		// get the height we were in the last used page
+		$h = $tmpheight[$row.'-'.$maxpage];
+		// set the "pointer" to the left margin
+		$l = $this->lMargin;
+		// set the $currpage to the last page
+		$currpage = $maxpage;
+	}
+	// draw the borders
+	// we start adding a horizontal line on the last page
+	$this->page = $maxpage;
+	$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++) {
+		$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) {
+			$l += $width;
+			$this->Line($l,$t,$l,$lh);
+		}
+	}
+	// set it to the last page, if not it'll cause some problems
+	$this->page = $maxpage;
 }
 
 

web_interface/astpp/system/libraries/Fpdf.php

Indentation +5 added lines, -5 removed lines

@@ -77,11 +77,11 @@
 *******************************************************************************/

 function FPDF($props = array())

 {

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

-     {

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

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

-     }	

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

+	 {

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

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

+	 }	

 }

 

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