iNextrix / ASTPP

web_interface/astpp/application/modules/accounts/views/view_accounting_taxes_add.php

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 							if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
 								echo "<table>";
 								foreach ($taxesList as $values) {
-									if ($i == 1)
-										echo"<tr>";
+									if ($i == 1) {
+																			echo"<tr>";
+									}
 									?>
                                 <td style="padding-left: 10px;">
                                     <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) {

web_interface/astpp/application/modules/accounts/views/view_bulk_account_creation.php

Spacing +3 added lines, -3 removed lines

@@ -57,10 +57,10 @@
                     <div style="color:red;margin-left: 60px;">
                         <?php
 						if (isset($validation_errors)) {
-						   $validation_array=json_decode($validation_errors);
-						   if(is_object($validation_array)){
+						   $validation_array = json_decode($validation_errors);
+						   if (is_object($validation_array)) {
 						   $validation_array = get_object_vars($validation_array);
-						   foreach($validation_array as $key=>$value)
+						   foreach ($validation_array as $key=>$value)
 					  echo $value."<br/>";
 						   }
 						   else

Braces +5 added lines, -4 removed lines

@@ -60,11 +60,12 @@
 						   $validation_array=json_decode($validation_errors);
 						   if(is_object($validation_array)){
 						   $validation_array = get_object_vars($validation_array);
-						   foreach($validation_array as $key=>$value)
-					  echo $value."<br/>";
+						   foreach($validation_array as $key=>$value) {
+						   					  echo $value."<br/>";
+						   }
+						   } else {
+						   					  echo $validation_errors;
 						   }
-						   else
-					  echo $validation_errors;
                            
 						}
 						?>

web_interface/astpp/application/modules/accounts/views/view_customer_alert_threshold.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 					}
 					$data_errrors = json_decode($validation_errors);
 					foreach ($data_errrors as $key => $value) {
-						echo $value . "<br/>";
+						echo $value."<br/>";
 					}
 					?> 
                 </div>

web_interface/astpp/application/modules/accounts/views/view_admin_details.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 <!--                                <?php
 								$data_errrors = json_decode($validation_errors);
 								foreach ($data_errrors as $key => $value) {
-									echo $value . "<br/>";
+									echo $value."<br/>";
 								}
 								?> 
                           </div>

web_interface/astpp/application/modules/rates/models/rates_model.php

Indentation +192 added lines, -192 removed lines

@@ -122,236 +122,236 @@
 		$this->db_model->build_search('origination_rate_list_search');
 /***********************/
 
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
             
-        }
-        //echo $this->db->last_query();
-        return $query;
-    }
-    function getunblocked_pattern_list($accountid, $flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array("reseller_id" => $reseller, "status" => "0");
-        } else {
-            $where = array("status" => "0", 'reseller_id'=>'0');
-        }
-        $where1 = '(pattern NOT IN (select blocked_patterns from block_patterns where accountid = "'.$accountid.'"))';
-        $this->db->where($where1);        
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		}
+		//echo $this->db->last_query();
+		return $query;
+	}
+	function getunblocked_pattern_list($accountid, $flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array("reseller_id" => $reseller, "status" => "0");
+		} else {
+			$where = array("status" => "0", 'reseller_id'=>'0');
+		}
+		$where1 = '(pattern NOT IN (select blocked_patterns from block_patterns where accountid = "'.$accountid.'"))';
+		$this->db->where($where1);        
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
 //             echo "<pre>"; print_r($query); exit;
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
-    function getunblocked_package_pattern($accountid, $flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array("reseller_id" => $reseller, "status" => "0");
-        } else {
-            $where = array("status" => "0", 'reseller_id'=>'0');
-        }
-        $where1 = '(pattern NOT IN (select DISTINCT patterns from package_patterns where package_id = "'.$accountid.'"))';
-        $this->db->where($where1);       
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
+	function getunblocked_package_pattern($accountid, $flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array("reseller_id" => $reseller, "status" => "0");
+		} else {
+			$where = array("status" => "0", 'reseller_id'=>'0');
+		}
+		$where1 = '(pattern NOT IN (select DISTINCT patterns from package_patterns where package_id = "'.$accountid.'"))';
+		$this->db->where($where1);       
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 
-    function get_origination_rate_list_for_user($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('user_rates_list_search');
+	function get_origination_rate_list_for_user($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('user_rates_list_search');
 
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data["pricelist_id"], "status" => '0');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("pricelist_id" => $account_data["pricelist_id"], "status" => '0');
 
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 
 
-    function add_termination_rate($add_array) {
-        unset($add_array["action"]);
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $add_array['reseller_id'] = $reseller;
-        }
-        $add_array['pattern'] = "^".$add_array['pattern'].".*";
-        $add_array['prepend'] = $add_array['prepend'];
-        /*
+	function add_termination_rate($add_array) {
+		unset($add_array["action"]);
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$add_array['reseller_id'] = $reseller;
+		}
+		$add_array['pattern'] = "^".$add_array['pattern'].".*";
+		$add_array['prepend'] = $add_array['prepend'];
+		/*
         ASTPP  3.0 
          add creation date.
         */
-        $add_array['creation_date'] = gmdate('Y-m-d H:i:s');
-        /*******************************************************/
-        $this->insert_if_not_exitst($add_array, "outbound_routes");
-        //$this->db->insert("outbound_routes", $add_array);
-        return true;
-    }
+		$add_array['creation_date'] = gmdate('Y-m-d H:i:s');
+		/*******************************************************/
+		$this->insert_if_not_exitst($add_array, "outbound_routes");
+		//$this->db->insert("outbound_routes", $add_array);
+		return true;
+	}
 
