iNextrix / ASTPP

web_interface/astpp/system/libraries/Trackback.php

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -89,12 +91,10 @@ 
 				if ($item == 'excerpt')
 				{
 					$$item = $this->convert_ascii($$item);
-				}
-				elseif ($item == 'title')
+				} elseif ($item == 'title')
 				{
 					$$item = $this->convert_ascii($$item);
-				}
-				elseif ($item == 'blog_name')
+				} elseif ($item == 'blog_name')
 				{
 					$$item = $this->convert_ascii($$item);
 				}
@@ -368,8 +368,7 @@ 
 
 			$tb_array = explode('=', $tb_end);
 			$tb_id	= $tb_array[count($tb_array)-1];
-		}
-		else
+		} else
 		{
 			$url = rtrim($url, '/');
 
@@ -385,8 +384,7 @@ 
 		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $tb_id;
 		}
@@ -481,8 +479,7 @@ 
 			if ($ordinal < 128)
 			{
 				$out .= $str[$i];
-			}
-			else
+			} else
 			{
 				if (count($temp) == 0)
 				{

web_interface/astpp/system/libraries/Upload.php

Braces +23 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -116,13 +118,11 @@ 
 				if (method_exists($this, $method))
 				{
 					$this->$method($config[$key]);
-				}
-				else
+				} else
 				{
 					$this->$key = $config[$key];
 				}
-			}
-			else
+			} else
 			{
 				$this->$key = $val;
 			}
@@ -416,8 +416,7 @@ 
 		{
 			$this->set_error('upload_bad_filename');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $new_filename;
 		}
@@ -625,8 +624,7 @@ 
 			{
 				return TRUE;
 			}
-		}
-		elseif ($mime == $this->file_type)
+		} elseif ($mime == $this->file_type)
 		{
 				return TRUE;
 		}
@@ -646,8 +644,7 @@ 
 		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return TRUE;
 		}
@@ -852,9 +849,12 @@ 
 
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
 		{
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
+			if (($file = @fopen($file, 'rb')) === FALSE) {
+				// "b" to force binary
 			{
-				return FALSE; // Couldn't open the file, return FALSE
+				return FALSE;
+			}
+			// Couldn't open the file, return FALSE
 			}
 
 			$opening_bytes = fread($file, 256);
@@ -900,8 +900,7 @@ 
 				$this->error_msg[] = $msg;
 				log_message('error', $msg);
 			}
-		}
-		else
+		} else
 		{
 			$msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg);
 			$this->error_msg[] = $msg;
@@ -949,12 +948,10 @@ 
 			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
 				include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
-			}
-			elseif (is_file(APPPATH.'config/mimes.php'))
+			} elseif (is_file(APPPATH.'config/mimes.php'))
 			{
 				include(APPPATH.'config//mimes.php');
-			}
-			else
+			} else
 			{
 				return FALSE;
 			}
@@ -993,8 +990,7 @@ 
 			if ( ! in_array(strtolower($part), $this->allowed_types) OR $this->mimes_types(strtolower($part)) === FALSE)
 			{
 				$filename .= '.'.$part.'_';
-			}
-			else
+			} else
 			{
 				$filename .= '.'.$part;
 			}
@@ -1022,9 +1018,11 @@ 
 		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
