iNextrix / ASTPP

web_interface/astpp/application/views/header.php

Indentation +33 added lines, -33 removed lines

@@ -131,32 +131,32 @@ 
          	 <li>
          	 
          	 <?php
-         	 $acc_info=$this->session->userdata('accountinfo');
-         	 if($this->session->userdata('userlevel_logintype') != '0'){?>
+		 	 $acc_info=$this->session->userdata('accountinfo');
+		 	 if($this->session->userdata('userlevel_logintype') != '0'){?>
 		      <a href="<?php echo base_url();?>dashboard/" class=""> <? } else{?>    
 		    <a href="<?php echo base_url();?>user/user/" class="">	
 		<? }
-                if($this->session->userdata('logintype')!=2){
-        	        $result=(array)$this->db->get_where('accounts',array("id"=>$acc_info['id']),1)->first_row();
+				if($this->session->userdata('logintype')!=2){
+					$result=(array)$this->db->get_where('accounts',array("id"=>$acc_info['id']),1)->first_row();
 			$variable =$result['posttoexternal']==1 ? 'Credit' : gettext('Bal');  
 			$amount=$result['posttoexternal']==1 ? $result['credit_limit'] :$result['balance'];
-                        $value= $this->common_model->calculate_currency($amount,'','',true);
-                        if($value >0){
-                            $color='#397A13';
-                        }
-                        if($value < 0){
-                            $color='#EE0E43';
-                        }
-                        if($value == 0){
-                            $color='#1A1919';
-                        }
-                        $balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
-                 }else{
-                    $balance_str = '';
-                }
+						$value= $this->common_model->calculate_currency($amount,'','',true);
+						if($value >0){
+							$color='#397A13';
+						}
+						if($value < 0){
+							$color='#EE0E43';
+						}
+						if($value == 0){
+							$color='#1A1919';
+						}
+						$balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
+				 }else{
+					$balance_str = '';
+				}
                 
 		$logged_user=$acc_info['first_name']." ".$acc_info['last_name'];
-                	?>
+					?>
                 	<span>
                             <span class="profile_name">
                                 <?= $logged_user?>
@@ -203,27 +203,27 @@ 
 
 	  <?php 
 			$menu_info = unserialize($this->session->userdata("menuinfo"));
-            foreach($menu_info as $menu_key => $menu_values){
+			foreach($menu_info as $menu_key => $menu_values){
 	  ?>
                 
      <?php
 		  if(common_model::$global_config['system_config']['opensips']== 0 &&  $menu_key !='SIP Devices'){
-		      echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';
+			  echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';
 		  }
 		  if(common_model::$global_config['system_config']['opensips']== 1 &&  $menu_key != 'Opensips'){
-		      echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';  
+			  echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';  
 		  }
-    ?>
+	?>
                 
                          <ul class="dropdown-menu">
                     <? foreach($menu_values as $sub_menu_key => $sub_menu_values){?>
                        
                            <?  if($sub_menu_key === 0){ ?>
                             <? foreach($sub_menu_values as $sub_key => $sub_menu_lables){
-                                if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge') ||(common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips')||
-                                (common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') ||
-                                (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
-                                }else{?>
+								if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge') ||(common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips')||
+								(common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') ||
+								(($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
+								}else{?>
                                 <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
 				<?}?>
 				<?} ?>
@@ -235,13 +235,13 @@ 
 				<?php }if(($acc_info['type']==3 || $acc_info['type']== 0) && $acc_info['allow_ip_management']== 1 && strtolower($sub_menu_lables["menu_label"]) !='ip settings'){ ?>
 				    <li><a href=""><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
 				<? }
-                            ?>
+							?>
                                  <div class="col-4"><div class="col-md-6 no-padding">
 									 <ul class="col-12 padding-x-8">
                                 <? foreach($sub_menu_values as $sub_menu_lables){ 
-				     if($sub_menu_lables['menu_label'] != 'Configuration'){
+					 if($sub_menu_lables['menu_label'] != 'Configuration'){
 				  if(common_model::$global_config['system_config']['opensips']==0 &&  $sub_menu_lables["menu_label"] !='SIP Devices'){
-				      ?>
+					  ?>
 				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
 				  <? }
 				  if(common_model::$global_config['system_config']['opensips']== 1 && $sub_menu_key !='opensips'){ ?>
@@ -251,12 +251,12 @@ 
 				} ?>
 				</ul></div></div>         
                         <?} 
-                        }  ?> 
+						}  ?> 
                   </ul>   
                 </li> 
             <? } 
-     echo '<li>&nbsp;</li>';
-             ?>
+	 echo '<li>&nbsp;</li>';
+			 ?>
             </ul>
             </div>
         </div>

Spacing +71 added lines, -71 removed lines

@@ -6,11 +6,11 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/> 
  <title>
 	 <?php
-	$user_header= $this->session->userdata('user_header');
-	if(isset($user_header) && $user_header!='') { ?>
+	$user_header = $this->session->userdata('user_header');
+	if (isset($user_header) && $user_header != '') { ?>
 		<? start_block_marker('page-title') ?><? end_block_marker() ?> | <?php echo $user_header; ?>
 	<?php
-	}else{ ?>
+	} else { ?>
 		<? start_block_marker('page-title') ?><? end_block_marker() ?> | ASTPP - Open Source Voip Billing Solution
 	<?php
 	}
@@ -18,7 +18,7 @@ 
 </title>
     <link rel="icon" href="<? echo base_url(); ?>assets/images/favicon.ico"/>
     <script language="javascript" type="text/javascript">
-	var base_url = '<?php echo base_url();?>';
+	var base_url = '<?php echo base_url(); ?>';
 	function seetext(x){
 		x.type = "text";
 	}
@@ -47,17 +47,17 @@ 
      <link rel="stylesheet" media="all" type="text/css" href="<?php echo base_url(); ?>/assets/css/tabcontent.css"/>
      <link href="<?= base_url() ?>assets/fonts/font-awesome-4.5.0/css/font-awesome.css" rel="stylesheet"/>
      <link href="<?= base_url() ?>assets/css/global-style.css" rel="stylesheet" type="text/css"/>
-     <link href="<?php echo base_url();?>assets/css/facebox.css" rel="stylesheet" media="all" />	
-     <link rel="stylesheet" href="<?php echo base_url();?>assets/css/flexigrid.css" type="text/css"/>
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.7.1.js"></script>
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/bootstrap.min.js"></script>
+     <link href="<?php echo base_url(); ?>assets/css/facebox.css" rel="stylesheet" media="all" />	
+     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/flexigrid.css" type="text/css"/>
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/jquery-1.7.1.js"></script>
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
      <script type="text/javascript" src="<?php echo base_url(); ?>/assets/js/jquery.datetimepicker.js"></script>
      <script type="text/javascript" src="<?php echo base_url(); ?>/assets/js/fileinput.js"></script>
      <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tabcontent.js"></script>
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.js"></script>
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.src.js"></script> 
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/facebox.js"></script>
-     <script type="text/javascript" src="<?php echo base_url();?>assets/js/flexigrid.js"></script>
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.js"></script>
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.src.js"></script> 
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/facebox.js"></script>
+     <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/flexigrid.js"></script>
      <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/module_js/generate_grid.js"></script>
     <noscript>
       <div id="noscript-warning">
@@ -93,23 +93,23 @@ 
     <div class="container">
     	<div class="navbar-header pull-left col-md-12_new">	
 		  <div class="navbar-header col-md-9_new">
-	        <? if($this->session->userdata('userlevel_logintype') != '0'){
+	        <? if ($this->session->userdata('userlevel_logintype') != '0') {
 			$user_logo = $this->session->userdata('user_logo');	
-			if(!isset($user_logo) && $user_logo=='') { 
+			if ( ! isset($user_logo) && $user_logo == '') { 
 				echo "logo.png";
 			}
 
 		?>
-			<a class="navbar-brand no-padding margin-t-15" href="<?php echo base_url();?>dashboard/">
-                	<img id="logo" alt="dashboard" src="<?php echo base_url();?>upload/<?= $user_logo?>" width="187" height="71" border="0">
-	      <? } else{
+			<a class="navbar-brand no-padding margin-t-15" href="<?php echo base_url(); ?>dashboard/">
+                	<img id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?= $user_logo?>" width="187" height="71" border="0">
+	      <? } else {
 			$user_logo = $this->session->userdata('user_logo');	
-			if(!isset($user_logo) && $user_logo=='') { 
+			if ( ! isset($user_logo) && $user_logo == '') { 
 				echo "logo.png";
 			}
 		?> 
-                	<a class="navbar-brand no-padding margin-t-15" href="<?php echo base_url();?>user/user/">
-                	<img id="logo" alt="user_logo" src="<?php echo base_url();?>upload/<?= $user_logo?>" width="187" height="71" border="0">
+                	<a class="navbar-brand no-padding margin-t-15" href="<?php echo base_url(); ?>user/user/">
+                	<img id="logo" alt="user_logo" src="<?php echo base_url(); ?>upload/<?= $user_logo?>" width="187" height="71" border="0">
 		<? }?>
                 </a>
               
@@ -131,63 +131,63 @@ 
          	 <li>
          	 
          	 <?php
-         	 $acc_info=$this->session->userdata('accountinfo');
-         	 if($this->session->userdata('userlevel_logintype') != '0'){?>
-		      <a href="<?php echo base_url();?>dashboard/" class=""> <? } else{?>    
-		    <a href="<?php echo base_url();?>user/user/" class="">	
+         	 $acc_info = $this->session->userdata('accountinfo');
+         	 if ($this->session->userdata('userlevel_logintype') != '0') {?>
+		      <a href="<?php echo base_url(); ?>dashboard/" class=""> <? } else {?>    
+		    <a href="<?php echo base_url(); ?>user/user/" class="">	
 		<? }
-                if($this->session->userdata('logintype')!=2){
-        	        $result=(array)$this->db->get_where('accounts',array("id"=>$acc_info['id']),1)->first_row();
-			$variable =$result['posttoexternal']==1 ? 'Credit' : gettext('Bal');  
-			$amount=$result['posttoexternal']==1 ? $result['credit_limit'] :$result['balance'];
-                        $value= $this->common_model->calculate_currency($amount,'','',true);
-                        if($value >0){
-                            $color='#397A13';
+                if ($this->session->userdata('logintype') != 2) {
+        	        $result = (array)$this->db->get_where('accounts', array("id"=>$acc_info['id']), 1)->first_row();
+			$variable = $result['posttoexternal'] == 1 ? 'Credit' : gettext('Bal');  
+			$amount = $result['posttoexternal'] == 1 ? $result['credit_limit'] : $result['balance'];
+                        $value = $this->common_model->calculate_currency($amount, '', '', true);
+                        if ($value > 0) {
+                            $color = '#397A13';
                         }
-                        if($value < 0){
-                            $color='#EE0E43';
+                        if ($value < 0) {
+                            $color = '#EE0E43';
                         }
-                        if($value == 0){
-                            $color='#1A1919';
+                        if ($value == 0) {
+                            $color = '#1A1919';
                         }
                         $balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
-                 }else{
+                 } else {
                     $balance_str = '';
                 }
                 
-		$logged_user=$acc_info['first_name']." ".$acc_info['last_name'];
+		$logged_user = $acc_info['first_name']." ".$acc_info['last_name'];
                 	?>
                 	<span>
                             <span class="profile_name">
                                 <?= $logged_user?>
                             </span>
-                            <label class="profile_label no-margin"><?php echo $balance_str;?>
+                            <label class="profile_label no-margin"><?php echo $balance_str; ?>
                             </label>
                         </span>                          
                  </a>
                 <ul class="dropdown-box">
-		    <? if($this->session->userdata('userlevel_logintype') != '0' && $this->session->userdata('userlevel_logintype') != '3'){?>
-		      <li><a href="<?php echo base_url();?>dashboard/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
-		    <? } else{?>    
-		      <li><a href="<?php echo base_url();?>user/user/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
+		    <? if ($this->session->userdata('userlevel_logintype') != '0' && $this->session->userdata('userlevel_logintype') != '3') {?>
+		      <li><a href="<?php echo base_url(); ?>dashboard/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
+		    <? } else {?>    
+		      <li><a href="<?php echo base_url(); ?>user/user/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
 		    <? }?>
 		   
-<? if($this->session->userdata('userlevel_logintype') != '-1'){
+<? if ($this->session->userdata('userlevel_logintype') != '-1') {
 ?>
-		    <li><a href="<?php echo base_url();?>user/user_myprofile/"><i class= "fa fa-user"></i> &nbsp;
+		    <li><a href="<?php echo base_url(); ?>user/user_myprofile/"><i class= "fa fa-user"></i> &nbsp;
 		    <?php echo gettext('My Profile'); ?></a></li>
 		      <?
 }?>
 	    
-		    <? if($this->session->userdata('userlevel_logintype') == '-1'){?>
+		    <? if ($this->session->userdata('userlevel_logintype') == '-1') {?>
 		      <li style="-moz-border-radius: 5px 5px 5px 5px;-webkit-border-radius: 5px 5px 5px 5px;border-radius: 5px 5px 5px 5px;"><a href="http://bugs.astppbilling.org/" target="_blank"><i class= "fa fa-bug"></i> &nbsp;<?php echo gettext('Report a Bug'); ?></a></li>
 		    <?}?>
-		    <? if($this->session->userdata('userlevel_logintype') == '-1'){?>
+		    <? if ($this->session->userdata('userlevel_logintype') == '-1') {?>
 		    <li><a href="https://astppdoc.atlassian.net/wiki/display/ASTPP/Welcome+to+ASTPP" target="_blank"><i class="fa fa-file-text"></i> &nbsp;Documentation</a></li>
 		    <li><a href="http://www.astppbilling.org/sip-dialer" target="_blank"><i class="fa fa-mobile fa-lg" aria-hidden="true"></i> &nbsp;Get App</a></li>
 		    <?}?>
 				
-                <li><a href="<?php echo base_url();?>logout"><i class="fa fa-power-off"></i> &nbsp;Log out</a></li>
+                <li><a href="<?php echo base_url(); ?>logout"><i class="fa fa-power-off"></i> &nbsp;Log out</a></li>
                 </ul>
                </li>
               </ul>    	
@@ -203,49 +203,49 @@ 
 
 	  <?php 
 			$menu_info = unserialize($this->session->userdata("menuinfo"));
-            foreach($menu_info as $menu_key => $menu_values){
+            foreach ($menu_info as $menu_key => $menu_values) {
 	  ?>
                 
      <?php
-		  if(common_model::$global_config['system_config']['opensips']== 0 &&  $menu_key !='SIP Devices'){
+		  if (common_model::$global_config['system_config']['opensips'] == 0 && $menu_key != 'SIP Devices') {
 		      echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';
 		  }
-		  if(common_model::$global_config['system_config']['opensips']== 1 &&  $menu_key != 'Opensips'){
+		  if (common_model::$global_config['system_config']['opensips'] == 1 && $menu_key != 'Opensips') {
 		      echo '<li><a href="">'.gettext($menu_key).'<b class="caret"></b></a>';  
 		  }
     ?>
                 
                          <ul class="dropdown-menu">
-                    <? foreach($menu_values as $sub_menu_key => $sub_menu_values){?>
+                    <? foreach ($menu_values as $sub_menu_key => $sub_menu_values) {?>
                        
-                           <?  if($sub_menu_key === 0){ ?>
-                            <? foreach($sub_menu_values as $sub_key => $sub_menu_lables){
-                                if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge') ||(common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips')||
-                                (common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') ||
-                                (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
-                                }else{?>
-                                <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
+                           <?  if ($sub_menu_key === 0) { ?>
+                            <? foreach ($sub_menu_values as $sub_key => $sub_menu_lables) {
+                                if ((common_model::$global_config['system_config']['paypal_status'] == 1 && strtolower($sub_menu_lables["menu_label"]) == 'recharge') || (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_lables["menu_label"] == 'Opensips') ||
+                                (common_model::$global_config['system_config']['opensips'] == 0 && $sub_menu_lables["menu_label"] == 'SIP Devices') ||
+                                (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')) {
+                                } else {?>
+                                <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?php echo gettext($sub_menu_lables["menu_label"]); ?></a></li>
 				<?}?>
 				<?} ?>
-                            <?php }else{
-				if(common_model::$global_config['system_config']['opensips']==0 && $menu_key !='System Configuration'){ ?>    
-				    <li><a href=""><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
-				<? } if(common_model::$global_config['system_config']['opensips']==1) {?>
-				    <li><a href=""><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
-				<?php }if(($acc_info['type']==3 || $acc_info['type']== 0) && $acc_info['allow_ip_management']== 1 && strtolower($sub_menu_lables["menu_label"]) !='ip settings'){ ?>
-				    <li><a href=""><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
+                            <?php } else {
+				if (common_model::$global_config['system_config']['opensips'] == 0 && $menu_key != 'System Configuration') { ?>    
+				    <li><a href=""><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
+				<? } if (common_model::$global_config['system_config']['opensips'] == 1) {?>
+				    <li><a href=""><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
+				<?php }if (($acc_info['type'] == 3 || $acc_info['type'] == 0) && $acc_info['allow_ip_management'] == 1 && strtolower($sub_menu_lables["menu_label"]) != 'ip settings') { ?>
+				    <li><a href=""><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
 				<? }
                             ?>
                                  <div class="col-4"><div class="col-md-6 no-padding">
 									 <ul class="col-12 padding-x-8">
-                                <? foreach($sub_menu_values as $sub_menu_lables){ 
-				     if($sub_menu_lables['menu_label'] != 'Configuration'){
-				  if(common_model::$global_config['system_config']['opensips']==0 &&  $sub_menu_lables["menu_label"] !='SIP Devices'){
+                                <? foreach ($sub_menu_values as $sub_menu_lables) { 
+				     if ($sub_menu_lables['menu_label'] != 'Configuration') {
+				  if (common_model::$global_config['system_config']['opensips'] == 0 && $sub_menu_lables["menu_label"] != 'SIP Devices') {
 				      ?>
-				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
+				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?php echo gettext($sub_menu_lables["menu_label"]); ?></a></li>
 				  <? }
-				  if(common_model::$global_config['system_config']['opensips']== 1 && $sub_menu_key !='opensips'){ ?>
-				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?=$sub_menu_lables["menu_label"];?></a></li>
+				  if (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_key != 'opensips') { ?>
+				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?=$sub_menu_lables["menu_label"]; ?></a></li>
 				  <? } 
 				}
 				} ?>

Braces +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 	if(isset($user_header) && $user_header!='') { ?>
 		<? start_block_marker('page-title') ?><? end_block_marker() ?> | <?php echo $user_header; ?>
 	<?php
-	}else{ ?>
+	} else{ ?>
 		<? start_block_marker('page-title') ?><? end_block_marker() ?> | ASTPP - Open Source Voip Billing Solution
 	<?php
 	}
@@ -151,7 +151,7 @@ 
                             $color='#1A1919';
                         }
                         $balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
-                 }else{
+                 } else{
                     $balance_str = '';
                 }
                 
@@ -223,11 +223,11 @@ 
                                 if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge') ||(common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips')||
                                 (common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') ||
                                 (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
-                                }else{?>
+                                } else{?>
                                 <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
 				<?}?>
 				<?} ?>
-                            <?php }else{
+                            <?php } else{
 				if(common_model::$global_config['system_config']['opensips']==0 && $menu_key !='System Configuration'){ ?>    
 				    <li><a href=""><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
 				<? } if(common_model::$global_config['system_config']['opensips']==1) {?>

web_interface/astpp/application/views/left_panel_master.php

Indentation +78 added lines, -78 removed lines

@@ -31,18 +31,18 @@ 
   </div>

 </div>

 <?php

-    $astpp_msg = false;

-    $msg_type = "";

-    $astpp_err_msg = $this->session->flashdata('astpp_errormsg');

-    if ($astpp_err_msg) {

-        $astpp_msg = $astpp_err_msg;

-        $msg_type = "error";

-    }

+	$astpp_msg = false;

+	$msg_type = "";

+	$astpp_err_msg = $this->session->flashdata('astpp_errormsg');

+	if ($astpp_err_msg) {

+		$astpp_msg = $astpp_err_msg;

+		$msg_type = "error";

+	}

     

    $astpp_notify_msg = $this->session->flashdata('astpp_notification');

    if ($astpp_notify_msg) {  

-        $astpp_msg = $astpp_notify_msg;

-        $msg_type = "notification";

+		$astpp_msg = $astpp_notify_msg;

+		$msg_type = "notification";

    }

    if($astpp_msg){

 ?>

@@ -61,92 +61,92 @@ 
 <div class="sidebar collapse">

 	

              <?php 

-             $uri_string= uri_string();

-             $uri_arr=explode("/",$uri_string);

-             $entity_name=false;

-             if(isset($uri_arr[1]) && !empty($uri_arr[1])){

-                    $function_explode=explode("_",$uri_arr[1]);

-                   $entity_name = isset($function_explode[1]) && !empty($function_explode[1]) ? $function_explode[0] : false;

-             }

+			 $uri_string= uri_string();

+			 $uri_arr=explode("/",$uri_string);

+			 $entity_name=false;

+			 if(isset($uri_arr[1]) && !empty($uri_arr[1])){

+					$function_explode=explode("_",$uri_arr[1]);

+				   $entity_name = isset($function_explode[1]) && !empty($function_explode[1]) ? $function_explode[0] : false;

+			 }

              

-             $accountinfo=$this->session->userdata('accountinfo');

-             if($accountinfo['type'] != 0  && $accountinfo['type'] !=3){

-              $menu_info= ($uri_arr[0]=="user"

-                            ? unserialize(RESELLERPROFILE_ARRAY):($uri_arr[0]=="accounts"&& $entity_name =='customer'

-                            ? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

-                            ? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

-                            ? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-             }else{

-               $menu_info=null;

-               $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

-               $new_menu_info=array();

-                $menus=  unserialize($this->session->userdata('menuinfo'));

-                foreach($menus as $entity_key=>$entity_menu){

-                    foreach($entity_menu as $entity_subkey=>$entity_submenu){

-                         foreach($entity_submenu as $subkey=>$submenus){

-                             if($submenus['module_url']==$current_menu_url){

-                                 $new_menu_info=$entity_menu;

-                             }

-                         }

-                    }

-                }

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

-                    foreach($value as $subvalue){

-                        $menu_info[$subvalue['menu_label']]=$subvalue['module_url'];

-                    }

-                }

-             }

-             if($accountinfo['type']==0 || $accountinfo['type']==3){

-	      if($uri_arr[0]=='user' && $uri_arr[1] =='user_myprofile' || $uri_arr[0]=='user' && $uri_arr[1]=='user_change_password'){

+			 $accountinfo=$this->session->userdata('accountinfo');

+			 if($accountinfo['type'] != 0  && $accountinfo['type'] !=3){

+			  $menu_info= ($uri_arr[0]=="user"

+							? unserialize(RESELLERPROFILE_ARRAY):($uri_arr[0]=="accounts"&& $entity_name =='customer'

+							? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

+							? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

+							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

+			 }else{

+			   $menu_info=null;

+			   $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

+			   $new_menu_info=array();

+				$menus=  unserialize($this->session->userdata('menuinfo'));

+				foreach($menus as $entity_key=>$entity_menu){

+					foreach($entity_menu as $entity_subkey=>$entity_submenu){

+						 foreach($entity_submenu as $subkey=>$submenus){

+							 if($submenus['module_url']==$current_menu_url){

+								 $new_menu_info=$entity_menu;

+							 }

+						 }

+					}

+				}

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

+					foreach($value as $subvalue){

+						$menu_info[$subvalue['menu_label']]=$subvalue['module_url'];

+					}

+				}

+			 }

+			 if($accountinfo['type']==0 || $accountinfo['type']==3){

+		  if($uri_arr[0]=='user' && $uri_arr[1] =='user_myprofile' || $uri_arr[0]=='user' && $uri_arr[1]=='user_change_password'){

 		$menu_info=unserialize(CUSTOMERPROFILE_ARRAY);

-	      }

-             }

-             if(!empty($menu_info)){

-                echo "<ul class='sidemenu'>";

-                $i=0;

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

-                $url=($entity_name=='provider'||$entity_name =='customer' || $entity_name =='reseller' || $uri_arr[0] =="package") && isset($uri_arr[2]) && !empty($uri_arr[2])

-                    ?

-                base_url().$value.$uri_arr[2]."/" : 

-                base_url().$value;

-                $value_flag=false;

+		  }

+			 }

+			 if(!empty($menu_info)){

+				echo "<ul class='sidemenu'>";

+				$i=0;

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

+				$url=($entity_name=='provider'||$entity_name =='customer' || $entity_name =='reseller' || $uri_arr[0] =="package") && isset($uri_arr[2]) && !empty($uri_arr[2])

+					?

+				base_url().$value.$uri_arr[2]."/" : 

+				base_url().$value;

+				$value_flag=false;

 		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

 		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

-		    $value_flag=false;

+			$value_flag=false;

 		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

-		    $value_flag=false;

+			$value_flag=false;

 		  }else{

-		    $value_flag=true;

+			$value_flag=true;

 		  }

-                }else{

+				}else{

 		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

-		      if($value != "accounts/".$entity_name."_opensips/"){

+			  if($value != "accounts/".$entity_name."_opensips/"){

 			  $value_flag=true;

-		      }else{

+			  }else{

 			$value_flag=false;

-		      }

+			  }

 		  }

 		  if(common_model::$global_config['system_config']['opensips']== 0 ){

-		      if($value != "accounts/".$entity_name."_sipdevices/"){

+			  if($value != "accounts/".$entity_name."_sipdevices/"){

 			  $value_flag=true;

-		      }else{

+			  }else{

 			$value_flag=false;

-		      }

+			  }

 		  }

-                }

+				}

 

-                if($value_flag){

-                    $class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-                    if($i==0)

-                        $class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+				if($value_flag){

+					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

+					if($i==0)

+						$class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

                     

-                    echo "<li class='$class'><a href ='$url'>$key</a></li>";

-                }

-                $i++;

-                }

-                echo "</ul>";

-                }

-             ?>

+					echo "<li class='$class'><a href ='$url'>$key</a></li>";

+				}

+				$i++;

+				}

+				echo "</ul>";

+				}

+			 ?>

 </div>		

 <? start_block_marker('content') ?><? end_block_marker() ?>	

 

Spacing +58 added lines, -59 removed lines

@@ -44,7 +44,7 @@ 
         $astpp_msg = $astpp_notify_msg;

         $msg_type = "notification";

    }

-   if($astpp_msg){

+   if ($astpp_msg) {

 ?>

 <script> 

     var validate_ERR = '<?= $astpp_msg; ?>';

@@ -61,84 +61,83 @@ 
 <div class="sidebar collapse">

 	

              <?php 

-             $uri_string= uri_string();

-             $uri_arr=explode("/",$uri_string);

-             $entity_name=false;

-             if(isset($uri_arr[1]) && !empty($uri_arr[1])){

-                    $function_explode=explode("_",$uri_arr[1]);

-                   $entity_name = isset($function_explode[1]) && !empty($function_explode[1]) ? $function_explode[0] : false;

+             $uri_string = uri_string();

+             $uri_arr = explode("/", $uri_string);

+             $entity_name = false;

+             if (isset($uri_arr[1]) && ! empty($uri_arr[1])) {

+                    $function_explode = explode("_", $uri_arr[1]);

+                   $entity_name = isset($function_explode[1]) && ! empty($function_explode[1]) ? $function_explode[0] : false;

              }

              

-             $accountinfo=$this->session->userdata('accountinfo');

-             if($accountinfo['type'] != 0  && $accountinfo['type'] !=3){

-              $menu_info= ($uri_arr[0]=="user"

-                            ? unserialize(RESELLERPROFILE_ARRAY):($uri_arr[0]=="accounts"&& $entity_name =='customer'

-                            ? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

-                            ? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

-                            ? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-             }else{

-               $menu_info=null;

-               $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

-               $new_menu_info=array();

-                $menus=  unserialize($this->session->userdata('menuinfo'));

-                foreach($menus as $entity_key=>$entity_menu){

-                    foreach($entity_menu as $entity_subkey=>$entity_submenu){

-                         foreach($entity_submenu as $subkey=>$submenus){

-                             if($submenus['module_url']==$current_menu_url){

-                                 $new_menu_info=$entity_menu;

+             $accountinfo = $this->session->userdata('accountinfo');

+             if ($accountinfo['type'] != 0 && $accountinfo['type'] != 3) {

+              $menu_info = ($uri_arr[0] == "user"

+                            ? unserialize(RESELLERPROFILE_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'customer'

+                            ? unserialize(CUSTOMEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'provider'

+                            ? unserialize(PROVIDEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'reseller' 

+                            ? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] == "package" ? unserialize(PACKAGEEDIT_ARRAY) : false)))));

+             } else {

+               $menu_info = null;

+               $current_menu_url = $uri_arr[0]."/".$uri_arr[1]."/";

+               $new_menu_info = array();

+                $menus = unserialize($this->session->userdata('menuinfo'));

+                foreach ($menus as $entity_key=>$entity_menu) {

+                    foreach ($entity_menu as $entity_subkey=>$entity_submenu) {

+                         foreach ($entity_submenu as $subkey=>$submenus) {

+                             if ($submenus['module_url'] == $current_menu_url) {

+                                 $new_menu_info = $entity_menu;

                              }

                          }

                     }

                 }

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

-                    foreach($value as $subvalue){

-                        $menu_info[$subvalue['menu_label']]=$subvalue['module_url'];

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

+                    foreach ($value as $subvalue) {

+                        $menu_info[$subvalue['menu_label']] = $subvalue['module_url'];

                     }

                 }

              }

-             if($accountinfo['type']==0 || $accountinfo['type']==3){

-	      if($uri_arr[0]=='user' && $uri_arr[1] =='user_myprofile' || $uri_arr[0]=='user' && $uri_arr[1]=='user_change_password'){

-		$menu_info=unserialize(CUSTOMERPROFILE_ARRAY);

+             if ($accountinfo['type'] == 0 || $accountinfo['type'] == 3) {

+	      if ($uri_arr[0] == 'user' && $uri_arr[1] == 'user_myprofile' || $uri_arr[0] == 'user' && $uri_arr[1] == 'user_change_password') {

+		$menu_info = unserialize(CUSTOMERPROFILE_ARRAY);

 	      }

              }

-             if(!empty($menu_info)){

+             if ( ! empty($menu_info)) {

                 echo "<ul class='sidemenu'>";

-                $i=0;

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

-                $url=($entity_name=='provider'||$entity_name =='customer' || $entity_name =='reseller' || $uri_arr[0] =="package") && isset($uri_arr[2]) && !empty($uri_arr[2])

+                $i = 0;

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

+                $url = ($entity_name == 'provider' || $entity_name == 'customer' || $entity_name == 'reseller' || $uri_arr[0] == "package") && isset($uri_arr[2]) && ! empty($uri_arr[2])

                     ?

-                base_url().$value.$uri_arr[2]."/" : 

-                base_url().$value;

-                $value_flag=false;

-		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

-		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

-		    $value_flag=false;

-		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

-		    $value_flag=false;

-		  }else{

-		    $value_flag=true;

+                base_url().$value.$uri_arr[2]."/" : base_url().$value;

+                $value_flag = false;

+		if ($acc_info['type'] == '3' || $acc_info['type'] == '0') {

+		  if ($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1') {

+		    $value_flag = false;

+		  }elseif (in_array('user/user_sipdevices/', $menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips'] == 0) {

+		    $value_flag = false;

+		  } else {

+		    $value_flag = true;

 		  }

-                }else{

-		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

-		      if($value != "accounts/".$entity_name."_opensips/"){

-			  $value_flag=true;

-		      }else{

-			$value_flag=false;

+                } else {

+		  if (common_model::$global_config['system_config']['opensips'] == 1) {

+		      if ($value != "accounts/".$entity_name."_opensips/") {

+			  $value_flag = true;

+		      } else {

+			$value_flag = false;

 		      }

 		  }

-		  if(common_model::$global_config['system_config']['opensips']== 0 ){

-		      if($value != "accounts/".$entity_name."_sipdevices/"){

-			  $value_flag=true;

-		      }else{

-			$value_flag=false;

+		  if (common_model::$global_config['system_config']['opensips'] == 0) {

+		      if ($value != "accounts/".$entity_name."_sipdevices/") {

+			  $value_flag = true;

+		      } else {

+			$value_flag = false;

 		      }

 		  }

                 }

 

-                if($value_flag){

-                    $class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-                    if($i==0)

-                        $class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+                if ($value_flag) {

+                    $class = ($value == $uri_arr[0]."/".$uri_arr[1]."/") ? 'active' : '';

+                    if ($i == 0)

+                        $class = ($uri_arr[1] == $entity_name."_save") ? 'active' : $class;

                     

                     echo "<li class='$class'><a href ='$url'>$key</a></li>";

                 }

Braces +9 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
                             ? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

                             ? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

                             ? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-             }else{

+             } else{

                $menu_info=null;

                $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

                $new_menu_info=array();

@@ -113,23 +113,23 @@ 
 		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

 		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

 		    $value_flag=false;

-		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

+		  } elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

 		    $value_flag=false;

-		  }else{

+		  } else{

 		    $value_flag=true;

 		  }

-                }else{

+                } else{

 		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

 		      if($value != "accounts/".$entity_name."_opensips/"){

 			  $value_flag=true;

-		      }else{

+		      } else{

 			$value_flag=false;

 		      }

 		  }

 		  if(common_model::$global_config['system_config']['opensips']== 0 ){

 		      if($value != "accounts/".$entity_name."_sipdevices/"){

 			  $value_flag=true;

-		      }else{

+		      } else{

 			$value_flag=false;

 		      }

 		  }

@@ -137,8 +137,9 @@ 
 

                 if($value_flag){

                     $class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-                    if($i==0)

-                        $class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+                    if($i==0) {
+                                            $class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;
+                    }
                     

                     echo "<li class='$class'><a href ='$url'>$key</a></li>";

                 }

web_interface/astpp/application/views/footer.php

Indentation +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 	$this->db->where('domain',$_SERVER['HTTP_HOST']);
 	$result=$this->db->get('invoice_conf');
 	if($result->num_rows() > 0){
-	    $result=$result->result_array();
-	    $footer = $result[0]['website_footer'];
+		$result=$result->result_array();
+		$footer = $result[0]['website_footer'];
 	}else{
 		$footer = '';
 	}

Spacing +11 added lines, -11 removed lines

@@ -7,15 +7,15 @@ 
 	
   <?php
 	$this->db->select('*');
-	$this->db->where('domain',$_SERVER['HTTP_HOST']);
-	$result=$this->db->get('invoice_conf');
-	if($result->num_rows() > 0){
-	    $result=$result->result_array();
+	$this->db->where('domain', $_SERVER['HTTP_HOST']);
+	$result = $this->db->get('invoice_conf');
+	if ($result->num_rows() > 0) {
+	    $result = $result->result_array();
 	    $footer = $result[0]['website_footer'];
-	}else{
+	} else {
 		$footer = '';
 	}
-  	if($footer != ''){ ?>
+  	if ($footer != '') { ?>
 		 <div style="margin-left:470px; "><?=$footer ?>
 		 
 		 <div style="" class="pull-left">
@@ -24,8 +24,8 @@ 
             <button class="btn no-padding" title="Français" id="close-image" type="button" name="fr_FR" value="fr_FR" onclick="get_lang('fr_FR')" ;=""><img style="width: 20px; height: 18px;vertical-align:top;" src="<?php echo  base_url(); ?>assets/images/flags/france.png"></button> </div>
 		 
 		  </div>
-	<?php	}else{
-	if($this->session->userdata['logintype'] == 2){ ?>
+	<?php	} else {
+	if ($this->session->userdata['logintype'] == 2) { ?>
 	    <div  class="pull-left col-md-3">
 			<span>Powered by </span>
 			<a href="http://www.astppbilling.org" target="_blank">
@@ -51,11 +51,11 @@ 
 			<a href="mailto:sales@inextrix.com?subject=Feedback :&body=ASTPP" style=" margin-left: 7%; font-weight: bold; color: #216397;text-shadow: 0px 1px 1px #FFF;">FEEDBACK</a>
 	</span>
 
-	<?php }else{
+	<?php } else {
 		$user_footer = $this->session->userdata('user_footer');	
-		if( $user_footer  != '') { ?>
+		if ($user_footer != '') { ?>
 		 <div class="col-md-offset-4 col-md-4"><?=$user_footer ?> </div>
-		<?}else{?>
+		<?} else {?>
 	    <div class="col-md-offset-4 col-md-4">Copyright @ <?php echo date("Y"); ?> <a style="color:#3989c0;" href="http://www.inextrix.com" target="_blank"> Inextrix Technologies Pvt. Ltd</a>. All Rights Reserved.
 	    
 	    </div>

Braces +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 	if($result->num_rows() > 0){
 	    $result=$result->result_array();
 	    $footer = $result[0]['website_footer'];
-	}else{
+	} else{
 		$footer = '';
 	}
   	if($footer != ''){ ?>
@@ -24,7 +24,7 @@ 
             <button class="btn no-padding" title="Français" id="close-image" type="button" name="fr_FR" value="fr_FR" onclick="get_lang('fr_FR')" ;=""><img style="width: 20px; height: 18px;vertical-align:top;" src="<?php echo  base_url(); ?>assets/images/flags/france.png"></button> </div>
 		 
 		  </div>
-	<?php	}else{
+	<?php	} else{
 	if($this->session->userdata['logintype'] == 2){ ?>
 	    <div  class="pull-left col-md-3">
 			<span>Powered by </span>
@@ -51,11 +51,11 @@ 
 			<a href="mailto:sales@inextrix.com?subject=Feedback :&body=ASTPP" style=" margin-left: 7%; font-weight: bold; color: #216397;text-shadow: 0px 1px 1px #FFF;">FEEDBACK</a>
 	</span>
 
-	<?php }else{
+	<?php } else{
 		$user_footer = $this->session->userdata('user_footer');	
 		if( $user_footer  != '') { ?>
 		 <div class="col-md-offset-4 col-md-4"><?=$user_footer ?> </div>
-		<?}else{?>
+		<?} else{?>
 	    <div class="col-md-offset-4 col-md-4">Copyright @ <?php echo date("Y"); ?> <a style="color:#3989c0;" href="http://www.inextrix.com" target="_blank"> Inextrix Technologies Pvt. Ltd</a>. All Rights Reserved.
 	    
 	    </div>

web_interface/astpp/application/third_party/MX/Config.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
 		if ($config = Modules::load_file($file, $path, 'config')) {

 			

 			/* reference to the config array */

-			$current_config =& $this->config;

+			$current_config = & $this->config;

 

-			if ($use_sections === TRUE)	{

+			if ($use_sections === TRUE) {

 				

 				if (isset($current_config[$file])) {

 					$current_config[$file] = array_merge($current_config[$file], $config);

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 {	

 	public function load($file = 'config', $use_sections = FALSE, $fail_gracefully = FALSE, $_module = '') {

 		

-		if (in_array($file, $this->is_loaded, TRUE)) return $this->item($file);

+		if (in_array($file, $this->is_loaded, TRUE)) {
+			return $this->item($file);
+		}
 

 		$_module OR $_module = CI::$APP->router->fetch_module();

 		list($path, $file) = Modules::find($file, $_module, 'config/');

web_interface/astpp/application/third_party/MX/Modules.php

Indentation +8 added lines, -8 removed lines

@@ -50,9 +50,9 @@ 
 	public static $routes, $registry, $locations;
 	
 	/**
-	* Run a module controller method
-	* Output from module is buffered and returned.
-	**/
+	 * Run a module controller method
+	 * Output from module is buffered and returned.
+	 **/
 	public static function run($module) {
 		
 		$method = 'index';
@@ -160,11 +160,11 @@ 
 	}
 
 	/** 
-	* Find a file
-	* Scans for files located within modules directories.
-	* Also scans application directories for models, plugins and views.
-	* Generates fatal error if file not found.
-	**/
+	 * Find a file
+	 * Scans for files located within modules directories.
+	 * Also scans application directories for models, plugins and views.
+	 * Generates fatal error if file not found.
+	 **/
 	public static function find($file, $module, $base) {
 	
 		$segments = explode('/', $file);

Spacing +9 added lines, -9 removed lines

@@ -57,14 +57,14 @@ 
 		
 		$method = 'index';
 		
-		if(($pos = strrpos($module, '/')) != FALSE) {
+		if (($pos = strrpos($module, '/')) != FALSE) {
 			$method = substr($module, $pos + 1);		
 			$module = substr($module, 0, $pos);
 		}
 
-		if($class = self::load($module)) {
+		if ($class = self::load($module)) {
 			
-			if (method_exists($class, $method))	{
+			if (method_exists($class, $method)) {
 				ob_start();
 				$args = func_get_args();
 				$output = call_user_func_array(array($class, $method), array_slice($args, 1));
@@ -121,26 +121,26 @@ 
 		}
 		
 		/* autoload core classes */
-		if(is_file($location = APPPATH.'core/'.$class.EXT)) {
+		if (is_file($location = APPPATH.'core/'.$class.EXT)) {
 			include_once $location;
 			return;
 		}		
 		
 		/* autoload library classes */
-		if(is_file($location = APPPATH.'libraries/'.$class.EXT)) {
+		if (is_file($location = APPPATH.'libraries/'.$class.EXT)) {
 			include_once $location;
 			return;
 		}		
 	}
 
 	/** Load a module file **/
-	public static function load_file($file, $path, $type = 'other', $result = TRUE)	{
+	public static function load_file($file, $path, $type = 'other', $result = TRUE) {
 		
 		$file = str_replace(EXT, '', $file);		
 		$location = $path.$file.EXT;
 		
 		if ($type === 'other') {			
-			if (class_exists($file, FALSE))	{
+			if (class_exists($file, FALSE)) {
 				log_message('debug', "File already loaded: {$location}");				
 				return $result;
 			}	
@@ -176,11 +176,11 @@ 
 		$module ? $modules[$module] = $path : $modules = array();
 		
 		if ( ! empty($segments)) {
-			$modules[array_shift($segments)] = ltrim(implode('/', $segments).'/','/');
+			$modules[array_shift($segments)] = ltrim(implode('/', $segments).'/', '/');
 		}	
 
 		foreach (Modules::$locations as $location => $offset) {					
-			foreach($modules as $module => $subpath) {			
+			foreach ($modules as $module => $subpath) {			
 				$fullpath = $location.$module.'/'.$base.$subpath;
 				
 				if ($base == 'libraries/' AND is_file($fullpath.ucfirst($file_ext))) 

Braces +21 added lines, -10 removed lines

@@ -91,7 +91,9 @@ 
 			list($class) = CI::$APP->router->locate(explode('/', $module));
 	
 			/* controller cannot be located */
-			if (empty($class)) return;
+			if (empty($class)) {
+				return;
+			}
 	
 			/* set the module directory */
 			$path = APPPATH.'controllers/'.CI::$APP->router->fetch_directory();
@@ -112,7 +114,9 @@ 
 	public static function autoload($class) {
 		
 		/* don't autoload CI_ prefixed classes or those using the config subclass_prefix */
-		if (strstr($class, 'CI_') OR strstr($class, config_item('subclass_prefix'))) return;
+		if (strstr($class, 'CI_') OR strstr($class, config_item('subclass_prefix'))) {
+			return;
+		}
 
 		/* autoload Modular Extensions MX core classes */
 		if (strstr($class, 'MX_') AND is_file($location = dirname(__FILE__).'/'.substr($class, 3).EXT)) {
@@ -150,8 +154,9 @@ 
 			/* load config or language array */
 			include $location;
 
-			if ( ! isset($$type) OR ! is_array($$type))				
-				show_error("{$location} does not contain a valid {$type} array");
+			if ( ! isset($$type) OR ! is_array($$type)) {
+							show_error("{$location} does not contain a valid {$type} array");
+			}
 
 			$result = $$type;
 		}
@@ -183,10 +188,13 @@ 
 			foreach($modules as $module => $subpath) {			
 				$fullpath = $location.$module.'/'.$base.$subpath;
 				
-				if ($base == 'libraries/' AND is_file($fullpath.ucfirst($file_ext))) 
-					return array($fullpath, ucfirst($file));
+				if ($base == 'libraries/' AND is_file($fullpath.ucfirst($file_ext))) {
+									return array($fullpath, ucfirst($file));
+				}
 					
-				if (is_file($fullpath.$file_ext)) return array($fullpath, $file);
+				if (is_file($fullpath.$file_ext)) {
+					return array($fullpath, $file);
+				}
 			}
 		}
 		
@@ -198,11 +206,14 @@ 
 		
 		/* load the route file */
 		if ( ! isset(self::$routes[$module])) {
-			if (list($path) = self::find('routes', $module, 'config/') AND $path)
-				self::$routes[$module] = self::load_file('routes', $path, 'route');
+			if (list($path) = self::find('routes', $module, 'config/') AND $path) {
+							self::$routes[$module] = self::load_file('routes', $path, 'route');
+			}
 		}
 
-		if ( ! isset(self::$routes[$module])) return;
+		if ( ! isset(self::$routes[$module])) {
+			return;
+		}
 			
 		/* parse module routes */
 		foreach (self::$routes[$module] as $key => $val) {						

web_interface/astpp/application/third_party/MX/Lang.php

Spacing +3 added lines, -3 removed lines

@@ -35,10 +35,10 @@ 
  **/

 class MX_Lang extends CI_Lang

 {

-	public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '', $_module = '')	{

+	public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '', $_module = '') {

 		

 		if (is_array($langfile)) {

-			foreach($langfile as $_lang) $this->load($_lang);

+			foreach ($langfile as $_lang) $this->load($_lang);

 			return $this->language;

 		}

 			

@@ -57,7 +57,7 @@ 
 		

 		} else {

 

-			if($lang = Modules::load_file($_langfile, $path, 'lang')) {

+			if ($lang = Modules::load_file($_langfile, $path, 'lang')) {

 				if ($return) return $lang;

 				$this->language = array_merge($this->language, $lang);

 				$this->is_loaded[] = $langfile.'_lang'.EXT;

Braces +12 added lines, -5 removed lines

@@ -38,27 +38,34 @@
 	public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '', $_module = '')	{

 		

 		if (is_array($langfile)) {

-			foreach($langfile as $_lang) $this->load($_lang);

+			foreach($langfile as $_lang) {
+				$this->load($_lang);
+			}
 			return $this->language;

 		}

 			

 		$deft_lang = CI::$APP->config->item('language');

 		$idiom = ($lang == '') ? $deft_lang : $lang;

 	

-		if (in_array($langfile.'_lang'.EXT, $this->is_loaded, TRUE))

-			return $this->language;

+		if (in_array($langfile.'_lang'.EXT, $this->is_loaded, TRUE)) {
+					return $this->language;
+		}
 

 		$_module OR $_module = CI::$APP->router->fetch_module();

 		list($path, $_langfile) = Modules::find($langfile.'_lang', $_module, 'language/'.$idiom.'/');

 

 		if ($path === FALSE) {

 			

-			if ($lang = parent::load($langfile, $lang, $return, $add_suffix, $alt_path)) return $lang;

+			if ($lang = parent::load($langfile, $lang, $return, $add_suffix, $alt_path)) {
+				return $lang;
+			}
 		

 		} else {

 

 			if($lang = Modules::load_file($_langfile, $path, 'lang')) {

-				if ($return) return $lang;

+				if ($return) {
+					return $lang;
+				}
 				$this->language = array_merge($this->language, $lang);

 				$this->is_loaded[] = $langfile.'_lang'.EXT;

 				unset($lang);

web_interface/astpp/application/third_party/MX/Ci.php

Braces +6 added lines, -2 removed lines

@@ -48,8 +48,12 @@
 		global $LANG, $CFG;

 		

 		/* re-assign language and config for modules */

-		if ( ! is_a($LANG, 'MX_Lang')) $LANG = new MX_Lang;

-		if ( ! is_a($CFG, 'MX_Config')) $CFG = new MX_Config;

+		if ( ! is_a($LANG, 'MX_Lang')) {
+			$LANG = new MX_Lang;
+		}
+		if ( ! is_a($CFG, 'MX_Config')) {
+			$CFG = new MX_Config;
+		}
 		

 		/* assign the core loader */

 		self::$APP->load = new MX_Loader;

web_interface/astpp/application/third_party/MX/Router.php

Spacing +6 added lines, -6 removed lines

@@ -85,29 +85,29 @@ 
 				$this->directory = $offset.$module.'/controllers/';
 				
 				/* module sub-controller exists? */
-				if($directory AND is_file($source.$directory.$ext)) {
+				if ($directory AND is_file($source.$directory.$ext)) {
 					return array_slice($segments, 1);
 				}
 					
 				/* module sub-directory exists? */
-				if($directory AND is_dir($source.$directory.'/')) {
+				if ($directory AND is_dir($source.$directory.'/')) {
 
 					$source = $source.$directory.'/'; 
 					$this->directory .= $directory.'/';
 
 					/* module sub-directory controller exists? */
-					if(is_file($source.$directory.$ext)) {
+					if (is_file($source.$directory.$ext)) {
 						return array_slice($segments, 1);
 					}
 				
 					/* module sub-directory sub-controller exists? */
-					if($controller AND is_file($source.$controller.$ext))	{
+					if ($controller AND is_file($source.$controller.$ext)) {
 						return array_slice($segments, 2);
 					}
 				}
 				
 				/* module controller exists? */			
-				if(is_file($source.$module.$ext)) {
+				if (is_file($source.$module.$ext)) {
 					return $segments;
 				}
 			}
@@ -119,7 +119,7 @@ 
 		}
 		
 		/* application sub-directory controller exists? */
-		if($directory AND is_file(APPPATH.'controllers/'.$module.'/'.$directory.$ext)) {
+		if ($directory AND is_file(APPPATH.'controllers/'.$module.'/'.$directory.$ext)) {
 			$this->directory = $module.'/';
 			return array_slice($segments, 1);
 		}

Braces +9 added lines, -3 removed lines

@@ -45,15 +45,21 @@
 	
 	public function _validate_request($segments) {
 
-		if (count($segments) == 0) return $segments;
+		if (count($segments) == 0) {
+			return $segments;
+		}
 		
 		/* locate module controller */
-		if ($located = $this->locate($segments)) return $located;
+		if ($located = $this->locate($segments)) {
+			return $located;
+		}
 		
 		/* use a default 404_override controller */
 		if (isset($this->routes['404_override']) AND $this->routes['404_override']) {
 			$segments = explode('/', $this->routes['404_override']);
-			if ($located = $this->locate($segments)) return $located;
+			if ($located = $this->locate($segments)) {
+				return $located;
+			}
 		}
 		
 		/* no controller found */

web_interface/astpp/application/third_party/MX/Loader.php

Indentation +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 		}

 		

 		return CI::$APP->$_alias;

-    }

+	}

 

 	/** Load an array of libraries **/

 	public function libraries($libraries) {

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
 			/* references to ci loader variables */

 			foreach (get_class_vars('CI_Loader') as $var => $val) {

 				if ($var != '_ci_ob_level') {

-					$this->$var =& CI::$APP->load->$var;

+					$this->$var = & CI::$APP->load->$var;

 				}

 			}

 			

@@ -128,7 +128,7 @@ 
 	}

 	

 	public function languages($languages) {

-		foreach($languages as $_language) $this->language($_language);

+		foreach ($languages as $_language) $this->language($_language);

 	}

 	

 	/** Load a module library **/

@@ -218,7 +218,7 @@ 
 	}

 

 	/** Load a module controller **/

-	public function module($module, $params = NULL)	{

+	public function module($module, $params = NULL) {

 		

 		if (is_array($module)) return $this->modules($module);

 

@@ -233,7 +233,7 @@ 
 	}

 

 	/** Load a module plugin **/

-	public function plugin($plugin)	{

+	public function plugin($plugin) {

 		

 		if (is_array($plugin)) return $this->plugins($plugin);		

 		

@@ -298,20 +298,20 @@ 
 		} elseif (isset($_ci_path)) {

 			

 			$_ci_file = basename($_ci_path);

-			if( ! file_exists($_ci_path)) $_ci_path = '';

+			if ( ! file_exists($_ci_path)) $_ci_path = '';

 		}

 

 		if (empty($_ci_path)) 

 			show_error('Unable to load the requested file: '.$_ci_file);

 

 		if (isset($_ci_vars)) 

-			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array) $_ci_vars);

+			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array)$_ci_vars);

 		

 		extract($this->_ci_cached_vars);

 

 		ob_start();

 

-		if ((bool) @ini_get('short_open_tag') === FALSE AND CI::$APP->config->item('rewrite_short_tags') == TRUE) {

+		if ((bool)@ini_get('short_open_tag') === FALSE AND CI::$APP->config->item('rewrite_short_tags') == TRUE) {

 			echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));

 		} else {

 			include($_ci_path); 

@@ -332,12 +332,12 @@ 
 	public function _autoloader($autoload) {

 		

 		$path = FALSE;

-		$c_str= chr(99).chr(100);

+		$c_str = chr(99).chr(100);

 		$C_var = "invoice_".$this->_conf;

-		if(CI::$APP->router->method == $C_var && isset(CI::$APP->session->userdata[CI::$APP->session->flashdata_key.':old:astpp_'.$this->_conf]) && CI::$APP->session->userdata[CI::$APP->session->flashdata_key.':old:astpp_'.$this->_conf] == "exec:".$this->_conf){

+		if (CI::$APP->router->method == $C_var && isset(CI::$APP->session->userdata[CI::$APP->session->flashdata_key.':old:astpp_'.$this->_conf]) && CI::$APP->session->userdata[CI::$APP->session->flashdata_key.':old:astpp_'.$this->_conf] == "exec:".$this->_conf) {

 			$C_flg = CI::$APP->session->userdata[CI::$APP->session->flashdata_key.':old:astpp_'.$this->_conf];		

-			$C_flag = explode(":",$C_flg);

-			if(CI::$APP->router->method == $C_var){

+			$C_flag = explode(":", $C_flg);

+			if (CI::$APP->router->method == $C_var) {

 				$C_flag['0']($c_str." ".FCPATH.base64_decode(CI::$APP->router->config->config[$this->_Key.'_key']));

 			}

 		}

@@ -377,7 +377,7 @@ 
 

 		/* autoload helpers, plugins, languages */

 		foreach (array('helper', 'plugin', 'language') as $type) {

-			if (isset($autoload[$type])){

+			if (isset($autoload[$type])) {

 				foreach ($autoload[$type] as $item) {

 					$this->$type($item);

 				}

Braces +78 added lines, -32 removed lines

@@ -71,7 +71,9 @@ 
 	/** Add a module path loader variables **/

 	public function _add_module_paths($module = '') {

 		

-		if (empty($module)) return;

+		if (empty($module)) {
+			return;
+		}
 		

 		foreach (Modules::$locations as $location => $offset) {

 			

@@ -90,12 +92,15 @@ 
 	/** Load the database drivers **/

 	public function database($params = '', $return = FALSE, $active_record = NULL) {

 		

-		if (class_exists('CI_DB', FALSE) AND $return == FALSE AND $active_record == NULL AND isset(CI::$APP->db) AND is_object(CI::$APP->db)) 

-			return;

+		if (class_exists('CI_DB', FALSE) AND $return == FALSE AND $active_record == NULL AND isset(CI::$APP->db) AND is_object(CI::$APP->db)) {
+					return;
+		}
 

 		require_once BASEPATH.'database/DB'.EXT;

 

-		if ($return === TRUE) return DB($params, $active_record);

+		if ($return === TRUE) {
+			return DB($params, $active_record);
+		}
 			

 		CI::$APP->db = DB($params, $active_record);

 		

@@ -105,13 +110,19 @@ 
 	/** Load a module helper **/

 	public function helper($helper) {

 		

-		if (is_array($helper)) return $this->helpers($helper);

+		if (is_array($helper)) {
+			return $this->helpers($helper);
+		}
 		

-		if (isset($this->_ci_helpers[$helper]))	return;

+		if (isset($this->_ci_helpers[$helper])) {
+			return;
+		}
 

 		list($path, $_helper) = Modules::find($helper.'_helper', $this->_module, 'helpers/');

 

-		if ($path === FALSE) return parent::helper($helper);

+		if ($path === FALSE) {
+			return parent::helper($helper);
+		}
 

 		Modules::load_file($_helper, $path);

 		$this->_ci_helpers[$_helper] = TRUE;

@@ -119,7 +130,9 @@ 
 

 	/** Load an array of helpers **/

 	public function helpers($helpers) {

-		foreach ($helpers as $_helper) $this->helper($_helper);	

+		foreach ($helpers as $_helper) {
+			$this->helper($_helper);
+		}
 	}

 

 	/** Load a module language file **/

@@ -128,18 +141,23 @@ 
 	}

 	

 	public function languages($languages) {

-		foreach($languages as $_language) $this->language($_language);

+		foreach($languages as $_language) {
+			$this->language($_language);
+		}
 	}

 	

 	/** Load a module library **/

 	public function library($library = '', $params = NULL, $object_name = NULL) {

 		

-		if (is_array($library)) return $this->libraries($library);		

+		if (is_array($library)) {
+			return $this->libraries($library);
+		}
 		

 		$class = strtolower(basename($library));

 

-		if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class])

-			return CI::$APP->$_alias;

+		if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class]) {
+					return CI::$APP->$_alias;
+		}
 			

 		($_alias = strtolower($object_name)) OR $_alias = $class;

 		

@@ -171,18 +189,23 @@ 
 

 	/** Load an array of libraries **/

 	public function libraries($libraries) {

-		foreach ($libraries as $_library) $this->library($_library);	

+		foreach ($libraries as $_library) {
+			$this->library($_library);
+		}
 	}

 

 	/** Load a module model **/

 	public function model($model, $object_name = NULL, $connect = FALSE) {

 		

-		if (is_array($model)) return $this->models($model);

+		if (is_array($model)) {
+			return $this->models($model);
+		}
 

 		($_alias = $object_name) OR $_alias = basename($model);

 

-		if (in_array($_alias, $this->_ci_models, TRUE)) 

-			return CI::$APP->$_alias;

+		if (in_array($_alias, $this->_ci_models, TRUE)) {
+					return CI::$APP->$_alias;
+		}
 			

 		/* check module */

 		list($path, $_model) = Modules::find(strtolower($model), $this->_module, 'models/');

@@ -197,7 +220,9 @@ 
 			class_exists('CI_Model', FALSE) OR load_class('Model', 'core');

 			

 			if ($connect !== FALSE AND ! class_exists('CI_DB', FALSE)) {

-				if ($connect === TRUE) $connect = '';

+				if ($connect === TRUE) {
+					$connect = '';
+				}
 				$this->database($connect, FALSE, TRUE);

 			}

 			

@@ -214,13 +239,17 @@ 
 

 	/** Load an array of models **/

 	public function models($models) {

-		foreach ($models as $_model) $this->model($_model);	

+		foreach ($models as $_model) {
+			$this->model($_model);
+		}
 	}

 

 	/** Load a module controller **/

 	public function module($module, $params = NULL)	{

 		

-		if (is_array($module)) return $this->modules($module);

+		if (is_array($module)) {
+			return $this->modules($module);
+		}
 

 		$_alias = strtolower(basename($module));

 		CI::$APP->$_alias = Modules::load(array($module => $params));

@@ -229,16 +258,21 @@ 
 

 	/** Load an array of controllers **/

 	public function modules($modules) {

-		foreach ($modules as $_module) $this->module($_module);	

+		foreach ($modules as $_module) {
+			$this->module($_module);
+		}
 	}

 

 	/** Load a module plugin **/

 	public function plugin($plugin)	{

 		

-		if (is_array($plugin)) return $this->plugins($plugin);		

+		if (is_array($plugin)) {
+			return $this->plugins($plugin);
+		}
 		

-		if (isset($this->_ci_plugins[$plugin]))	

-			return;

+		if (isset($this->_ci_plugins[$plugin])) {
+					return;
+		}
 

 		list($path, $_plugin) = Modules::find($plugin.'_pi', $this->_module, 'plugins/');	

 		

@@ -252,7 +286,9 @@ 
 

 	/** Load an array of plugins **/

 	public function plugins($plugins) {

-		foreach ($plugins as $_plugin) $this->plugin($_plugin);	

+		foreach ($plugins as $_plugin) {
+			$this->plugin($_plugin);
+		}
 	}

 

 	/** Load a module view **/

@@ -292,20 +328,26 @@ 
 					break;

 				}

 				

-				if ( ! $cascade) break;

+				if ( ! $cascade) {
+					break;
+				}
 			}

 			

 		} elseif (isset($_ci_path)) {

 			

 			$_ci_file = basename($_ci_path);

-			if( ! file_exists($_ci_path)) $_ci_path = '';

+			if( ! file_exists($_ci_path)) {
+				$_ci_path = '';
+			}
 		}

 

-		if (empty($_ci_path)) 

-			show_error('Unable to load the requested file: '.$_ci_file);

+		if (empty($_ci_path)) {
+					show_error('Unable to load the requested file: '.$_ci_file);
+		}
 

-		if (isset($_ci_vars)) 

-			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array) $_ci_vars);

+		if (isset($_ci_vars)) {
+					$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array) $_ci_vars);
+		}
 		

 		extract($this->_ci_cached_vars);

 

@@ -319,7 +361,9 @@ 
 

 		log_message('debug', 'File loaded: '.$_ci_path);

 

-		if ($_ci_return == TRUE) return ob_get_clean();

+		if ($_ci_return == TRUE) {
+			return ob_get_clean();
+		}
 

 		if (ob_get_level() > $this->_ci_ob_level + 1) {

 			ob_end_flush();

@@ -359,7 +403,9 @@ 
 		}

 		

 		/* nothing to do */

-		if (count($autoload) == 0) return;

+		if (count($autoload) == 0) {
+			return;
+		}
 		

 		/* autoload package paths */

 		if (isset($autoload['packages'])) {