iNextrix / ASTPP

web_interface/astpp/application/modules/rates/views/view_import_termination_rate_mapper.php

Indentation +55 added lines, -55 removed lines

@@ -7,19 +7,19 @@ 
    });
 </script> <script type="text/javascript" language="javascript"><?
    if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    }
-    }
+	foreach($mapto_fields as $csv_key => $csv_value) {
+	echo '$("#'.$csv_value .'-prefix").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
+	echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	echo '$("#'.$csv_value .'-select").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
+	echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	}
+	}
    ?></script>
 <?
    if (isset($csv_tmp_data) && !empty($csv_tmp_data)) {
@@ -27,7 +27,7 @@ 
    echo 'var csv_tmp_data = ' . json_encode($csv_tmp_data) . ';';
    echo '</script>';
    }
-    ?>
+	?>
 <?php
    endblock() ?>
 <?php
@@ -50,9 +50,9 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
-                        	echo $error;
-                        } ?>
+						if (isset($error) && !empty($error)) {
+							echo $error;
+						} ?>
                      </span>
                      <h3 class="padding-t-10 padding-l-16">You must either select a field from your file OR provide a default value for the following fields:</h3>
                      <p>Code,Destination,Connect Cost,Included Seconds,Per Minute Cost,Increment,Precedence,Strip,Prepend.</p>
@@ -66,10 +66,10 @@ 
                            <label class="col-md-3">Trunk List:</label>
                            <div class="col-md-8">
                               <?php
-                                 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
-                                 	"status " => "0"
-                                 )) , '');
-                                 echo $trunklist; ?>
+								 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
+								 	"status " => "0"
+								 )) , '');
+								 echo $trunklist; ?>
                            </div>
                         </div>
 
@@ -134,28 +134,28 @@ 
                   </thead>
                   <tbody>
                      <?php
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+						foreach($mapto_fields as $csv_key => $csv_value) {
 
-                        		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
-                        		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
-                        		?>
+								echo "<tr>";
+								echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
+								echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+								echo "<td>";
+								echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+								?>
                      <option value=""></option>
                      <?php
-                        $keys = array_keys($file_data);
-                        for ($i = 0; $i < count($file_data); $i++) { ?>
+						$keys = array_keys($file_data);
+						for ($i = 0; $i < count($file_data); $i++) { ?>
                      <option value="<?php
-                        echo $file_data[$i]; ?>"><?php
-                        echo $file_data[$i]; ?></option>
+						echo $file_data[$i]; ?>"><?php
+						echo $file_data[$i]; ?></option>
                      <?php
-                        }
-                        echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
-                        echo "</tr>";
+						}
+						echo "</td>";
+						echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+						echo "</tr>";
 
-                        } ?>
+						} ?>
                   </tbody>
                </table>
                <input type="hidden" name="trunkid" value="<?php echo $trunkid ?>" />
@@ -167,30 +167,30 @@ 
                <H2> Import File Data..</H2>
                <table width="100%" border="1"  class="details_table">
                   <?php
-                     $cnt = 1;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
-                     	if ($csv_key < 15) {
-                     		echo "<tr>";
-                     		foreach($csv_value as $field_name => $field_val) {
-                     			if ($csv_key == 0) {
+					 $cnt = 1;
+					 foreach($csv_tmp_data as $csv_key => $csv_value) {
+					 	if ($csv_key < 15) {
+					 		echo "<tr>";
+					 		foreach($csv_value as $field_name => $field_val) {
+					 			if ($csv_key == 0) {
 
-                     				 echo "<th>".ucfirst($field_val)."</th>";
+					 				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
-                     				$cnt++;
-                     			}
-                     		}
+					 			}
+					 			else {
+					 				echo "<td class='portlet-content'>" . $field_val . "</td>";
+					 				$cnt++;
+					 			}
+					 		}
 
-                     		echo "</tr>";
-                     	}
-                     }
+					 		echo "</tr>";
+					 	}
+					 }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
+					 echo "<tr><td colspan='" . $cnt . "'>
                                             <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
-                     ?>
+					 ?>
                </table>
             </form>
          </div>

Spacing +25 added lines, -25 removed lines

@@ -6,25 +6,25 @@ 
    $(document).ready(function() {
    });
 </script> <script type="text/javascript" language="javascript"><?
-   if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+   if (isset($mapto_fields) && ! empty($mapto_fields)) {
+    foreach ($mapto_fields as $csv_key => $csv_value) {
+    echo '$("#'.$csv_value.'-prefix").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value =  (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+    echo '$("#'.$csv_value.'-select").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value = (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
     }
     }
    ?></script>
 <?
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) {
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) {
    echo '<script>';
-   echo 'var csv_tmp_data = ' . json_encode($csv_tmp_data) . ';';
+   echo 'var csv_tmp_data = '.json_encode($csv_tmp_data).';';
    echo '</script>';
    }
     ?>
@@ -40,7 +40,7 @@ 
 <?php
    startblock('content') ?>
 <?php
-   if (!isset($csv_tmp_data)) { ?>
+   if ( ! isset($csv_tmp_data)) { ?>
 <section class="slice color-three padding-t-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -50,7 +50,7 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
+                        if (isset($error) && ! empty($error)) {
                         	echo $error;
                         } ?>
                      </span>
@@ -68,7 +68,7 @@ 
                               <?php
                                  $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
                                  	"status " => "0"
-                                 )) , '');
+                                 )), '');
                                  echo $trunklist; ?>
                            </div>
                         </div>
@@ -100,7 +100,7 @@ 
             <div class="col-md-12 padding-b-10">
                <div class="pull-right">
                   <input class="btn btn-line-parrot" id="import_terminationrate" type="submit" name="action" value="Import" />
-                  <a href="<?php echo base_url() . 'rates/termination_rate_list/' ?>" >
+                  <a href="<?php echo base_url().'rates/termination_rate_list/' ?>" >
                   <input class="btn btn-line-sky margin-x-10" id="ok" type="button" name="action" value="Cancel"/>
                   </a>
                </div>
@@ -113,7 +113,7 @@ 
 <?php
    } ?>
 <?php
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) { ?>
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 <section class="slice color-three padding-b-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -134,13 +134,13 @@ 
                   </thead>
                   <tbody>
                      <?php
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+                        foreach ($mapto_fields as $csv_key => $csv_value) {
 
                         		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+                        		echo "<td>".$csv_key.'('.$csv_value.")</td>";
+                        		echo "<td><input type='text' name='".$csv_value."-prefix' id='".$csv_value."-prefix'></td>";
                         		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+                        		echo "<select name='".$csv_value."-select' id='".$csv_value."-select'>";
                         		?>
                      <option value=""></option>
                      <?php
@@ -152,7 +152,7 @@ 
                      <?php
                         }
                         echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+                        echo "<td><input type='text' name='".$csv_value."-display' id='".$csv_value."-display'></td>";
                         echo "</tr>";
 
                         } ?>
@@ -168,17 +168,17 @@ 
                <table width="100%" border="1"  class="details_table">
                   <?php
                      $cnt = 1;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