+			if ($finfo !== FALSE) {
+				// This is possible, if there is no magic MIME database file found on the system
 			{
 				$file_type = $finfo->file($file['tmp_name']);
+			}
 
 				/* According to the comments section of the PHP manual page,
 				 * it is possible that this function returns an empty string
@@ -1056,9 +1054,11 @@ 
 		{
 			$output = array();
 			@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
+			if ($return_code === 0 && strlen($output[0]) > 0) {
+				// A return status code != 0 would mean failed execution
 			{
 				$this->file_type = rtrim($output[0]);
+			}
 				return;
 			}
 		}

web_interface/astpp/system/libraries/Email.php

Braces +46 added lines, -59 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -88,8 +90,7 @@ 
 		if (count($config) > 0)
 		{
 			$this->initialize($config);
-		}
-		else
+		} else
 		{
 			$this->_smtp_auth = ($this->smtp_user == '' AND $this->smtp_pass == '') ? FALSE : TRUE;
 			$this->_safe_mode = ((boolean)@ini_get("safe_mode") === FALSE) ? FALSE : TRUE;
@@ -118,8 +119,7 @@ 
 				if (method_exists($this, $method))
 				{
 					$this->$method($val);
-				}
-				else
+				} else
 				{
 					$this->$key = $val;
 				}
@@ -197,8 +197,7 @@ 
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
 				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
-			}
-			else
+			} else
 			{
 				$name = $this->_prep_q_encoding($name, TRUE);
 			}
@@ -344,8 +343,7 @@ 
 		if (($this->_get_protocol() == "smtp") OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size))
 		{
 			$this->_bcc_array = $bcc;
-		}
-		else
+		} else
 		{
 			$this->_set_header('Bcc', implode(", ", $bcc));
 		}
@@ -444,8 +442,7 @@ 
 			if (strpos($email, ',') !== FALSE)
 			{
 				$email = preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY);
-			}
-			else
+			} else
 			{
 				$email = trim($email);
 				settype($email, "array");
@@ -676,16 +673,13 @@ 
 		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';
-		}
-		else
+		} else
 		{
 			return 'plain';
 		}
@@ -781,8 +775,7 @@ 
 			if (preg_match('/\<(.*)\>/', $email, $match))
 			{
 				return $match['1'];
-			}
-			else
+			} else
 			{
 				return $email;
 			}
@@ -795,8 +788,7 @@ 
 			if (preg_match( '/\<(.*)\>/', $addy, $match))
 			{
 				$clean_email[] = $match['1'];
-			}
-			else
+			} else
 			{
 				$clean_email[] = $addy;
 			}
@@ -828,8 +820,7 @@ 
 		if (preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->_body, $match))
 		{
 			$body = $match['1'];
-		}
-		else
+		} else
 		{
 			$body = $this->_body;
 		}
@@ -928,8 +919,7 @@ 
 			if ($temp != '')
 			{
 				$output .= $temp.$this->newline.$line;
-			}
-			else
+			} else
 			{
 				$output .= $line;
 			}
@@ -1034,8 +1024,7 @@ 
 				{
 					$this->_header_str .= $hdr;
 					$this->_finalbody = $this->_body;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr . $this->newline . $this->newline . $this->_body;
 				}
@@ -1049,8 +1038,7 @@ 
 				{
 					$hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
 					$hdr .= "Content-Transfer-Encoding: quoted-printable";
-				}
-				else
+				} else
 				{
 					$hdr .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline . $this->newline;
 
@@ -1071,8 +1059,7 @@ 
 				if ($this->_get_protocol() == 'mail')
 				{
 					$this->_header_str .= $hdr;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr . $this->_finalbody;
 				}
@@ -1173,8 +1160,7 @@ 
 		if ($this->_get_protocol() == 'mail')
 		{
 			$this->_finalbody = $body;
-		}
-		else
+		} else
 		{
 			$this->_finalbody = $hdr . $body;
 		}
@@ -1374,8 +1360,9 @@ 
 
 		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();
+			if (count($this->_bcc_array) > $this->bcc_batch_size) {
+							return $this->batch_bcc_send();
+			}
 		}
 
 		$this->_build_message();
@@ -1383,8 +1370,7 @@ 
 		if ( ! $this->_spool_email())
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return TRUE;
 		}
@@ -1437,8 +1423,7 @@ 
 			if ($this->protocol != 'smtp')
 			{
 				$this->_set_header('Bcc', implode(", ", $bcc));
-			}
-			else
+			} else
 			{
 				$this->_bcc_array = $bcc;
 			}
@@ -1539,13 +1524,11 @@ 
 			if ( ! mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str))
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return TRUE;
 			}
-		}
-		else
+		} else
 		{
 			// most documentation of sendmail using the "-f" flag lacks a space after it, however
 			// we've encountered servers that seem to require it to be in place.
@@ -1553,8 +1536,7 @@ 
 			if ( ! mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str, "-f ".$this->clean_email($this->_headers['From'])))
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return TRUE;
 			}
@@ -1680,8 +1662,9 @@ 
 	protected function _smtp_connect()
 	{
 		$ssl = NULL;
-		if ($this->smtp_crypto == 'ssl')
-			$ssl = 'ssl://';
+		if ($this->smtp_crypto == 'ssl') {
+					$ssl = 'ssl://';
+		}
 		$this->_smtp_connect = fsockopen($ssl.$this->smtp_host,
 										$this->smtp_port,
 										$errno,
@@ -1722,10 +1705,11 @@ 
 		{
 			case 'hello' :
 
-					if ($this->_smtp_auth OR $this->_get_encoding() == '8bit')
-						$this->_send_data('EHLO '.$this->_get_hostname());
-					else
-						$this->_send_data('HELO '.$this->_get_hostname());
+					if ($this->_smtp_auth OR $this->_get_encoding() == '8bit') {
+											$this->_send_data('EHLO '.$this->_get_hostname());
+					} else {
+											$this->_send_data('HELO '.$this->_get_hostname());
+					}
 
 						$resp = 250;
 			break;
@@ -1847,8 +1831,7 @@ 
 		{
 			$this->_set_error_message('lang:email_smtp_data_failure', $data);
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return TRUE;
 		}
@@ -1911,10 +1894,15 @@ 
 		$rip = (isset($_SERVER['REMOTE_ADDR']) AND $_SERVER['REMOTE_ADDR'] != "") ? $_SERVER['REMOTE_ADDR'] : FALSE;
 		$fip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) AND $_SERVER['HTTP_X_FORWARDED_FOR'] != "") ? $_SERVER['HTTP_X_FORWARDED_FOR'] : FALSE;
 
-		if ($cip && $rip)	$this->_IP = $cip;
-		elseif ($rip)		$this->_IP = $rip;
-		elseif ($cip)		$this->_IP = $cip;
-		elseif ($fip)		$this->_IP = $fip;
+		if ($cip && $rip) {
+			$this->_IP = $cip;
+		} elseif ($rip) {
+			$this->_IP = $rip;
+		} elseif ($cip) {
+			$this->_IP = $cip;
+		} elseif ($fip) {
+			$this->_IP = $fip;
+		}
 
 		if (strpos($this->_IP, ',') !== FALSE)
 		{
@@ -1975,8 +1963,7 @@ 
 		if (substr($msg, 0, 5) != 'lang:' || FALSE === ($line = $CI->lang->line(substr($msg, 5))))
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $msg)."<br />";
-		}
-		else
+		} else
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $line)."<br />";
 		}

web_interface/astpp/system/libraries/Cart.php

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -62,8 +64,7 @@ 
 		if ($this->CI->session->userdata('cart_contents') !== FALSE)
 		{
 			$this->_cart_contents = $this->CI->session->userdata('cart_contents');
-		}
-		else
+		} else
 		{
 			// No cart exists so we'll set some base values
 			$this->_cart_contents['cart_total'] = 0;
@@ -103,8 +104,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{
@@ -218,8 +218,7 @@ 
 		if (isset($items['options']) AND count($items['options']) > 0)
 		{
 			$rowid = md5($items['id'].implode('', $items['options']));
-		}
-		else
+		} else
 		{
 			// No options were submitted so we simply MD5 the product ID.
 			// Technically, we don't need to MD5 the ID in this case, but it makes
@@ -281,8 +280,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{
@@ -349,8 +347,7 @@ 
 		if ($items['qty'] == 0)
 		{
 			unset($this->_cart_contents[$items['rowid']]);
-		}
-		else
+		} else
 		{
 			$this->_cart_contents[$items['rowid']]['qty'] = $items['qty'];
 		}

web_interface/astpp/system/libraries/Typography.php

Braces +8 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -228,8 +230,7 @@ 
 		if ($reduce_linebreaks === TRUE)
 		{
 			$table['#<p>\n*</p>#'] = '';
-		}
-		else
+		} else
 		{
 			// If we have empty paragraph tags we add a non-breaking space
 			// otherwise most browsers won't treat them as true paragraphs
@@ -390,14 +391,14 @@ 
 			if (($i % 2) == 0)
 			{
 				$newstr .= nl2br($ex[$i]);
-			}
-			else
+			} else
 			{
 				$newstr .= $ex[$i];
 			}
 
-			if ($ct - 1 != $i)
-				$newstr .= "pre>";
+			if ($ct - 1 != $i) {
+							$newstr .= "pre>";
+			}
 		}
 
 		return $newstr;

web_interface/astpp/system/libraries/Pagination.php

Braces +14 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -133,8 +135,7 @@ 
 		if ($this->use_page_numbers)
 		{
 			$base_page = 1;
-		}
-		else
+		} else
 		{
 			$base_page = 0;
 		}
@@ -151,8 +152,7 @@ 
 				// Prep the current page - no funny business!
 				$this->cur_page = (int) $this->cur_page;
 			}
-		}
-		else
+		} else
 		{
 			if ($CI->uri->segment($this->uri_segment) != $base_page)
 			{
@@ -189,8 +189,7 @@ 
 			{
 				$this->cur_page = $num_pages;
 			}
-		}
-		else
+		} else
 		{
 			if ($this->cur_page > $this->total_rows)
 			{
@@ -215,8 +214,7 @@ 
 		if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE)
 		{
 			$this->base_url = rtrim($this->base_url).'&amp;'.$this->query_string_segment.'=';
-		}
-		else
+		} else
 		{
 			$this->base_url = rtrim($this->base_url, '/') .'/';
 		}
@@ -237,8 +235,7 @@ 
 			if ($this->use_page_numbers)
 			{
 				$i = $uri_page_number - 1;
-			}
-			else
+			} else
 			{
 				$i = $uri_page_number - $this->per_page;
 			}
@@ -246,8 +243,7 @@ 
 			if ($i == 0 && $this->first_url != '')
 			{
 				$output .= $this->prev_tag_open.'<a '.$this->anchor_class.'href="'.$this->first_url.'">'.$this->prev_link.'</a>'.$this->prev_tag_close;
-			}
-			else
+			} else
 			{
 				$i = ($i == 0) ? '' : $this->prefix.$i.$this->suffix;
 				$output .= $this->prev_tag_open.'<a '.$this->anchor_class.'href="'.$this->base_url.$i.'">'.$this->prev_link.'</a>'.$this->prev_tag_close;
@@ -264,8 +260,7 @@ 
 				if ($this->use_page_numbers)
 				{
 					$i = $loop;
-				}
-				else
+				} else
 				{
 					$i = ($loop * $this->per_page) - $this->per_page;
 				}
@@ -275,16 +270,14 @@ 
 					if ($this->cur_page == $loop)
 					{
 						$output .= $this->cur_tag_open.$loop.$this->cur_tag_close; // Current page
-					}
-					else
+					} else
 					{
 						$n = ($i == $base_page) ? '' : $i;
 
 						if ($n == '' && $this->first_url != '')
 						{
 							$output .= $this->num_tag_open.'<a '.$this->anchor_class.'href="'.$this->first_url.'">'.$loop.'</a>'.$this->num_tag_close;
-						}
-						else
+						} else
 						{
 							$n = ($n == '') ? '' : $this->prefix.$n.$this->suffix;
 
@@ -301,8 +294,7 @@ 
 			if ($this->use_page_numbers)
 			{
 				$i = $this->cur_page + 1;
-			}
-			else
+			} else
 			{
 				$i = ($this->cur_page * $this->per_page);
 			}
@@ -316,8 +308,7 @@ 
 			if ($this->use_page_numbers)
 			{
 				$i = $num_pages;
-			}
-			else
+			} else
 			{
 				$i = (($num_pages * $this->per_page) - $this->per_page);
 			}

web_interface/astpp/system/libraries/Image_lib.php

Braces +89 added lines, -92 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -176,8 +178,7 @@ 
 		if (function_exists('realpath') AND @realpath($this->source_image) !== FALSE)
 		{
 			$full_source_path = str_replace("\\", "/", realpath($this->source_image));
-		}
-		else
+		} else
 		{
 			$full_source_path = $this->source_image;
 		}
@@ -205,21 +206,18 @@ 
 		{
 			$this->dest_image = $this->source_image;
 			$this->dest_folder = $this->source_folder;
-		}
-		else
+		} else
 		{
 			if (strpos($this->new_image, '/') === FALSE)
 			{
 				$this->dest_folder = $this->source_folder;
 				$this->dest_image = $this->new_image;
-			}
-			else
+			} else
 			{
 				if (function_exists('realpath') AND @realpath($this->new_image) !== FALSE)
 				{
 					$full_dest_path = str_replace("\\", "/", realpath($this->new_image));
-				}
-				else
+				} else
 				{
 					$full_dest_path = $this->new_image;
 				}
@@ -229,8 +227,7 @@ 
 				{
 					$this->dest_folder = $full_dest_path.'/';
 					$this->dest_image = $this->source_image;
-				}
-				else
+				} else
 				{
 					$x = explode('/', $full_dest_path);
 					$this->dest_image = end($x);
@@ -283,17 +280,20 @@ 
 		 * from the actual file
 		 *
 		 */
-		if ($this->width == '')
-			$this->width = $this->orig_width;
+		if ($this->width == '') {
+					$this->width = $this->orig_width;
+		}
 
-		if ($this->height == '')
-			$this->height = $this->orig_height;
+		if ($this->height == '') {
+					$this->height = $this->orig_height;
+		}
 
 		// Set the quality
 		$this->quality = trim(str_replace("%", "", $this->quality));
 
-		if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality))
-			$this->quality = 90;
+		if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality)) {
+					$this->quality = 90;
+		}
 
 		// Set the x/y coordinates
 		$this->x_axis = ($this->x_axis == '' OR ! is_numeric($this->x_axis)) ? 0 : $this->x_axis;
