iNextrix / ASTPP

web_interface/astpp/system/libraries/Profiler.php

Braces +2 added lines, -4 removed lines

@@ -274,8 +274,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, true)))."</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}
@@ -322,8 +321,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, TRUE)))."</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}

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

Braces +59 added lines, -44 removed lines

@@ -11,21 +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->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=='') {
+			$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
@@ -33,8 +37,7 @@ 
 		{
 			$this->w = $size[0];
 			$this->h = $size[1];
-		}
-		else
+		} else
 		{
 			$this->w = $size[1];
 			$this->h = $size[0];
@@ -45,9 +48,10 @@ 
 		$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);
-}
+	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())
@@ -82,19 +86,22 @@ 
 			$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);
+		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(!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($this->page > $maxpage) {
+							$maxpage = $this->page;
+			}
 		}
 
 		// get the height we were in the last used page
@@ -142,30 +149,35 @@ 
 	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) {
 			$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);
+			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(!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($this->page > $maxpage) {
+							$maxpage = $this->page;
+			}
 		}
 
 		// get the height we were in the last used page
@@ -224,19 +236,22 @@ 
 			$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);
+		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(!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($this->page > $maxpage) {
+							$maxpage = $this->page;
+			}
 		}
 
 		// get the height we were in the last used page

web_interface/astpp/system/libraries/Calendar.php

Spacing +1 added lines, -1 removed lines

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

web_interface/astpp/system/database/DB_active_rec.php

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -4 removed lines

@@ -1121,8 +1121,7 @@ 
 			if ($escape === FALSE)
 			{
 				$this->ar_set[] = '('.implode(',', $row).')';
-			}
-			else
+			} else
 			{
 				$clean = array();
 
@@ -2132,8 +2131,9 @@ 
 	 */
 		 function _insert_on_duplicate_update_batch($table, $keys, $values)
 		 {
-				  foreach($keys as $key)
-				  $update_fields[] = $key.'=VALUES('.$key.')';
+				  foreach($keys as $key) {
+				  				  $update_fields[] = $key.'=VALUES('.$key.')';
+				  }
            
 				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
 		 } 

web_interface/astpp/system/database/drivers/postgre/postgre_driver.php

Braces +3 added lines, -6 removed lines

@@ -338,20 +338,17 @@
 		if ($table == NULL && $v >= '8.1')
 		{
 			$sql = 'SELECT LASTVAL() as ins_id';
-		}
-		elseif ($table != NULL && $column != NULL && $v >= '8.0')
+		} elseif ($table != NULL && $column != NULL && $v >= '8.0')
 		{
 			$sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column);
 			$query = $this->query($sql);
 			$row = $query->row();
 			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq);
-		}
-		elseif ($table != NULL)
+		} elseif ($table != NULL)
 		{
 			// seq_name passed in table parameter
 			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table);
-		}
-		else
+		} else
 		{
 			return pg_last_oid($this->result_id);
 		}

web_interface/astpp/system/database/drivers/cubrid/cubrid_utility.php

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
 		if ($this->conn_id)
 		{
 			return "SELECT '".$this->database."'";
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

web_interface/astpp/system/helpers/html_helper.php

Braces +5 added lines, -10 removed lines

@@ -318,31 +318,26 @@
 					if ($index_page === TRUE)
 					{
 						$link .= 'href="'.$CI->config->site_url($v).'" ';
-					}
-					else
+					} else
 					{
 						$link .= 'href="'.$CI->config->slash_item('base_url').$v.'" ';
 					}
-				}
-				else
+				} else
 				{
 					$link .= "$k=\"$v\" ";
 				}
 			}
 
 			$link .= "/>";
-		}
-		else
+		} else
 		{
 			if (strpos($href, '://') !== FALSE)
 			{
 				$link .= 'href="'.$href.'" ';
-			}
-			elseif ($index_page === TRUE)
+			} elseif ($index_page === TRUE)
 			{
 				$link .= 'href="'.$CI->config->site_url($href).'" ';
-			}
-			else
+			} else
 			{
 				$link .= 'href="'.$CI->config->slash_item('base_url').$href.'" ';
 			}

web_interface/astpp/system/helpers/smiley_helper.php

Braces +1 added lines, -2 removed lines

@@ -232,8 +232,7 @@
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php');
-		}
-		elseif (file_exists(APPPATH.'config/smileys.php'))
+		} elseif (file_exists(APPPATH.'config/smileys.php'))
 		{
 			include(APPPATH.'config/smileys.php');
 		}

web_interface/astpp/system/helpers/url_helper.php

Braces +1 added lines, -2 removed lines

@@ -584,8 +584,7 @@
 			if ($javascript == TRUE)
 			{
 				$att .= $key.'='.$val.',';
-			}
-			else
+			} else
 			{
 				$att .= ' '.$key.'="'.$val.'"';
 			}