-    function edit_termination_rate($data, $id) {
-        unset($data["action"]);
-        /*
+	function edit_termination_rate($data, $id) {
+		unset($data["action"]);
+		/*
         ASTPP  3.0
          Edit time last modified date
         */
-        $data['last_modified_date'] = gmdate('Y-m-d H:i:s');
-        /***************************************************/
-        $data['pattern'] = "^".$data['pattern'].".*";
-        $this->db->where("id", $id);
-        $this->db->update("outbound_routes", $data);
-    }
+		$data['last_modified_date'] = gmdate('Y-m-d H:i:s');
+		/***************************************************/
+		$data['pattern'] = "^".$data['pattern'].".*";
+		$this->db->where("id", $id);
+		$this->db->update("outbound_routes", $data);
+	}
 
-    function remove_termination_rate($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("outbound_routes");
-        return true;
-    }
+	function remove_termination_rate($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("outbound_routes");
+		return true;
+	}
 
-    function add_origination_rate($add_array) {
+	function add_origination_rate($add_array) {
 		
-        unset($add_array["action"]);
-        /*
+		unset($add_array["action"]);
+		/*
         ASTPP  3.0 
         ADD time put creation date in routes table 
         */
-        $add_array['creation_date'] = gmdate('Y-m-d H:i:s');
-        /**********************************************/
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $add_array['reseller_id'] = $reseller;
-        }
+		$add_array['creation_date'] = gmdate('Y-m-d H:i:s');
+		/**********************************************/
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$add_array['reseller_id'] = $reseller;
+		}
 	
-        $add_array['pattern'] = "^".$add_array['pattern'].".*";
+		$add_array['pattern'] = "^".$add_array['pattern'].".*";
 /*************
 ASTPP  3.0 
 Rate insert
 *************/
-        $this->insert_if_not_exitst($add_array, "routes");
+		$this->insert_if_not_exitst($add_array, "routes");
 //        $this->db->insert("routes", $add_array);
 /*******************************/
-        return true;
-    }
+		return true;
+	}
 
-    function edit_origination_rate($data, $id) {
-        unset($data["action"]);
-        /*
+	function edit_origination_rate($data, $id) {
+		unset($data["action"]);
+		/*
         ASTPP  3.0
          Edit tile last modified date update
         */
-        $data['last_modified_date'] = gmdate('Y-m-d H:i:s');
-        /********************************************************/
-        $data['pattern'] = "^".$data['pattern'].".*";
-        $this->db->where("id", $id);
-        $this->db->update("routes", $data);
-    }
+		$data['last_modified_date'] = gmdate('Y-m-d H:i:s');
+		/********************************************************/
+		$data['pattern'] = "^".$data['pattern'].".*";
+		$this->db->where("id", $id);
+		$this->db->update("routes", $data);
+	}
 
