iNextrix / ASTPP

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

web_interface/astpp/system/helpers/form_helper.php

Spacing +47 added lines, -47 removed lines

@@ -80,11 +80,11 @@ 
 		return $form;

 	}

 }

-if(!function_exists('form_breadcrumb')){

-	function form_breadcrumb($info=''){

-	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+if ( ! function_exists('form_breadcrumb')) {

+	function form_breadcrumb($info = '') {

+	 $form = false;

+	 if ( ! empty($info))

+ 	$form .= "<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

 		</div>";

 	return $form;

@@ -212,7 +212,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else {

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -226,7 +226,7 @@ 
 	{

 				//  echo '<pre>'; print_r($data); exit;

 			//$data["class"] = "col-md-5 form-control";

-			$data['value']='Delete';

+			$data['value'] = 'Delete';

 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');

 

 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";

@@ -377,21 +377,21 @@ 
 

 		if ($extra != '') $extra = ' '.$extra;

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-				if(is_array($name)){

-					 $str=null;

-					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+				if (is_array($name)) {

+					 $str = null;

+					 foreach ($name as $key=>$value) {

+					  if ($key != 'class' && $key != 'disabled')

+					  $str .= $key."='$value' ";

 					 }

-					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

-					  $str.='disabled = "disabled"';

+					 if (isset($name['disabled']) && $name['disabled'] == 'disabled') {

+					  $str .= 'disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

-					if(!empty($extra)){

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

+				} else {

+					if ( ! empty($extra)) {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

+					} else {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

 //                if($extra != '' ){

@@ -418,12 +418,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 //echo $form; exit;

@@ -449,21 +449,21 @@ 
 			}

 		}

 		if ($extra != '') $extra = ' '.$extra;

-				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+				$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

 				}

-				else{

-					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

+				else {

+					$form = '<select name="'.$name.'"'.$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

 		$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -481,12 +481,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 

@@ -517,35 +517,35 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && ! is_array($extra)) $extra = ' '.$extra;

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

 

-		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+		$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				/*

 		  ASTPP  3.0  For Search Display In

 		*/

-				if(empty($extra)){

+				if (empty($extra)) {

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

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

-					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				} else {

+					$form = '<select name="'.$name.'"'.$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else {

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

 		//$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -685,13 +685,13 @@ 
 		{

 			unset($defaults['checked']);

 		}

-		$class=NULL;

+		$class = NULL;

 

 //echo "<pre>".$value; print_r($extra); exit;

-		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

-		$class='onoffswitch-inner';

-		}else{

-		$class='onoffswitch-inner';

+		if (isset($extra[$value]) && ! empty($extra) && $extra[$value] == '0') {

+		$class = 'onoffswitch-inner';

+		} else {

+		$class = 'onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){

 	      if(isset($extra[0])){

Braces +25 added lines, -18 removed lines

@@ -83,10 +83,11 @@ 
 if(!function_exists('form_breadcrumb')){

 	function form_breadcrumb($info=''){

 	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+	 if(!empty($info)) {
+	  	$form.="<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

-		</div>";

+		</div>";
+	 }
 	return $form;

 	}

 }

@@ -212,7 +213,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else{

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -375,22 +376,25 @@ 
 			}

 		}

 

-		if ($extra != '') $extra = ' '.$extra;

+		if ($extra != '') {
+			$extra = ' '.$extra;
+		}
 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				if(is_array($name)){

 					 $str=null;

 					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+					  if($key !='class' && $key!='disabled') {
+					  					  $str.=$key."='$value' ";
+					  }
 					 }

 					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

 					  $str.='disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

+				} else{

 					if(!empty($extra)){

 						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

+					} else{

 						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

@@ -448,15 +452,16 @@ 
 				$selected = array($_POST[$name]);

 			}

 		}

-		if ($extra != '') $extra = ' '.$extra;

+		if ($extra != '') {
+			$extra = ' '.$extra;
+		}
 				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 		if(is_array($name) && !isset($name["id"])){

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if(is_array($name) && isset($name["id"])){

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

-				}

-				else{

+				} else{

 					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

@@ -517,7 +522,9 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && !is_array($extra)) {
+			$extra = ' '.$extra;
+		}
 			/**********************************************************/

 

 		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

@@ -530,15 +537,15 @@ 
 				/*********************************/

 		if(is_array($name) && !isset($name["id"])){

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if(is_array($name) && isset($name["id"])){

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

+				} else{

 					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else{

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

@@ -690,7 +697,7 @@ 
 //echo "<pre>".$value; print_r($extra); exit;

 		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

 		$class='onoffswitch-inner';

-		}else{

+		} else{

 		$class='onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){