@@ -407,8 +407,7 @@ 
 		{
 			$this->width	= $this->orig_height;
 			$this->height	= $this->orig_width;
-		}
-		else
+		} else
 		{
 			$this->width	= $this->orig_width;
 			$this->height	= $this->orig_height;
@@ -426,8 +425,7 @@ 
 		if ($this->rotation_angle == 'hor' OR $this->rotation_angle == 'vrt')
 		{
 			return $this->image_mirror_gd();
-		}
-		else
+		} else
 		{
 			return $this->image_rotate_gd();
 		}
@@ -479,8 +477,7 @@ 
 				$gd_version = str_replace('0', '', $this->gd_version());
 				$v2_override = ($gd_version == 2) ? TRUE : FALSE;
 			}
-		}
-		else
+		} else
 		{
 			// If resizing the x/y axis must be zero
 			$this->x_axis = 0;
@@ -504,8 +501,7 @@ 
 		{
 			$create	= 'imagecreatetruecolor';
 			$copy	= 'imagecopyresampled';
-		}
-		else
+		} else
 		{
 			$create	= 'imagecreate';
 			$copy	= 'imagecopyresized';
@@ -513,9 +509,11 @@ 
 
 		$dst_img = $create($this->width, $this->height);
 
-		if ($this->image_type == 3) // png we can actually preserve transparency
+		if ($this->image_type == 3) {
+			// png we can actually preserve transparency
 		{
 			imagealphablending($dst_img, FALSE);
+		}
 			imagesavealpha($dst_img, TRUE);
 		}
 
@@ -525,8 +523,7 @@ 
 		if ($this->dynamic_output == TRUE)
 		{
 			$this->image_display_gd($dst_img);
-		}
-		else
+		} else
 		{
 			// Or save it
 			if ( ! $this->image_save_gd($dst_img))
@@ -578,8 +575,7 @@ 
 		if ($action == 'crop')
 		{
 			$cmd .= " -crop ".$this->width."x".$this->height."+".$this->x_axis."+".$this->y_axis." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
-		}
-		elseif ($action == 'rotate')
+		} elseif ($action == 'rotate')
 		{
 			switch ($this->rotation_angle)
 			{
@@ -592,8 +588,7 @@ 
 			}
 
 			$cmd .= " ".$angle." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
-		}
-		else  // Resize
+		} else  // Resize
 		{
 			$cmd .= " -resize ".$this->width."x".$this->height." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
 		}