-    function remove_origination_rate($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("routes");
-        return true;
-    }
+	function remove_origination_rate($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("routes");
+		return true;
+	}
 
-    function get_trunk_name($field_value) {
-        $this->db->where("name", $field_value);
-        $query = $this->db->get('trunks');
-        $data = $query->result();
-        if ($query->num_rows > 0) {
-                    return $data[0]->id;
-        } else {
-                    return '';
-        }
-    }
+	function get_trunk_name($field_value) {
+		$this->db->where("name", $field_value);
+		$query = $this->db->get('trunks');
+		$data = $query->result();
+		if ($query->num_rows > 0) {
+					return $data[0]->id;
+		} else {
+					return '';
+		}
+	}
 
-    function bulk_insert_termination_rate($field_value) {
-        //$this->db->insert_batch('outbound_routes', $field_value);
-        $this->db->insert_on_duplicate_update_batch('outbound_routes', $field_value);
-        $affected_row = $this->db->affected_rows();
-        return $affected_row;
-    }
+	function bulk_insert_termination_rate($field_value) {
+		//$this->db->insert_batch('outbound_routes', $field_value);
+		$this->db->insert_on_duplicate_update_batch('outbound_routes', $field_value);
+		$affected_row = $this->db->affected_rows();
+		return $affected_row;
+	}
 
-    function bulk_insert_origination_rate($inserted_array) {
-        //$this->db->insert_batch('routes', $inserted_array);
-        $this->db->insert_on_duplicate_update_batch('routes', $inserted_array);
-        $affected_row = $this->db->affected_rows();
-        return $affected_row;
-    }
-    function termination_rate_batch_update($update_array) {
-        $this->db_model->build_search('termination_rates_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id", $account_data['id']);
-        }
+	function bulk_insert_origination_rate($inserted_array) {
+		//$this->db->insert_batch('routes', $inserted_array);
+		$this->db->insert_on_duplicate_update_batch('routes', $inserted_array);
+		$affected_row = $this->db->affected_rows();
+		return $affected_row;
+	}
+	function termination_rate_batch_update($update_array) {
+		$this->db_model->build_search('termination_rates_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$this->db->where("reseller_id", $account_data['id']);
+		}
         
-        $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if ($updateflg)
-            return $this->db->update("outbound_routes");
-        else
-            return false;
-    }
-    function origination_rate_batch_update($update_array) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id", $account_data['id']);
-        }
-        $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if ($updateflg)
-            return $this->db->update("routes");
-        else
-            return false;
-    }
-    function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) {
-        $this->db_model->build_search('resellerrates_list_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("status"=>"0", "pricelist_id" => $account_data["pricelist_id"]);
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);            
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		$updateflg = $this->db_model->build_batch_update_array($update_array);
+		if ($updateflg)
+			return $this->db->update("outbound_routes");
+		else
+			return false;
+	}
+	function origination_rate_batch_update($update_array) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$this->db->where("reseller_id", $account_data['id']);
+		}
+		$updateflg = $this->db_model->build_batch_update_array($update_array);
+		if ($updateflg)
+			return $this->db->update("routes");
+		else
+			return false;
+	}
+	function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) {
+		$this->db_model->build_search('resellerrates_list_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("status"=>"0", "pricelist_id" => $account_data["pricelist_id"]);
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);            
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 /*************
 ASTPP  3.0
 Rate insert
 *************/
-    /**
-     * @param string $table_name
-     */
-    function insert_if_not_exitst($add_array,$table_name){
-        $insert_str = "Insert into $table_name (";
-        $insert_key = "";
-        $insert_value = "";
-        $update_str = "";
-        foreach($add_array as $key => $value){
-           if($key != 'id'){
-                   $insert_key .= $key.",";
-                   $insert_value .= "'$value',";   
-                   $update_str .= $key." = '$value',";
-           }
-        }
-        $insert_key = rtrim($insert_key,",");
-        $insert_value = rtrim($insert_value,",");
-        $update_str = rtrim($update_str,",");
-        $insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
-        $this->db->query($insert_str);
-    }   
+	/**
+	 * @param string $table_name
+	 */
+	function insert_if_not_exitst($add_array,$table_name){
+		$insert_str = "Insert into $table_name (";
+		$insert_key = "";
+		$insert_value = "";
+		$update_str = "";
+		foreach($add_array as $key => $value){
+		   if($key != 'id'){
+				   $insert_key .= $key.",";
+				   $insert_value .= "'$value',";   
+				   $update_str .= $key." = '$value',";
+		   }
+		}
+		$insert_key = rtrim($insert_key,",");
+		$insert_value = rtrim($insert_value,",");
+		$update_str = rtrim($update_str,",");
+		$insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
+		$this->db->query($insert_str);
+	}   
 }