+                     foreach ($csv_tmp_data as $csv_key => $csv_value) {
                      	if ($csv_key < 15) {
                      		echo "<tr>";
-                     		foreach($csv_value as $field_name => $field_val) {
+                     		foreach ($csv_value as $field_name => $field_val) {
                      			if ($csv_key == 0) {
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
                      			}
                      			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
+                     				echo "<td class='portlet-content'>".$field_val."</td>";
                      				$cnt++;
                      			}
                      		}
@@ -187,8 +187,8 @@ 
                      	}
                      }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
-                                            <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
+                     echo "<tr><td colspan='".$cnt."'>
+                                            <a href='" . base_url()."rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
                      ?>
                </table>

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
+                     			} else {
                      				echo "<td class='portlet-content'>" . $field_val . "</td>";
                      				$cnt++;
                      			}

web_interface/astpp/application/modules/rates/libraries/rates_form.php

Spacing +95 added lines, -95 removed lines

@@ -20,7 +20,7 @@ 
 # You should have received a copy of the GNU Affero General Public License

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class rates_form {

@@ -28,29 +28,29 @@ 
 		$this->CI = & get_instance();

 	}

 	function get_termination_rate_form_fields() {

-		$form['forms'] = array(base_url() . 'rates/termination_rate_save/', array('id' => 'termination_rate_form', 'method' => 'POST', 'name' => 'termination_rate_form'));

+		$form['forms'] = array(base_url().'rates/termination_rate_save/', array('id' => 'termination_rate_form', 'method' => 'POST', 'name' => 'termination_rate_form'));

 		$form['Rate Information'] = array(

 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 			array('Trunk', 'trunk_id', 'SELECT', '', 'dropdown', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")),     

-			array('Code', 'INPUT', array('name' => 'pattern', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

-			array('Destination', 'INPUT', array('name' => 'comment', 'size' => '20',  'class' => "text field medium"), 'tOOL TIP', ''),            

-			array('Strip', 'INPUT', array('name' => 'strip', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('Prepend', 'INPUT', array('name' => 'prepend', 'size' => '20',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),

+			array('Code', 'INPUT', array('name' => 'pattern', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Destination', 'INPUT', array('name' => 'comment', 'size' => '20', 'class' => "text field medium"), 'tOOL TIP', ''),            

+			array('Strip', 'INPUT', array('name' => 'strip', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Prepend', 'INPUT', array('name' => 'prepend', 'size' => '20', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),

             

         

 );

 		$form['Billing Information'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

 			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

 			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

-		array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+		array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

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

-			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

 			array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''));

 	

 		$form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

@@ -60,14 +60,14 @@ 
 	}

 

 	function get_origination_rate_form_fields() {

-	 $logintype=$this->CI->session->userdata('userlevel_logintype');

-		$trunk=null;

-		if($logintype !=1)

+	 $logintype = $this->CI->session->userdata('userlevel_logintype');

+		$trunk = null;

+		if ($logintype != 1)

 	  $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"));

-		$form['forms'] = array(base_url() . 'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));

+		$form['forms'] = array(base_url().'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));

 		$form['Rate Information'] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-			array('Rate Group', 'pricelist_id', 'SELECT', '','', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0",'reseller_id'=>0)),        

+			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", 'reseller_id'=>0)),        

 			array('Code', 'INPUT', array('name' => 'pattern', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

 			array('Destination', 'INPUT', array('name' => 'comment', 'size' => '20', 'class' => "text field medium"), 'tOOL TIP', ''),

 			//array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

@@ -75,9 +75,9 @@ 
         

 );

 		$form['Billing Information'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

-			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

-			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

+			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

@@ -113,7 +113,7 @@ 
 /***************************************************************/

 		array('Increment', 'INPUT', array('name' => 'inc[inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'inc[inc-integer]', '', '', '', 'search_int_type', ''),

 				array('Priority', 'INPUT', array('name' => 'prepend[prepend]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'prepend[prepend-string]', '', '', '', 'search_string_type', ''),

-			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")),array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")), array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 		   array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),

  /******

 ASTPP  3.0 

@@ -129,14 +129,14 @@ 
 ASTPP  3.0 

 Batch Delete

 ******/

-		$form['button_search_delete'] = array('name' => 'action', 'id' => "termination_rate_batch_dlt",'onclick'=>"check_btn();", 'content' => 'Delete Search Record','style'=>'display:none;', 'value' => 'submit', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

+		$form['button_search_delete'] = array('name' => 'action', 'id' => "termination_rate_batch_dlt", 'onclick'=>"check_btn();", 'content' => 'Delete Search Record', 'style'=>'display:none;', 'value' => 'submit', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

 

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

 /******

 ASTPP  3.0 

 Batch Delete

 ******/

-		$form['button_search'] = array('name' => 'action', 'id' => "termination_rate_search_btn",'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right margin-x-10');

+		$form['button_search'] = array('name' => 'action', 'id' => "termination_rate_search_btn", 'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right margin-x-10');

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

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

@@ -147,14 +147,14 @@ 
 	function termination_rate_batch_update_form() {

 		$form['forms'] = array("rates/termination_rate_batch_update/", array('id' => "termination_rate_batch_update"));

 		$form['Batch Update'] = array(

-		array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-		array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]','id'=>'includedseconds', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'includedseconds[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-		array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]','id'=>'cost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]', 'id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]', 'id'=>'includedseconds', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'includedseconds[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

             

-		array('Increment', 'INPUT', array('name' => 'inc[inc]','id'=>'inc', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-		array('Priority', 'INPUT', array('name' => 'precedence[precedence]','id'=>'precedence', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'precedence[operator]','class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

-		array('Prepand', 'INPUT', array('name' => 'prepend[prepend]','id'=>'prepend', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'prepend[operator]','class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

-			array('Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type'),

+		array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Priority', 'INPUT', array('name' => 'precedence[precedence]', 'id'=>'precedence', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'precedence[operator]', 'class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

+		array('Prepand', 'INPUT', array('name' => 'prepend[prepend]', 'id'=>'prepend', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'prepend[operator]', 'class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

+			array('Trunk', array('name'=> 'trunk_id[trunk_id]', 'id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"), array('name'=>'trunk_id[operator]', 'class'=>'update_drp'), 'update_drp_type'),

 		);

 

 		$form['button_search'] = array('name' => 'action', 'id' => "batch_update_btn", 'content' => 'Update', 'value' => 'save', 'type' => 'button', 'class' =>'btn btn-line-parrot pull-right');

@@ -163,17 +163,17 @@ 
 		return $form;

 	}

 	function origination_rate_batch_update_form() {

-	$logintype=$this->CI->session->userdata('userlevel_logintype');

-			$trunk=null;

-		if($logintype !=1)

-	  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type');

-		$form['forms'] = array("rates/origination_rate_batch_update/",array('id' => "origination_rate_batch_update"));        

+	$logintype = $this->CI->session->userdata('userlevel_logintype');

+			$trunk = null;

+		if ($logintype != 1)

+	  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]', 'id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"), array('name'=>'trunk_id[operator]', 'class'=>'update_drp'), 'update_drp_type');

+		$form['forms'] = array("rates/origination_rate_batch_update/", array('id' => "origination_rate_batch_update"));        

 		$form['Batch Update'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-			array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]','id'=>'includedseconds', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1',array('name'=>'includedseconds[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-			array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1',array('name'=>'cost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-			array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-			array('Rate Group', array('name'=> 'pricelist_id[pricelist_id]','id'=>'pricelist_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id" => "0"),array('name'=>'pricelist_id[operator]','class'=>'update_drp'), 'update_drp_type'),

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]', 'id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]', 'id'=>'includedseconds', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'includedseconds[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Rate Group', array('name'=> 'pricelist_id[pricelist_id]', 'id'=>'pricelist_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0"), array('name'=>'pricelist_id[operator]', 'class'=>'update_drp'), 'update_drp_type'),

 		   $trunk,

 		);

 

@@ -186,21 +186,21 @@ 
 		 function build_rates_list_for_reseller() {

 			 

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

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);			 

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);			 

 			 

-		$grid_field_arr = json_encode(array(array('Code', "140", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

+		$grid_field_arr = json_encode(array(array('Code', "140", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

 			array('Destination', "240", "comment", "", "", ""),

-			array('Connection Cost('.$currency.')', "210", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

-			array('Included Seconds', "180", "includedseconds", "", "", "","","true","center"),

-			array('Per Minute Cost('.$currency.')', "180", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-			array('Increment', "140", "inc", "", "", "","","true","center"),

-			array('Priority', "155", "precedence", "", "", "","","true","center"),

+			array('Connection Cost('.$currency.')', "210", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

+			array('Included Seconds', "180", "includedseconds", "", "", "", "", "true", "center"),

+			array('Per Minute Cost('.$currency.')', "180", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+			array('Increment', "140", "inc", "", "", "", "", "true", "center"),

+			array('Priority', "155", "precedence", "", "", "", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

 	function get_reseller_origination_rate_search_form() {

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

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

 	

 		$form['forms'] = array("", array('id' => "resellerrates_list_search"));

 		$form['Search My Rates'] = array(

@@ -236,7 +236,7 @@ 
 			array('Initial Increment', 'INPUT', array('name' => 'init_inc[init_inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'init_inc[init_inc-integer]', '', '', '', 'search_int_type', ''),

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

 			array('Increment', 'INPUT', array('name' => 'inc[inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'inc[inc-integer]', '', '', '', 'search_int_type', ''),

-			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id"=>"0")),

+			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id"=>"0")),

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', ''),

@@ -245,14 +245,14 @@ 
 ASTPP  3.0 

 Batch Delete

 ******/

-		$form['button_search_delete'] = array('name' => 'action', 'id' => "origination_rate_batch_dlt",'onclick'=>"check_btn();", 'content' => 'Delete Search Record','style'=>'display:none;', 'value' => 'save', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

+		$form['button_search_delete'] = array('name' => 'action', 'id' => "origination_rate_batch_dlt", 'onclick'=>"check_btn();", 'content' => 'Delete Search Record', 'style'=>'display:none;', 'value' => 'save', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

 

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

 /******** 

 ASTPP  3.0 

 Batch delete

 *********/

-		$form['button_search'] = array('name' => 'action', 'id' => "origination_rate_list_search_btn",'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right  margin-x-10');

+		$form['button_search'] = array('name' => 'action', 'id' => "origination_rate_list_search_btn", 'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right  margin-x-10');

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

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

@@ -268,34 +268,34 @@ 
 

 	function build_termination_rate_for_admin() {

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

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);

 		

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 /**

 ASTPP  3.0

 For Termination Rate edit on Code

 **/

-			array("Code", "78", "pattern", "pattern", "", "get_only_numeric_val","EDITABLE","true","center"),

+			array("Code", "78", "pattern", "pattern", "", "get_only_numeric_val", "EDITABLE", "true", "center"),

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

-			array("Destination", "80", "comment", "", "", "","","true","center"),

-			array("Connect Cost($currency)", "125", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

-			array("Included<br/> Seconds", "70", "includedseconds", "", "", "","","true","center"),

-			array("Per Minute <br/>Cost($currency)", "100", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-  		array("Initial <br/> Increment", "95", "init_inc", "", "", "","","true","center"),

-			array("Increment", "75", "inc", "", "", "","","true","center"),

-			array("Priority", "70", "precedence", "", "", "","","true","center"),

-			array("Strip","60", "strip", "", "", "","","true","center"),

-			array("Prepend", "70", "prepend", "pattern", "", "get_only_numeric_val","","true","center"),

-			array("Trunk", "80", "trunk_id", "name", "trunks", "get_field_name","","true","center"),

+			array("Destination", "80", "comment", "", "", "", "", "true", "center"),

+			array("Connect Cost($currency)", "125", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

+			array("Included<br/> Seconds", "70", "includedseconds", "", "", "", "", "true", "center"),

+			array("Per Minute <br/>Cost($currency)", "100", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+  		array("Initial <br/> Increment", "95", "init_inc", "", "", "", "", "true", "center"),

+			array("Increment", "75", "inc", "", "", "", "", "true", "center"),

+			array("Priority", "70", "precedence", "", "", "", "", "true", "center"),

+			array("Strip", "60", "strip", "", "", "", "", "true", "center"),

+			array("Prepend", "70", "prepend", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+			array("Trunk", "80", "trunk_id", "name", "trunks", "get_field_name", "", "true", "center"),

 		   /*

             ASTPP  3.0 

             creation field show in grid

             */

-			array("Status", "100", "status", "status", "outbound_routes", "get_status","","true","center"),

+			array("Status", "100", "status", "status", "outbound_routes", "get_status", "", "true", "center"),

 //            array("Created<br/>Date", "80", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

-			array("Modified Date", "150", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

+			array("Modified Date", "150", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

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

 			 /*

             ASTPP  3.0

@@ -304,7 +304,7 @@ 
        

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

 //             array("Reseller", "103", "reseller_id", "number", "accounts", "get_field_name"),

-			array("Action", "80", "", "", "", array("EDIT" => array("url" => "rates/termination_rate_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Action", "80", "", "", "", array("EDIT" => array("url" => "rates/termination_rate_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "rates/termination_rate_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -317,36 +317,36 @@ 
    */

 	function build_origination_rate_list_for_admin() {

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

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);

 		

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 /**

 ASTPP  3.0 

 For Origination rate edit on code

 **/

-			array("Code", "75", "pattern", "pattern", "", "get_only_numeric_val","EDITABLE","true","center"),

+			array("Code", "75", "pattern", "pattern", "", "get_only_numeric_val", "EDITABLE", "true", "center"),

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

-			array("Destination", "100", "comment", "", "", "","","true","center"),

-			array("Connect Cost($currency)", "130", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

-			array("Included Seconds", "120", "includedseconds", "", "", "","","true","center"),

-			array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency","","true","right"),

+			array("Destination", "100", "comment", "", "", "", "", "true", "center"),

+			array("Connect Cost($currency)", "130", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

+			array("Included Seconds", "120", "includedseconds", "", "", "", "", "true", "center"),

+			array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

-			array("Initial Increment", "130", "init_inc", "", "", "","","true","center"),

+			array("Initial Increment", "130", "init_inc", "", "", "", "", "true", "center"),

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

-			array("Increment", "90", "inc", "", "", "","","true","center"),

+			array("Increment", "90", "inc", "", "", "", "", "true", "center"),

 			//array("Priority", "72", "precedence", "", "", "","","true","center"),

-			array("Rate Group", "90", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),

+			array("Rate Group", "90", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),

 			/*

             ASTPP  3.0  creation field show in grid

             */

-			array("Status", "100", "status", "status", "routes", "get_status","","true","center"),

+			array("Status", "100", "status", "status", "routes", "get_status", "", "true", "center"),

 //            array("Created<br/>Date", "80", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

-			array("Modified Date", "150", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

+			array("Modified Date", "150", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

 

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

 			/*

@@ -354,7 +354,7 @@ 
             chnage in status active or inactive

             */

             

-			array("Action", "95", "", "", "", array("EDIT" => array("url" => "rates/origination_rate_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Action", "95", "", "", "", array("EDIT" => array("url" => "rates/origination_rate_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "/rates/origination_rate_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -362,20 +362,20 @@ 
 	/****************************************************************************************/

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/rates/termination_rate_add/", "popup","medium"),

-			array("Delete", "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "/rates/termination_rate_delete_multiple/"),

-			array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import/", 'single'),

-			array("Import with field map","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import_mapper/", 'single'),

-			array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/rates/termination_rate_export_cdr_xls/", 'single')

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/rates/termination_rate_add/", "popup", "medium"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/rates/termination_rate_delete_multiple/"),

+			array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import/", 'single'),

+			array("Import with field map", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import_mapper/", 'single'),

+			array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/rates/termination_rate_export_cdr_xls/", 'single')

 			));

 		return $buttons_json;

 	}

 

 	function build_grid_buttons_origination_rate() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/rates/origination_rate_add/", "popup","medium"),

-			array("Delete", "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "/rates/origination_rate_delete_multiple/"),

-			array("import", "btn btn-line-blue","fa fa-upload fa-lg", "button_action", "/rates/origination_rate_import/", 'single'),

-			array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/rates/origination_rate_export_cdr_xls/", 'single')

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/rates/origination_rate_add/", "popup", "medium"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/rates/origination_rate_delete_multiple/"),

+			array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/origination_rate_import/", 'single'),

+			array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/rates/origination_rate_export_cdr_xls/", 'single')

             

 			));

 		return $buttons_json;

@@ -384,7 +384,7 @@ 
 	function build_termination_rate_list_for_customer() {

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

 		$grid_field_arr = json_encode(array(

-			array("<input type='checkbox' name='chkAll' class='ace checking checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+			array("<input type='checkbox' name='chkAll' class='ace checking checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 			array("Code", "70", "pattern", "pattern", "", "get_only_numeric_val"),

 			array("Increment", "75", "inc", "", "", ""),

 			array("Connect <br> Charge", "100", "connectcost", "connectcost", "connectcost", "convert_to_currency"),

@@ -399,16 +399,16 @@ 
 	function build_block_pattern_list_for_customer() {

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

 		$grid_field_arr = json_encode(array(

-			array("<input type='checkbox' name='chkAll1' class='ace checking'/><label class='lbl'></label>", "30", "", "", "", "","","false","center","PatternChkBox"),

+			array("<input type='checkbox' name='chkAll1' class='ace checking'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center", "PatternChkBox"),

 			array("Code", "350", "pattern", "pattern", "", "get_only_numeric_val"),

 			array("Destination", "350", "comment", "", "", ""),

 				));

 		return $grid_field_arr;

 	}

-	function build_pattern_list_for_customer($accountid,$accounttype) {

+	function build_pattern_list_for_customer($accountid, $accounttype) {

 

 		$grid_field_arr = json_encode(array(

-			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 			array("Code", "450", "blocked_patterns", "blocked_patterns", "", "get_only_numeric_val"),

 			array("Destination", "450", "destination", "", "", ""),

 			array("Action", "100", "", "", "", array("DELETE" => array("url" => "accounts/".$accounttype."_delete_block_pattern/$accountid/", "mode" => "single")))

@@ -417,7 +417,7 @@ 
 	}

 

 	function set_pattern_grid_buttons($accountid) {

-		$buttons_json = json_encode(array(array("Add Prefixes","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add_blockpatterns/$accountid", "popup")));

+		$buttons_json = json_encode(array(array("Add Prefixes", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add_blockpatterns/$accountid", "popup")));

 		return $buttons_json;

 	}

 

@@ -435,7 +435,7 @@ 
 

 

 function build_grid_buttons_rates() {

-		$buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/rates/resellersrates_xls/", 'single')));

+		$buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/rates/resellersrates_xls/", 'single')));

 		return $buttons_json;

 	}

 

web_interface/astpp/application/modules/rates/controllers/rates.php

Indentation +4 added lines, -4 removed lines

@@ -1253,11 +1253,11 @@
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
-        		else
-        {
+				else
+		{
 
-           $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+		   $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
+		   redirect(base_url() . 'rates/termination_rates_list/');
 		}
 
 		unlink($full_path . $terminationrate_file_name);

Spacing +261 added lines, -261 removed lines

@@ -36,7 +36,7 @@ 
 		ini_set("max_execution_time", "259200");
 		ini_set("upload_max_filesize", "200M");
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function termination_rates_list() {
@@ -73,70 +73,70 @@ 
 
 		echo json_encode($json_data);
 	}
-	  function termination_rates_list_delete($flag='') {
+	  function termination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_termination_rates_list(false);
 	echo $count_all; 
 	} 
 /****************/
 	 function termination_rate_import() {
 		$data['page_title'] = 'Import Termination Rates';
-		$this->session->set_userdata('import_termination_rate_csv',"");
-		$this->session->set_userdata('import_termination_rate_csv_error',"");
+		$this->session->set_userdata('import_termination_rate_csv', "");
+		$this->session->set_userdata('import_termination_rate_csv_error', "");
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_preview_file(){
-		$invalid_flag= false;
-	$check_header=$this->input->post('check_header',true);
+	function termination_rate_preview_file() {
+		$invalid_flag = false;
+	$check_header = $this->input->post('check_header', true);
 	$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if(empty($_FILES) || !isset($_FILES)){
+		if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/termination_rates_list/");
 	}
-		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" &&  isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
+		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" && isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
 			list($txt, $ext) = explode(".", $_FILES['termination_rate_import']['name']);
-			if($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0) { 
 				$error = $_FILES['termination_rate_import']['error'];
-				if ($error == 0 ) {
+				if ($error == 0) {
 					$uploadedFile = $_FILES["termination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-			if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+			if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-			if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
+			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
+			if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
 			  $data['csv_tmp_data'] = $csv_data;
 			  $data['trunkid'] = $_POST['trunk_id'];
-			  $data['check_header']=$check_header;
+			  $data['check_header'] = $check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
-			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			  $this->session->set_userdata('import_termination_rate_csv', $actual_file_name);
+			} else {
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
 					}
 				}
-				else{
-					$data['error']=="File Uploading Fail Please Try Again";
+				else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
-			}else {
+			} else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-		}else{
-		$invalid_flag=true;
+		} else {
+		$invalid_flag = true;
 		}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
-				$str.= '<br/>Please Create Trunk.';
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
+				$str .= '<br/>Please Create Trunk.';
 			}
 			if (empty($_FILES['termination_rate_import']['name'])) {
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_rates_import($trunkID,$check_header=false) {
+	function termination_rate_rates_import($trunkID, $check_header = false) {
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
@@ -146,65 +146,65 @@ 
 		}
 	$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name,$new_final_arr_key,$check_header); 
-	$i=0;
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header); 
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {
-	 if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['prepend']= isset($csv_data['prepend'])? $csv_data['prepend'] :'';
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
-		$csv_data['strip']= isset($csv_data['strip']) ? $csv_data['strip'] :'';
+	 if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['prepend'] = isset($csv_data['prepend']) ? $csv_data['prepend'] : '';
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
+		$csv_data['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['trunk_id']=$trunkID;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $new_final_arr[$i]=$csv_data;
+		else {
+		  $csv_data['trunk_id'] = $trunkID;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		 if(!empty($new_final_arr)){
+		 if ( ! empty($new_final_arr)) {
  		$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		 }
 		  unlink($full_path.$terminationrate_file_name);
-	  $count=count($invalid_array);
-		if($count >0){
+	  $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 		   fclose($fp);
 		   $this->session->set_userdata('import_termination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['trunkid'] = $trunkID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Termination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	  $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
 		   redirect(base_url()."rates/termination_rates_list/");
 		 }        
 	}
-	function termination_rate_error_download(){
+	function termination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_termination_rate_csv_error');
+		$error_data = $this->session->userdata('import_termination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Termination_rate_error.csv", $data); 
@@ -212,182 +212,182 @@ 
 	}  
 	function origination_rate_import() {
 		$data['page_title'] = 'Import Origination Rates';
-		$this->session->set_userdata('import_origination_rate_csv',"");
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$this->session->set_userdata('import_origination_rate_csv', "");
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		if(file_exists($full_path.$error_data) && $error_data != ""){
+		if (file_exists($full_path.$error_data) && $error_data != "") {
 			unlink($full_path.$error_data);
-			$this->session->set_userdata('import_origination_rate_csv_error',"");
+			$this->session->set_userdata('import_origination_rate_csv_error', "");
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_preview_file(){
-	$invalid_flag= false;
-	$data=array();
+	function origination_rate_preview_file() {
+	$invalid_flag = false;
+	$data = array();
 	$data['page_title'] = 'Import Origination Rates';
-	$check_header=$this->input->post('check_header',true);
-	if(empty($_FILES) || !isset($_FILES)){
+	$check_header = $this->input->post('check_header', true);
+	if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/origination_rate_list/");
 	}
-	$get_extension=strpos($_FILES['origination_rate_import']['name'],'.');
+	$get_extension = strpos($_FILES['origination_rate_import']['name'], '.');
 	$new_final_arr_key = $this->config->item('Origination-rates-field');
-	if(!$get_extension){
-		$data['error']= "Please Upload File Atleast";
+	if ( ! $get_extension) {
+		$data['error'] = "Please Upload File Atleast";
 		}
 		if (isset($_FILES['origination_rate_import']['name']) && $_FILES['origination_rate_import']['name'] != "" && isset($_POST['pricelist_id']) && $_POST['pricelist_id'] != '') {
-			list($txt,$ext) = explode(".", $_FILES['origination_rate_import']['name']);
+			list($txt, $ext) = explode(".", $_FILES['origination_rate_import']['name']);
             
-			if($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0) { 
 				$error = $_FILES['origination_rate_import']['error'];
 				if ($error == 0) {
 					$uploadedFile = $_FILES["origination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-					if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+					if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-					if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
-			$flag=false;
-			$data['trunkid']=isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
+					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s").".".$ext;
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
+			$flag = false;
+			$data['trunkid'] = isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
 						$data['csv_tmp_data'] = $csv_data;
 						$data['pricelistid'] = $_POST['pricelist_id'];
 						$data['page_title'] = "Origination Rates Preview";
-						$data['check_header']=$check_header;
-						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-					}else{
+						$data['check_header'] = $check_header;
+						$this->session->set_userdata('import_origination_rate_csv', $actual_file_name);
+					} else {
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
 			 }   
-			else{
-					$data['error']=="File Uploading Fail Please Try Again";
+			else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
 		   }
 		   else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
-		$invalid_flag=true;
+			} else {
+		$invalid_flag = true;
 			}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
-				$str.= '<br/>Please Create Rate Group.';
+			if ( ! isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
+				$str .= '<br/>Please Create Rate Group.';
 			}
 			if (empty($_FILES['origination_rate_import']['name'])) {
-				$str.= '<br/>Please Select File.';
+				$str .= '<br/>Please Select File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_import_file($pricelistID,$trunkid,$check_header=false) {
+	function origination_rate_import_file($pricelistID, $trunkid, $check_header = false) {
 	   $new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Origination-rates-field');
 	$screen_path = $this->config->item('screen_path');
-	$reseller_id=0;
+	$reseller_id = 0;
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$reseller_id = $this->session->userdata["accountinfo"]['id'];
 		}
         
 		$full_path = $this->config->item('rates-file-path');
 		$originationrate_file_name = $this->session->userdata('import_origination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name,$new_final_arr_key,$check_header); 
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name, $new_final_arr_key, $check_header); 
 		//echo "<pre>";print_r($csv_tmp_data);exit;
-	$i=0;
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {	
-	  if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
+	  if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['pricelist_id']=$pricelistID;
-		  $csv_data['trunk_id']=$trunkid;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $csv_data['reseller_id']= $reseller_id;
+		else {
+		  $csv_data['pricelist_id'] = $pricelistID;
+		  $csv_data['trunk_id'] = $trunkid;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $csv_data['reseller_id'] = $reseller_id;
 		  $csv_data['creation_date'] = gmdate('Y-m-d H:i:s');
-		  $new_final_arr[$i]=$csv_data;
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		  if(!empty($new_final_arr)){
+		  if ( ! empty($new_final_arr)) {
   		$result = $this->rates_model->bulk_insert_origination_rate($new_final_arr);
 		  }
 		  unlink($full_path.$originationrate_file_name);
-	 $count=count($invalid_array);
-		if($count >0){
+	 $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 			fclose($fp);
 		   $this->session->set_userdata('import_origination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['pricelistid'] = $pricelistID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Origination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	   $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Origination rates imported successfully!');
 		   redirect(base_url()."rates/origination_rates_list/");
 		   }
 	}
-	 function data_validate($csvdata){
-		  $str=null;
+	 function data_validate($csvdata) {
+		  $str = null;
 	  $alpha_regex = "/^[a-z ,.'-]+$/i";
 	  $alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 	  $email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/"; 
-	  $str.= $csvdata['pattern']!= '' ? null : 'Code,';
-	  $str=rtrim($str,',');
-	  if(!$str){
-		  $str.= is_numeric($csvdata['pattern']) ? null : 'Code,';
-
-		  $str.= !empty($csvdata['connectcost']) && is_numeric( $csvdata['connectcost']) ? null :( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
-		  $str.= !empty($csvdata['includedseconds']) && is_numeric( $csvdata['includedseconds']) ? null :( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
-
-		  $str.= !empty($csvdata['inc']) && is_numeric( $csvdata['inc']) ? null :( empty($csvdata['inc']) ? null : 'Increment,');
-		  $str.= !empty($csvdata['precedence']) && is_numeric( $csvdata['precedence']) ? null :( empty($csvdata['precedence']) ? null : 'Precedence,');
-		  $str.= (isset($csvdata['strip']) && !empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null :'Strip,') : null;
-		  if($str){
-		$str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  $str .= $csvdata['pattern'] != '' ? null : 'Code,';
+	  $str = rtrim($str, ',');
+	  if ( ! $str) {
+		  $str .= is_numeric($csvdata['pattern']) ? null : 'Code,';
+
+		  $str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
+		  $str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
+
+		  $str .= ! empty($csvdata['inc']) && is_numeric($csvdata['inc']) ? null : (empty($csvdata['inc']) ? null : 'Increment,');
+		  $str .= ! empty($csvdata['precedence']) && is_numeric($csvdata['precedence']) ? null : (empty($csvdata['precedence']) ? null : 'Precedence,');
+		  $str .= (isset($csvdata['strip']) && ! empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null : 'Strip,') : null;
+		  if ($str) {
+		$str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+		$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
 		  }
-		  else{
+		  else {
 		  return false;
 		  }
 	  }
-	  else{
-	  $str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  else {
+	  $str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are required' : ' is Required';
+		$str .= $count > 1 ? ' are required' : ' is Required';
 	return $str;
 	}
 	}
-	function origination_rate_error_download(){
+	function origination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Origination_rate_error.csv", $data); 
@@ -417,13 +417,13 @@ 
 				$edit_data = $value;
 			}
 			$edit_data['connectcost'] = $this->common_model->to_calculate_currency($edit_data['connectcost'], '', '', true, false);
-			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '',true, false);
+			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '', true, false);
 			$edit_data['pattern'] = filter_var($edit_data['pattern'], FILTER_SANITIZE_NUMBER_INT);
 
 			$data['form'] = $this->form->build_form($this->rates_form->get_origination_rate_form_fields(), $edit_data);
 			$this->load->view('view_origination_rate_add_edit', $data);
 		} else {
-			redirect(base_url() . 'rates/origination_rate_list/');
+			redirect(base_url().'rates/origination_rate_list/');
 		}
 	}
 
@@ -471,7 +471,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -483,13 +483,13 @@ 
 	function termination_rate_delete($id) {
 		$this->rates_model->remove_termination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Termination removed successfully!');
-		redirect(base_url() . '/rates/termination_rates_list/');
+		redirect(base_url().'/rates/termination_rates_list/');
 	}
 
 	function origination_rate_delete($id) {
 		$this->rates_model->remove_origination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Origination rate removed successfully!');
-		redirect(base_url() . 'rates/origination_rates_list/');
+		redirect(base_url().'rates/origination_rates_list/');
 	}
 
 	function origination_rates_list() {
@@ -528,9 +528,9 @@ 
 		echo json_encode($json_data);
 	}
 
-	  function origination_rates_list_delete($flag='') {
+	  function origination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_origination_rate_list(false);
 		echo $count_all; 
 	} 
@@ -604,7 +604,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 
@@ -613,20 +613,20 @@ 
 		$this->session->set_userdata('account_search', "");
 	}
 
-	function customer_block_pattern_list($accountid,$accounttype) {
+	function customer_block_pattern_list($accountid, $accounttype) {
 		$json_data = array();
 		$where = array('accountid' => $accountid);
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
-		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
+		$like_str = ! empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
+		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
 		echo json_encode($json_data);
 	}
@@ -649,7 +649,7 @@ 
 		$json_data = array();
 		$account_data = $this->session->userdata("accountinfo");
 		$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-		$markup = ($markup > 0)?$markup:1;
+		$markup = ($markup > 0) ? $markup : 1;
 
 		$count_all = $this->rates_model->get_origination_rate_list_for_user(false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -659,11 +659,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_origination_rate_list_for_user());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
 					$value['inc'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','',true),
-					$this->common_model->calculate_currency($value['connectcost'],'','','',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', '', true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', '', true),
 					$value['includedseconds']                    
 			));
 		}
@@ -682,7 +682,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'user/user_rates_list/');
+			redirect(base_url().'user/user_rates_list/');
 		}
 	}
 
@@ -690,10 +690,10 @@ 
 		$this->session->set_userdata('advance_search', 0);
 		$this->session->set_userdata('account_search', "");
 	}
-	function customer_rates_download_sample_file($file_name){
+	function customer_rates_download_sample_file($file_name) {
 		$this->load->helper('download');
 		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
-		$arrContextOptions=array(
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -702,19 +702,19 @@ 
 		$file = file_get_contents($full_path, false, stream_context_create($arrContextOptions));
 		force_download("samplefile.csv", $file); 
 	}
-	function termination_rate_batch_update(){
+	function termination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
-	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"])?$this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false):"0.0000";
+	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
+	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->termination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Termination rates batch updated successfully!"));
 		exit;
 	}
     
-	function origination_rate_batch_update(){
+	function origination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
+		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->origination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Origination rates batch updated successfully!"));
@@ -723,23 +723,23 @@ 
 
 	function termination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_termination_rate(true, '', '', false);
 		$outbound_array = array();
 		ob_clean();
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost($currency)", "Included Seconds","Per Minute Cost($currency)","Initial Increment", "Increment","Priority","Strip","Prepend","Trunk","Status","Created Date");
+		$outbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Priority", "Strip", "Prepend", "Trunk", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$outbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
                         
 						$row['includedseconds'],
-			$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+			$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -751,7 +751,7 @@ 
 						$row['strip'],
 						$row['prepend'],
 						//$row['trunk_id'],
-						$this->common->get_field_name('name','trunks',$row["trunk_id"]),
+						$this->common->get_field_name('name', 'trunks', $row["trunk_id"]),
 						$this->common->get_status('export', '', $row['status']),
 						$row['creation_date'],
                         
@@ -760,7 +760,7 @@ 
 			}
 		$this->load->helper('csv');
         
-		array_to_csv($outbound_array, 'Termination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($outbound_array, 'Termination_Rates_'.date("Y-m-d").'.csv');
        
 	}
 
@@ -771,13 +771,13 @@ 
 		$this->load->library('pdf');
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
-		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20,20,20);
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost","Included Seconds","Per Minute Cost","Initial Increment", "Increment","Precedence","Prepend","Strip");
+		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20, 20, 20);
+		$outbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment", "Precedence", "Prepend", "Strip");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 					$outbound_array[] = array(
-			$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+			$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
@@ -800,7 +800,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Outbound Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Outbound Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -808,29 +808,29 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($outbound_array, "7");
-		$this->fpdf->Output('Termination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Termination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
     
 
 	function origination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
 	//echo "<pre>";print_r($query);exit;
 		$inbound_array = array();
 		ob_clean();
-		$inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)", "Initial Increment", "Increment","Rate Group","Status","Created Date");
+		$inbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Rate Group", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$inbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -846,7 +846,7 @@ 
 				}
 			}
 		$this->load->helper('csv');
-		array_to_csv($inbound_array, 'Origination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($inbound_array, 'Origination_Rates_'.date("Y-m-d").'.csv');
 	}
 	function origination_rate_export_cdr_pdf() {
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
@@ -857,15 +857,15 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 		$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-	$inbound_array[] = array("Code", "Destination","Connect Cost","Included Seconds","Per Minute Cost","Initial Increment","Increment");
+	$inbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','','',false),
+						$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -881,7 +881,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Origination Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Origination Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -889,7 +889,7 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Origination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Origination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
 
   
@@ -901,14 +901,14 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 	$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-		$inbound_array[] = array("Code", "Destination", "Increment","Cost Per Minutes",  "Connect Charge", "Included Seconds");
+		$inbound_array[] = array("Code", "Destination", "Increment", "Cost Per Minutes", "Connect Charge", "Included Seconds");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['inc'],
-			$this->common_model->calculate_currency($row['cost'],'','','',false),
+			$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 						$row['connectcost'],
 						$row['includedseconds']
 					);
@@ -920,7 +920,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -928,12 +928,12 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Rates_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Rates_'.date("Y-m-d").'.pdf', "D");
 	}
-	function resellersrates_list(){
-	$accountinfo=$this->session->userdata('accountinfo');
+	function resellersrates_list() {
+	$accountinfo = $this->session->userdata('accountinfo');
 	$data['username'] = $this->session->userdata('user_name');
-		$data['page_title'] = 'My Rates' ;
+		$data['page_title'] = 'My Rates';
 		$data['search_flag'] = true;
 		$this->session->set_userdata('advance_search', 0);
 		$data['grid_fields'] = $this->rates_form->build_rates_list_for_reseller();
@@ -953,11 +953,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_rates_list_for_reseller());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
-					$this->common_model->calculate_currency($value['connectcost'],'','','true',true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', 'true', true),
 					$value['includedseconds'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','true',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', 'true', true),
 					$value['inc'],
 					$value['precedence'],
 			));
@@ -977,7 +977,7 @@ 
 			$this->session->set_userdata('resellerrates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/resellersrates_list/');
+			redirect(base_url().'rates/resellersrates_list/');
 		}
 	}
 	function resellersrates_list_clearsearchfilter() {
@@ -1001,7 +1001,7 @@ 
 			foreach ($query->result_array() as $row) {
                 
 					$customer_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 			$row['includedseconds'],
@@ -1013,7 +1013,7 @@ 
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($customer_array, 'My_Own_Rate_' . date("Y-m-d") . '.csv');
+		array_to_csv($customer_array, 'My_Own_Rate_'.date("Y-m-d").'.csv');
 		exit;
 	}
 /***********
@@ -1030,7 +1030,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 	function origination_rates_list_batch_delete() {
@@ -1043,7 +1043,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -1059,14 +1059,14 @@ 
 
 	function csv_to_array($filename = '', $delimiter = ',')
 	{
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
+		if ( ! file_exists($filename) || ! is_readable($filename)) return FALSE;
 		$header = NULL;
 		$data = array();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if (!$header) $header = $row;
+				if ( ! $header) $header = $row;
 				else $data[] = array_combine($header, $row);
 			}
 
@@ -1079,9 +1079,9 @@ 
 	function utf8_converter($array)
 	{
 		array_walk_recursive($array,
-		function (&$item, $key)
+		function(&$item, $key)
 		{
-			if (!mb_detect_encoding($item, 'utf-8', true))
+			if ( ! mb_detect_encoding($item, 'utf-8', true))
 			{
 				$item = utf8_encode($item);
 			}
@@ -1095,9 +1095,9 @@ 
 		$check_header = $this->input->post('check_header', true);
 		$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if (empty($_FILES) || !isset($_FILES))
+		if (empty($_FILES) || ! isset($_FILES))
 		{
-			redirect(base_url() . "rates/termination_rates_list/");
+			redirect(base_url()."rates/termination_rates_list/");
 		}
 
 		$data['mapto_fields'] = $new_final_arr_key;
@@ -1117,13 +1117,13 @@ 
 					// $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
 
 					$csv_data = $this->utf8_converter($this->csvreader->parse_file($uploadedFile, $field_select, $check_header));
-					if (!empty($csv_data))
+					if ( ! empty($csv_data))
 					{
 						$full_path = $this->config->item('rates-file-path');
-						$actual_file_name = "ASTPP-TERMINATION-RATES-" . date("Y-m-d H:i:s") . "." . $ext;
+						$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
 						$actual_file_name = str_replace(' ', '-', $actual_file_name);
 						$actual_file_name = str_replace(':', '-', $actual_file_name);
-						if (move_uploaded_file($uploadedFile, $full_path . $actual_file_name))
+						if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name))
 						{
 							$data['field_select'] = serialize($field_select);
 							$data['csv_tmp_data'] = $csv_data;
@@ -1157,14 +1157,14 @@ 
 		if ($invalid_flag)
 		{
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
 			{
-				$str.= '<br/>Please Create Trunk.';
+				$str .= '<br/>Please Create Trunk.';
 			}
 
 			if (empty($_FILES['termination_rate_import_mapper']['name']))
 			{
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
 
 			$data['error'] = $str;
@@ -1185,7 +1185,7 @@ 
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = array();
-		foreach($filefields as $item)
+		foreach ($filefields as $item)
 		{
 			$new_final_arr_key[$item] = $item;
 		}
@@ -1199,30 +1199,30 @@ 
 
 		$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_mapper_csv');
-		$csv_tmp_data = $this->csvreader->parse_file($full_path . $terminationrate_file_name, $new_final_arr_key, $check_header);
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header);
 		$i = 0;
-		foreach($csv_tmp_data as $key => $csv_data)
+		foreach ($csv_tmp_data as $key => $csv_data)
 		{
-			if (isset($csv_data[$this->input->post("pattern-select") ]) && $csv_data[$this->input->post("pattern-select") ] != '' && $i != 0)
+			if (isset($csv_data[$this->input->post("pattern-select")]) && $csv_data[$this->input->post("pattern-select")] != '' && $i != 0)
 			{
 				$str = null;
-				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix") . $csv_data[$this->input->post("pattern-select") ] : $csv_data[$this->input->post("pattern-select") ];
-				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select") ] : "";
-				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix") . $csv_data['cost'] : $csv_data['cost'];
-				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select") ] : "";
-				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix") . $csv_data['prepend'] : $csv_data['prepend'];
-				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select") ] : "";
-				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix") . $csv_data['comment'] : $csv_data['comment'];
-				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select") ] : "0";
-				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix") . $csv_data['connectcost'] : $csv_data['connectcost'];
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select") ] : "0";
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix") . $csv_data['includedseconds'] : $csv_data['includedseconds'];
-				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select") ] : "0";
-				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix") . $csv_data['inc'] : $csv_data['inc'];
-				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select") ] : "";
-				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix") . $csv_data['precedence'] : $csv_data['precedence'];
-				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select") ] : "";
-				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix") . $csv_data['strip'] : $csv_data['strip'];
+				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix").$csv_data[$this->input->post("pattern-select")] : $csv_data[$this->input->post("pattern-select")];
+				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select")] : "";
+				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix").$csv_data['cost'] : $csv_data['cost'];
+				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select")] : "";
+				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix").$csv_data['prepend'] : $csv_data['prepend'];
+				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select")] : "";
+				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix").$csv_data['comment'] : $csv_data['comment'];
+				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select")] : "0";
+				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix").$csv_data['connectcost'] : $csv_data['connectcost'];
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select")] : "0";
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix").$csv_data['includedseconds'] : $csv_data['includedseconds'];
+				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select")] : "0";
+				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix").$csv_data['inc'] : $csv_data['inc'];
+				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select")] : "";
+				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix").$csv_data['precedence'] : $csv_data['precedence'];
+				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select")] : "";
+				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix").$csv_data['strip'] : $csv_data['strip'];
 				$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
 				$str = $this->data_validate($csv_data);
 				if ($str != "")
@@ -1233,13 +1233,13 @@ 
 				else
 				{
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
-					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
+					$new_final_arr[$i]['pattern'] = "^".$csv_data['pattern'].".*";
 					$new_final_arr[$i]['prepend'] = $csv_data['prepend'];
 					$new_final_arr[$i]['last_modified_date'] = $csv_data['last_modified_date'];
 					$new_final_arr[$i]['comment'] = $csv_data['comment'];
 					$new_final_arr[$i]['connectcost'] = $csv_data['connectcost'];
 					$new_final_arr[$i]['includedseconds'] = $csv_data['includedseconds'];
-					$new_final_arr[$i]['cost'] = !empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+					$new_final_arr[$i]['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
 					$new_final_arr[$i]['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
 					$new_final_arr[$i]['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 					$new_final_arr[$i]['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
@@ -1249,7 +1249,7 @@ 
 			$i++;
 		}
 
-		if (!empty($new_final_arr))
+		if ( ! empty($new_final_arr))
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
@@ -1257,29 +1257,29 @@ 
         {
 
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+           redirect(base_url().'rates/termination_rates_list/');
 		}
 
-		unlink($full_path . $terminationrate_file_name);
+		unlink($full_path.$terminationrate_file_name);
 		$count = count($invalid_array);
 		if ($count > 0)
 		{
 			$session_id = "-1";
-			$fp = fopen($full_path . $session_id . '.csv', 'w');
-			foreach($new_final_arr_key as $key => $value)
+			$fp = fopen($full_path.$session_id.'.csv', 'w');
+			foreach ($new_final_arr_key as $key => $value)
 			{
 				$custom_array[0][$key] = ucfirst($key);
 			}
 
 			$custom_array[0]['error'] = "Error";
 			$invalid_array = array_merge($custom_array, $invalid_array);
-			foreach($invalid_array as $err_data)
+			foreach ($invalid_array as $err_data)
 			{
 				fputcsv($fp, $err_data);
 			}
 
 			fclose($fp);
-			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id . ".csv");
+			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id.".csv");
 			$data["error"] = $invalid_array;
 			$data['trunkid'] = $trunkID;
 			$data['impoted_count'] = count($new_final_arr);
@@ -1289,8 +1289,8 @@ 
 		}
 		else
 		{
-			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
-			redirect(base_url() . "rates/termination_rate_list/");
+			$this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
+			redirect(base_url()."rates/termination_rate_list/");
 		}
 	}
 

Braces +36 added lines, -42 removed lines

@@ -35,8 +35,9 @@ 
 		ini_set("memory_limit", "2048M");
 		ini_set("max_execution_time", "259200");
 		ini_set("upload_max_filesize", "200M");
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function termination_rates_list() {
@@ -110,18 +111,17 @@ 
 			  $data['check_header']=$check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
 			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			} else{
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
 					}
-				}
-				else{
+				} else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-			}else {
+			} else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-		}else{
+		} else{
 		$invalid_flag=true;
 		}
 		if ($invalid_flag) {
@@ -164,8 +164,7 @@ 
 		if($str != ""){
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['trunk_id']=$trunkID;
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
 		  $new_final_arr[$i]=$csv_data;
@@ -253,19 +252,17 @@ 
 						$data['page_title'] = "Origination Rates Preview";
 						$data['check_header']=$check_header;
 						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-					}else{
+					} else{
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
-			 }   
-			else{
+			 } else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-		   }
-		   else {
+		   } else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
+			} else{
 		$invalid_flag=true;
 			}
 		if ($invalid_flag) {
@@ -309,8 +306,7 @@ 
 		if($str != ""){
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['pricelist_id']=$pricelistID;
 		  $csv_data['trunk_id']=$trunkid;
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -372,12 +368,10 @@ 
 		$count = count($error_field);
 		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
-		  }
-		  else{
+		  } else{
 		  return false;
 		  }
-	  }
-	  else{
+	  } else{
 	  $str=rtrim($str,',');
 		$error_field=explode(',',$str);
 		$count = count($error_field);
@@ -618,13 +612,15 @@ 
 		$where = array('accountid' => $accountid);
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
 		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
@@ -1059,15 +1055,20 @@ 
 
 	function csv_to_array($filename = '', $delimiter = ',')
 	{
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
+		if (!file_exists($filename) || !is_readable($filename)) {
+			return FALSE;
+		}
 		$header = NULL;
 		$data = array();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if (!$header) $header = $row;
-				else $data[] = array_combine($header, $row);
+				if (!$header) {
+					$header = $row;
+				} else {
+					$data[] = array_combine($header, $row);
+				}
 			}
 
 			fclose($handle);
@@ -1131,25 +1132,21 @@ 
 							$data['check_header'] = $check_header;
 							$data['page_title'] = 'Map CSV to Termination Rates';
 							$this->session->set_userdata('import_termination_rate_mapper_csv', $actual_file_name);
-						}
-						else
+						} else
 						{
 							$data['error'] = "File Uploading Fail Please Try Again";
 						}
 					}
-				}
-				else
+				} else
 				{
 					$data['error'] == "File Uploading Fail Please Try Again";
 				}
-			}
-			else
+			} else
 			{
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 				$data['error'] = var_dump($_FILES);
 			}
-		}
-		else
+		} else
 		{
 			$invalid_flag = true;
 		}
@@ -1229,8 +1226,7 @@ 
 				{
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = $str;
-				}
-				else
+				} else
 				{
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
 					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -1252,8 +1248,7 @@ 
 		if (!empty($new_final_arr))
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
-		}
-        		else
+		} else
         {
 
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
@@ -1286,8 +1281,7 @@ 
 			$data['failure_count'] = count($invalid_array) - 1;
 			$data['page_title'] = 'Termination Rates Import Error';
 			$this->load->view('view_import_error', $data);
-		}
-		else
+		} else
 		{
 			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
 			redirect(base_url() . "rates/termination_rate_list/");