@@ -654,8 +649,7 @@ 
 		if ($action == 'crop')
 		{
 			$cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height;
-		}
-		elseif ($action == 'rotate')
+		} elseif ($action == 'rotate')
 		{
 			switch ($this->rotation_angle)
 			{
@@ -672,8 +666,7 @@ 
 			}
 
 			$cmd_inner = 'pnmflip -'.$angle.' ';
-		}
-		else // Resize
+		} else // Resize
 		{
 			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
 		}
@@ -731,8 +724,7 @@ 
 		if ($this->dynamic_output == TRUE)
 		{
 			$this->image_display_gd($dst_img);
-		}
-		else
+		} else
 		{
 			// Or save it
 			if ( ! $this->image_save_gd($dst_img))
@@ -791,8 +783,7 @@ 
 					$right--;
 				}
 			}
-		}
-		else
+		} else
 		{
 			for ($i = 0; $i < $width; $i++)
 			{
@@ -817,8 +808,7 @@ 
 		if ($this->dynamic_output == TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		else
+		} else
 		{
 			// Or save it
 			if ( ! $this->image_save_gd($src_img))
@@ -853,8 +843,7 @@ 
 		if ($this->wm_type == 'overlay')
 		{
 			return $this->overlay_watermark();
-		}
-		else
+		} else
 		{
 			return $this->text_watermark();
 		}
@@ -899,11 +888,13 @@ 
 		$this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
 		$this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
 
-		if ($this->wm_vrt_alignment == 'B')
-			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		if ($this->wm_vrt_alignment == 'B') {
+					$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		}
 
-		if ($this->wm_hor_alignment == 'R')
-			$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		if ($this->wm_hor_alignment == 'R') {
+					$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		}
 
 		//  Set the base x and y axis values
 		$x_axis = $this->wm_hor_offset + $this->wm_padding;
@@ -946,8 +937,7 @@ 
 		{
 			// copy the image directly, the image's alpha transparency being the sole determinant of blending
 			imagecopy($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height);
-		}
-		else
+		} else
 		{
 			// set our RGB value from above to be transparent and merge the images with the specified opacity
 			imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp));