Spacing +14 added lines, -14 removed lines

@@ -32,10 +32,10 @@ 
 ASTPP  3.0 
 Batch Delete
 ********/
-		if($this->session->userdata('advance_batch_delete') == 1){
+		if ($this->session->userdata('advance_batch_delete') == 1) {
 		   $this->db->where(array("trunk_id >"=>"0"));
 		   $this->db->delete("outbound_routes");
-		   $this->session->set_userdata('advance_batch_delete','0');
+		   $this->session->set_userdata('advance_batch_delete', '0');
 		   $this->session->unset_userdata('advance_batch_delete');
 	   }
 /**************/
@@ -53,7 +53,7 @@ 
 			if ($export)
 				$this->db->limit($limit, $start);
 			$result = $this->db->get();
-		}else {
+		} else {
 			$result = $this->db->count_all_results();
 		}
 		return $result;
@@ -74,14 +74,14 @@ 
 			if ($export)
 				$this->db->limit($limit, $start);
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-		}else {
+		} else {
 			$result = $this->db_model->countQuery("*", "routes", $where);
 		}
 // 	echo "<pre>";print_r($result->result());exit;
 		return $result;
 	}
 
-	function get_origination_rate_for_user($flag, $start = 0, $limit = 0,$export = true) {
+	function get_origination_rate_for_user($flag, $start = 0, $limit = 0, $export = true) {
 		$this->db_model->build_search('origination_rate_list_search');
 
 		$account_data = $this->session->userdata("accountinfo");
@@ -93,7 +93,7 @@ 
 			if ($export)
 				$this->db->limit($limit, $start);
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-		}else {
+		} else {
 			$result = $this->db_model->countQuery("*", "routes", $where);
 		}
 		return $result;
@@ -111,11 +111,11 @@ 
 ASTPP  3.0 
 Batch delete
 ************/
-		if($this->session->userdata('advance_batch_delete') == 1){
+		if ($this->session->userdata('advance_batch_delete') == 1) {
 			$this->db->where($where);
 			$this->db->delete("routes");
 			//echo $this->db->last_query(); exit;
-			$this->session->set_userdata('advance_batch_delete','0');
+			$this->session->set_userdata('advance_batch_delete', '0');
 			$this->session->unset_userdata('advance_batch_delete');
 			
 		}
@@ -336,21 +336,21 @@ 
     /**
      * @param string $table_name
      */
-    function insert_if_not_exitst($add_array,$table_name){
+    function insert_if_not_exitst($add_array, $table_name) {
         $insert_str = "Insert into $table_name (";
         $insert_key = "";
         $insert_value = "";
         $update_str = "";
-        foreach($add_array as $key => $value){
-           if($key != 'id'){
+        foreach ($add_array as $key => $value) {
+           if ($key != 'id') {
                    $insert_key .= $key.",";
                    $insert_value .= "'$value',";   
                    $update_str .= $key." = '$value',";
            }
         }
-        $insert_key = rtrim($insert_key,",");
-        $insert_value = rtrim($insert_value,",");
-        $update_str = rtrim($update_str,",");
+        $insert_key = rtrim($insert_key, ",");
+        $insert_value = rtrim($insert_value, ",");
+        $update_str = rtrim($update_str, ",");
         $insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
         $this->db->query($insert_str);
     }   

Braces +22 added lines, -17 removed lines

@@ -50,10 +50,11 @@ 
 		$this->db_model->build_search('termination_rates_list_search');
 		$this->db->from('outbound_routes');
 		if ($flag) {
-			if ($export)
-				$this->db->limit($limit, $start);
+			if ($export) {
+							$this->db->limit($limit, $start);
+			}
 			$result = $this->db->get();
-		}else {
+		} else {
 			$result = $this->db->count_all_results();
 		}
 		return $result;
@@ -71,10 +72,11 @@ 
        
 		$this->db_model->build_search('origination_rate_list_search');
 		if ($flag) {
-			if ($export)
-				$this->db->limit($limit, $start);
+			if ($export) {
+							$this->db->limit($limit, $start);
+			}
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-		}else {
+		} else {
 			$result = $this->db_model->countQuery("*", "routes", $where);
 		}
 // 	echo "<pre>";print_r($result->result());exit;
@@ -90,10 +92,11 @@ 
 
 		$this->db_model->build_search('origination_rate_list_search');
 		if ($flag) {
-			if ($export)
-				$this->db->limit($limit, $start);
+			if ($export) {
+							$this->db->limit($limit, $start);
+			}
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-		}else {
+		} else {
 			$result = $this->db_model->countQuery("*", "routes", $where);
 		}
 		return $result;
@@ -301,10 +304,11 @@ 
         }
         
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if ($updateflg)
-            return $this->db->update("outbound_routes");
-        else
-            return false;
+        if ($updateflg) {
+                    return $this->db->update("outbound_routes");
+        } else {
+                    return false;
+        }
     }
     function origination_rate_batch_update($update_array) {
         $this->db_model->build_search('origination_rate_list_search');
@@ -313,10 +317,11 @@ 
             $this->db->where("reseller_id", $account_data['id']);
         }
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if ($updateflg)
-            return $this->db->update("routes");
-        else
-            return false;
+        if ($updateflg) {
+                    return $this->db->update("routes");
+        } else {
+                    return false;
+        }
     }
     function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) {
         $this->db_model->build_search('resellerrates_list_search');

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

Braces +9 added lines, -6 removed lines

@@ -20,8 +20,9 @@ 
 # 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'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class rates_form {

 	function __construct($library_name = '') {

@@ -62,8 +63,9 @@ 
 	function get_origination_rate_form_fields() {

 	 $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"));

+		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['Rate Information'] = array(

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

@@ -165,8 +167,9 @@ 
 	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');

+		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', ''),

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/views/view_import_termination_rate.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
                <div class="col-md-12">
             	<div class="w-box">
             	 <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
 						echo $error;
 					}?>
                  </span>
@@ -34,7 +34,7 @@ 
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Trunk List:</label>
                                <div class="">
-                               <? $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr",array("status " => "0")), '');
+                               <? $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array("status " => "0")), '');
 							echo $trunklist; ?></div>
                            </div>
                            <div class="col-md-12 no-padding">
@@ -88,7 +88,7 @@ 
 <?}?>    
         
 <?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">
@@ -97,14 +97,14 @@ 
                 <div class="col-md-12 margin-t-10">  
             <form id="import_form" name="import_form" action="<?=base_url()?>rates/termination_rate_rates_import/<?= $trunkid?>/<?=$check_header?>/" method="POST">
             <table width="100%" border="1"  class="details_table table">
-                <?  $cnt =7;
-					foreach($csv_tmp_data as $csv_key => $csv_value){
-						if($csv_key <  15){
+                <?  $cnt = 7;
+					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){
+							foreach ($csv_value as $field_name => $field_val) {
+								if ($csv_key == 0) {
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else {
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

Braces +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 							foreach($csv_value as $field_name => $field_val){
 								if($csv_key == 0){
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

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

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
               <div class="col-md-12">
             	<div class="w-box">
                    <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
 						echo $error;
 					}?>
                    </span>            	
@@ -31,19 +31,19 @@ 
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Rate Group:</label>
                                <div>
-                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists","where_arr", array("reseller_id" => "0", "status" => "0")), '');
+                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists", "where_arr", array("reseller_id" => "0", "status" => "0")), '');
 									echo $pricelists;
 							   ?>
                                </div>
                            </div>
 				<?
-				 $logintype=$this->session->userdata('userlevel_logintype');
+				 $logintype = $this->session->userdata('userlevel_logintype');
 					   // $trunk=null;
-				 if($logintype !=1) { ?>
+				 if ($logintype != 1) { ?>
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Force Trunk:</label>
                                <div>
-                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks","where_arr", array("status" => "0")), '');
+                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array("status" => "0")), '');
 									echo $trunklist;
 							   ?>
                                </div>
@@ -100,7 +100,7 @@ 
 <?}?>    
         
 <?php
-	if(isset($csv_tmp_data) && !empty($csv_tmp_data)){ ?>
+	if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 
 <section class="slice color-three">
 	<div class="w-section inverse no-padding">
@@ -109,14 +109,14 @@ 
              <div class="col-md-12 margin-t-10">
             <form id="import_form" name="import_form" action="<?=base_url()?>rates/origination_rate_import_file/<?= $pricelistid?>/<?=$trunkid?><?=$check_header?>/" method="POST">
             <table width="100%" border="1"  class="details_table table">
-                <?  $cnt =7;
-					foreach($csv_tmp_data as $csv_key => $csv_value){
-						if($csv_key <  15){
+                <?  $cnt = 7;
+					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){
+							foreach ($csv_value as $field_name => $field_val) {
+								if ($csv_key == 0) {
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else {
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

Braces +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 							foreach($csv_value as $field_name => $field_val){
 								if($csv_key == 0){
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

web_interface/astpp/application/modules/signup/models/signup_model.php

Spacing +20 added lines, -20 removed lines

@@ -51,49 +51,49 @@
 		$data['reseller_id'] = $data['key_unique'];	
 		unset($data['agreeCheck']);
 		unset($data['key_unique']);
-		$data['creation']=gmdate('Y-m-d H:i:s');
+		$data['creation'] = gmdate('Y-m-d H:i:s');
 		$data['expiry'] = date('Y-m-d H:i:s', strtotime('+10 years'));
-		$this->db->insert("accounts",$data);
+		$this->db->insert("accounts", $data);
 		return   $this->db->insert_id();
 		}
 
-	function check_user($accno,$email,$balance)
+	function check_user($accno, $email, $balance)
 	{
-		$info = array("number"=>$accno,"email"=>$email,"status"=>1);
+		$info = array("number"=>$accno, "email"=>$email, "status"=>1);
 						$this->db->where($info);
 						$this->db->select('*');
-		$acc_res=$this->db->get('accounts');
-		if($acc_res->num_rows() > 0)	
+		$acc_res = $this->db->get('accounts');
+		if ($acc_res->num_rows() > 0)	
 		{         
-						$acc_res=$acc_res->result_array();
-						$acc_res=$acc_res[0];
-						$this->db->where('pricelist_id',$acc_res['pricelist_id']);
+						$acc_res = $acc_res->result_array();
+						$acc_res = $acc_res[0];
+						$this->db->where('pricelist_id', $acc_res['pricelist_id']);
 						$this->db->select("*");
-						$charge_res=$this->db->get('charges');
+						$charge_res = $this->db->get('charges');
                         
-			if($charge_res->num_rows() > 0){
-			$charge_res=$charge_res->result_array();
-						$charge_res=$charge_res[0];
-						$charge_acc_arr=array(
+			if ($charge_res->num_rows() > 0) {
+			$charge_res = $charge_res->result_array();
+						$charge_res = $charge_res[0];
+						$charge_acc_arr = array(
 						"charge_id"=>$charge_res['id'],
 						"accountid"=>$acc_res['id'],
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
 						 );
-			}else{
-			$charge_res=$charge_res->result_array();
+			} else {
+			$charge_res = $charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
 			$charge_acc_arr = array("charge_id"=>'id',
 						"accountid"=>$acc_res['id'],
 						"assign_date"=>date('Y-m-d H:i:s'));
 			}
-						$result=$this->db->insert("charge_to_account",$charge_acc_arr);
-			$update = array("status" => 0,"balance" => $balance );
+						$result = $this->db->insert("charge_to_account", $charge_acc_arr);
+			$update = array("status" => 0, "balance" => $balance);
 			$this->db->where($info);
 			$result = $this->db->update('accounts', $update);
-			$sip_device_update = array('username'=>$accno,"status"=>1);
+			$sip_device_update = array('username'=>$accno, "status"=>1);
 			return 1;
-		} else{
+		} else {
 			return 0;
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
 						 );
-			}else{
+			} else{
 			$charge_res=$charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
 			$charge_acc_arr = array("charge_id"=>'id',