iNextrix / ASTPP

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.'"';
 			}

web_interface/astpp/system/helpers/date_helper.php

Braces +10 added lines, -8 removed lines

@@ -465,8 +465,7 @@ 
 		if (isset($ex['2']) && preg_match('/[0-9]{1,2}/', $ex['2']))
 		{
 			$sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2'];
-		}
-		else
+		} else
 		{
 			// Unless specified, seconds get set to zero.
 			$sec = '00';
@@ -476,14 +475,17 @@ 
 		{
 			$ampm = strtolower($split['2']);
 
-			if (substr($ampm, 0, 1) == 'p' AND $hour < 12)
-				$hour = $hour + 12;
+			if (substr($ampm, 0, 1) == 'p' AND $hour < 12) {
+							$hour = $hour + 12;
+			}
 
-			if (substr($ampm, 0, 1) == 'a' AND $hour == 12)
-				$hour = '00';
+			if (substr($ampm, 0, 1) == 'a' AND $hour == 12) {
+							$hour = '00';
+			}
 
-			if (strlen($hour) == 1)
-				$hour = '0'.$hour;
+			if (strlen($hour) == 1) {
+							$hour = '0'.$hour;
+			}
 		}
 
 		return mktime($hour, $min, $sec, $month, $day, $year);

web_interface/astpp/system/helpers/captcha_helper.php

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 				$y = rand(0, $img_height / 2);
 				imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
 				$x += ($font_size * 2);
-			}
-			else
+			} else
 			{
 				$y = rand($img_height / 2, $img_height - 3);
 				imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));

web_interface/astpp/system/helpers/template_inheritance_helper.php

Spacing +3 added lines, -3 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -283,8 +283,7 @@
 		//echo 'tttttttttttt';
 		if (isset($GLOBALS['CI'])) {
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
-		}
-		else {
+		} else {
 			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 	}