@@ -958,8 +948,7 @@ 
 		if ($this->dynamic_output == TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		else
+		} else
 		{
 			if ( ! $this->image_save_gd($src_img))
 			{
@@ -1019,25 +1008,27 @@ 
 		// invert the offset.  Note: The horizontal
 		// offset flips itself automatically
 
-		if ($this->wm_vrt_alignment == 'B')
-			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		if ($this->wm_vrt_alignment == 'B') {
+					$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		}
 
-		if ($this->wm_hor_alignment == 'R')
-			$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		if ($this->wm_hor_alignment == 'R') {
+					$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		}
 
 		// Set font width and height
 		// These are calculated differently depending on
 		// whether we are using the true type font or not
 		if ($this->wm_use_truetype == TRUE)
 		{
-			if ($this->wm_font_size == '')
-				$this->wm_font_size = '17';
+			if ($this->wm_font_size == '') {
+							$this->wm_font_size = '17';
+			}
 
 			$fontwidth  = $this->wm_font_size-($this->wm_font_size/4);
 			$fontheight = $this->wm_font_size;
 			$this->wm_vrt_offset += $this->wm_font_size;
-		}
-		else
+		} else
 		{
 			$fontwidth  = imagefontwidth($this->wm_font_size);
 			$fontheight = imagefontheight($this->wm_font_size);
@@ -1048,8 +1039,9 @@ 
 		$y_axis = $this->wm_vrt_offset + $this->wm_padding;
 
 		// Set verticle alignment
-		if ($this->wm_use_drop_shadow == FALSE)
-			$this->wm_shadow_distance = 0;
+		if ($this->wm_use_drop_shadow == FALSE) {
+					$this->wm_shadow_distance = 0;
+		}
 
 		$this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
 		$this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
@@ -1073,13 +1065,15 @@ 
 			case "L":
 				break;
 			case "R":
-						if ($this->wm_use_drop_shadow)
-							$x_shad += ($this->orig_width - $fontwidth*strlen($this->wm_text));
+						if ($this->wm_use_drop_shadow) {
+													$x_shad += ($this->orig_width - $fontwidth*strlen($this->wm_text));
+						}
 							$x_axis += ($this->orig_width - $fontwidth*strlen($this->wm_text));
 				break;
 			case "C":
-						if ($this->wm_use_drop_shadow)
-							$x_shad += floor(($this->orig_width - $fontwidth*strlen($this->wm_text))/2);
+						if ($this->wm_use_drop_shadow) {
+													$x_shad += floor(($this->orig_width - $fontwidth*strlen($this->wm_text))/2);
+						}
 							$x_axis += floor(($this->orig_width  -$fontwidth*strlen($this->wm_text))/2);
 				break;
 		}
@@ -1087,14 +1081,15 @@ 
 		//  Add the text to the source image
 		if ($this->wm_use_truetype)
 		{
-			if ($this->wm_use_drop_shadow)
-				imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text);
+			if ($this->wm_use_drop_shadow) {
+							imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text);
+			}
 				imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text);
-		}
-		else
+		} else
 		{
-			if ($this->wm_use_drop_shadow)
-				imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color);
+			if ($this->wm_use_drop_shadow) {
+							imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color);
+			}
 				imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color);
 		}
 
@@ -1102,8 +1097,7 @@ 
 		if ($this->dynamic_output == TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		else
+		} else
 		{
 			$this->image_save_gd($src_img);
 		}
@@ -1127,11 +1121,13 @@ 
 	 */
 	function image_create_gd($path = '', $image_type = '')
 	{
-		if ($path == '')
-			$path = $this->full_src_path;
+		if ($path == '') {
+					$path = $this->full_src_path;
+		}
 
-		if ($image_type == '')
-			$image_type = $this->image_type;
+		if ($image_type == '') {
+					$image_type = $this->image_type;
+		}
 
 
 		switch ($image_type)
@@ -1280,11 +1276,13 @@ 
 	 */
 	function image_reproportion()
 	{
-		if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0)
-			return;
+		if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0) {
+					return;
+		}
 
-		if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0)
-			return;
+		if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0) {
+					return;
+		}
 
 		$new_width	= ceil($this->orig_width*$this->height/$this->orig_height);
 		$new_height	= ceil($this->width*$this->orig_height/$this->orig_width);
@@ -1301,8 +1299,7 @@ 
 			if ($this->master_dim == 'height')
 			{
 				$this->width = $new_width;
-			}
-			else
+			} else
 			{
 				$this->height = $new_height;
 			}
@@ -1325,8 +1322,9 @@ 
 		// For now we require GD but we should
 		// find a way to determine this using IM or NetPBM
 
-		if ($path == '')
-			$path = $this->full_src_path;
+		if ($path == '') {
+					$path = $this->full_src_path;
+		}
 
 		if ( ! file_exists($path))
 		{
@@ -1391,8 +1389,9 @@ 
 
 		foreach ($allowed as $item)
 		{
-			if ( ! isset($vals[$item]) OR $vals[$item] == '')
-				$vals[$item] = 0;
+			if ( ! isset($vals[$item]) OR $vals[$item] == '') {
+							$vals[$item] = 0;
+			}
 		}
 
 		if ($vals['width'] == 0 OR $vals['height'] == 0)
@@ -1403,8 +1402,7 @@ 
 		if ($vals['new_width'] == 0)
 		{
 			$vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']);
-		}
-		elseif ($vals['new_height'] == 0)
+		} elseif ($vals['new_height'] == 0)
 		{
 			$vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']);
 		}
@@ -1501,8 +1499,7 @@ 
 				$this->error_msg[] = $msg;
 				log_message('error', $msg);
 			}
-		}
-		else
+		} else
 		{
 			$msg = ($CI->lang->line($msg) == FALSE) ? $msg : $CI->lang->line($msg);
 			$this->error_msg[] = $msg;

web_interface/astpp/system/libraries/Table.php

Braces +9 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -185,15 +187,13 @@ 
 					if (is_array($val) && isset($val['data']))
 					{
 						$args[$key] = $val;
-					}
-					else
+					} else
 					{
 						$args[$key] = array('data' => $val);
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach ($args as $key => $val)
 			{
@@ -239,8 +239,7 @@ 
 			if (is_object($table_data))
 			{
 				$this->_set_from_object($table_data);
-			}
-			elseif (is_array($table_data))
+			} elseif (is_array($table_data))
 			{
 				$set_heading = (count($this->heading) == 0 AND $this->auto_heading == FALSE) ? FALSE : TRUE;
 				$this->_set_from_array($table_data, $set_heading);
@@ -341,14 +340,12 @@ 
 					if ($cell === "" OR $cell === NULL)
 					{
 						$out .= $this->empty_cells;
-					}
-					else
+					} else
 					{
 						if ($function !== FALSE && is_callable($function))
 						{
 							$out .= call_user_func($function, $cell);
-						}
-						else
+						} else
 						{
 							$out .= $cell;
 						}
@@ -449,8 +446,7 @@ 
 			if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE)
 			{
 				$this->heading = $this->_prep_args($row);
-			}
-			else
+			} else
 			{
 				$this->rows[] = $this->_prep_args($row);
 			}

web_interface/astpp/system/libraries/javascript/Jquery.php

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * CodeIgniter
@@ -716,8 +718,7 @@ 
 		if ($this->CI->config->item('javascript_ajax_img') == '')
 		{
 			$loading_notifier = "Loading...";
-		}
-		else
+		} else
 		{
 			$loading_notifier = '<img src=\'' . $this->CI->config->slash_item('base_url') . $this->CI->config->item('javascript_ajax_img') . '\' alt=\'Loading\' />';
 		}
@@ -874,8 +875,7 @@ 
 				$sort_options[] = "\n\t\t".$k.': '.$v."";
 			}
 			$sort_options = implode(",", $sort_options);
-		}
-		else
+		} else
 		{
 			$sort_options = '';
 		}
@@ -1056,8 +1056,7 @@ 
 		if (in_array($speed, array('slow', 'normal', 'fast')))
 		{
 			$speed = '"'.$speed.'"';
-		}
-		elseif (preg_match("/[^0-9]/", $speed))
+		} elseif (preg_match("/[^0-9]/", $speed))
 		{
 			$speed = '';
 		}