iNextrix / ASTPP

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

@@ -104,7 +104,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',

web_interface/astpp/application/modules/systems/models/system_model.php

Spacing +37 added lines, -37 removed lines

@@ -39,50 +39,50 @@ 
 		return $query;
 	}
 
-	function gettemplate_list($flag="", $start, $limit="") {
+	function gettemplate_list($flag = "", $start, $limit = "") {
 
          
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$account_data = $this->session->userdata("accountinfo");
 			$reseller = $account_data['id'];
-			$this->db->where('reseller_id',$reseller);
-			$query = $this->db_model->select("*", "default_templates","","","","","");
-
-			if($query->num_rows() >0){
-		$result =$query->result_array();
-		$match_array =array();
-		$unmatch_array= array();
-		$i=0;
-		$str=0;
-		foreach($result as $value)
+			$this->db->where('reseller_id', $reseller);
+			$query = $this->db_model->select("*", "default_templates", "", "", "", "", "");
+
+			if ($query->num_rows() > 0) {
+		$result = $query->result_array();
+		$match_array = array();
+		$unmatch_array = array();
+		$i = 0;
+		$str = 0;
+		foreach ($result as $value)
 		{
-			$this->db->where('name',$value['name']);
-			$this->db->where('reseller_id',0);
-			$query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
-			$innerresult =$query->result_array();
-			foreach($innerresult as $value)
+			$this->db->where('name', $value['name']);
+			$this->db->where('reseller_id', 0);
+			$query = $this->db_model->select("id", "default_templates", "", "id", "ASC", $limit, $start);		
+			$innerresult = $query->result_array();
+			foreach ($innerresult as $value)
 			{                   
-			  $str.=$value['id'].",";
+			  $str .= $value['id'].",";
 			}		
 		}            
-		$str= rtrim($str,',');
+		$str = rtrim($str, ',');
 		
 		$where = "id NOT IN ($str)";		
-		$this->db->where('reseller_id',$reseller);
-		$this->db->or_where('reseller_id',0);
+		$this->db->where('reseller_id', $reseller);
+		$this->db->or_where('reseller_id', 0);
 		$this->db->where($where);
 			}
 			else
 			{
-			   $this->db->where('reseller_id',0);
+			   $this->db->where('reseller_id', 0);
 			}
               
-			if($flag) {
+			if ($flag) {
 
-		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-		 }else {
+		$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
+		 } else {
 
-		$query = $this->db_model->countQuery("*", "default_templates","");
+		$query = $this->db_model->countQuery("*", "default_templates", "");
 		
 		 }
 	  } 
@@ -92,9 +92,9 @@ 
 			$this->db->where($where);
 			$this->db_model->build_search('template_search');
 		if ($flag) {
-			$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
+			$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery("*", "default_templates","");
+			$query = $this->db_model->countQuery("*", "default_templates", "");
 		}
 	  }
 
@@ -106,13 +106,13 @@ 
                         
 		$this->db->where("name", $name);
 		$this->db->update("system", $add_array);
-		if($name == 'base_currency'){
+		if ($name == 'base_currency') {
             
-			$screen_path = getcwd() . "/cron";
-			$screen_filename = "CurrencyUpdate" . strtotime('now');
-			$command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
+			$screen_path = getcwd()."/cron";
+			$screen_filename = "CurrencyUpdate".strtotime('now');
+			$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
 			exec($command);
-			$this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
+			$this->db->update("currency", array("currencyrate"=>'1'), array("currency"=>"INR"));
 		}
 	}
 
@@ -179,7 +179,7 @@ 
 	function getcurrency_list($flag, $start = 0, $limit = 0) {
 		 $this->db_model->build_search('currency_list_search');
 	
-	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
+	$where = array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
 		if ($flag) {
 			$query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
 		} else {
@@ -205,7 +205,7 @@ 
 		$this->db->delete("currency");
 		return true;
 	}
-	function backup_insert($add_array='')
+	function backup_insert($add_array = '')
 	{
 	 unset($add_array["action"]);
 		$this->db->insert("backup_database", $add_array);
@@ -222,13 +222,13 @@ 
 	}
 	function get_backup_data($id)
 	{
-	  $where=array('id'=>$id);
+	  $where = array('id'=>$id);
 	  $query = $this->db_model->getSelect("*", "backup_database", $where);
 	  return $query;
 	}
-   function import_database($filename,$target_path)
+   function import_database($filename, $target_path)
 	{
-		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
+		$this->db->insert("backup_database", array('backup_name'=>$filename, 'path'=>$target_path));
 			return true;
 	}
 }

Braces +3 added lines, -5 removed lines

@@ -71,8 +71,7 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-			}
-			else
+			} else
 			{
 			   $this->db->where('reseller_id',0);
 			}
@@ -80,13 +79,12 @@ 
 			if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-		 }else {
+		 } else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
 		 }
-	  } 
-	  else {
+	  } else {
           
 			$where = array('reseller_id' => 0);
 			$this->db->where($where);

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

Spacing +79 added lines, -79 removed lines

@@ -34,7 +34,7 @@ 
 		$this->load->dbutil();
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function configuration_edit($edit_id = '') {
@@ -58,7 +58,7 @@ 
 			$this->session->set_userdata('configuration_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/configuration/');
+			redirect(base_url().'systems/configuration/');
 		}
 	}
 
@@ -84,29 +84,29 @@ 
 		}
 	}
 
-	function configuration($group_title='') {
-	if($group_title==""){
-		redirect(base_url() . '/dashboard');
+	function configuration($group_title = '') {
+	if ($group_title == "") {
+		redirect(base_url().'/dashboard');
 	}
-	if($group_title=="email"){
+	if ($group_title == "email") {
 		  $data['test_email_flag'] = true;
 	}
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = ucfirst($group_title);
-	$data['group_title']=$group_title;
-	$where=array("group_title"=>$group_title);
+	$data['group_title'] = $group_title;
+	$where = array("group_title"=>$group_title);
 	$details = $this->db_model->getSelect("*", "system", $where);
-	$data['details']=$details->result_array();
+	$data['details'] = $details->result_array();
 	$add_array = $this->input->post();
- 	if (!empty($add_array)) {
+ 	if ( ! empty($add_array)) {
 
-		foreach($add_array as $key=>$val){
-			$update_array=array('value'=>$val);
+		foreach ($add_array as $key=>$val) {
+			$update_array = array('value'=>$val);
 			$this->system_model->edit_configuration($update_array, $key);
 		}
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
-			redirect(base_url() . 'systems/configuration/'.$group_title);
-		}else{
+			redirect(base_url().'systems/configuration/'.$group_title);
+		} else {
 	 	$this->load->view('view_systemconf', $data);
 	}
 	}
@@ -166,7 +166,7 @@ 
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			 $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
-			 $this->resellertemplate_save($add_array,$reseller);
+			 $this->resellertemplate_save($add_array, $reseller);
 		}
 		else
 		{
@@ -174,12 +174,12 @@ 
 		}
 	}
     
-	function resellertemplate_save($data,$resellerid)
+	function resellertemplate_save($data, $resellerid)
 	{
-		$where = array('name' => $data['name'],'reseller_id'=>$resellerid);
+		$where = array('name' => $data['name'], 'reseller_id'=>$resellerid);
 		$count = $this->db_model->countQuery("*", "default_templates", $where);
 		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
-		if($count >0)
+		if ($count > 0)
 		{
 			$data['page_title'] = 'Edit Template';
 			if ($this->form_validation->run() == FALSE) {
@@ -188,7 +188,7 @@ 
                 
 				$this->system_model->edit_resellertemplate($data, $data['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		} else {
@@ -199,7 +199,7 @@ 
 				 $data['reseller_id'] = $resellerid;
 				$this->system_model->add_resellertemplate($data);
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		}
@@ -217,7 +217,7 @@ 
 				 unset($data['page_title']);
 				$this->system_model->edit_template($data, $data['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		} else {
@@ -228,7 +228,7 @@ 
 				 unset($data['form']);
 				$this->system_model->add_template($data);
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		}
@@ -245,7 +245,7 @@ 
 			$this->session->set_userdata('template_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/template/');
+			redirect(base_url().'systems/template/');
 		}
 	}
 
@@ -293,7 +293,7 @@ 
 			$this->session->set_userdata('country_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/country_list/');
+			redirect(base_url().'systems/country_list/');
 		}
 	}
 
@@ -352,9 +352,9 @@ 
     
 	function country_remove($id) {
 		$this->system_model->remove_country($id);
-		$country=$this->common->get_field_name('country','countrycode',$id);
+		$country = $this->common->get_field_name('country', 'countrycode', $id);
 		$this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
-		redirect(base_url() . 'systems/country_list/');
+		redirect(base_url().'systems/country_list/');
 	}
 
 	function country_delete_multiple() {
@@ -405,7 +405,7 @@ 
 			$this->session->set_userdata('currency_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/currency_list/');
+			redirect(base_url().'systems/currency_list/');
 		}
 	}
 
@@ -464,10 +464,10 @@ 
 	}
     
 	 function currency_remove($id) {
-		$currencyname=$this->common->get_field_name('currencyname','currency',$id);
+		$currencyname = $this->common->get_field_name('currencyname', 'currency', $id);
 		$this->system_model->remove_currency($id);
-		$this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
-		redirect(base_url() . 'systems/currency_list/');
+		$this->session->set_flashdata('astpp_notification', $currencyname.' Currency removed successfully!');
+		redirect(base_url().'systems/currency_list/');
 	}
 
 	function currency_delete_multiple() {
@@ -478,53 +478,53 @@ 
 	}
 	function database_backup()
 	{
-		$data=array();
+		$data = array();
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = 'Database Backup';
-		$filename=$this->db->database."_".date("YmdHms").".sql.gz";
+		$filename = $this->db->database."_".date("YmdHms").".sql.gz";
 		$data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
 		$this->load->view('view_database_backup', $data);
 	}
 	function database_backup_save()
 	{ 
 
-	  $add_array=$this->input->post();
+	  $add_array = $this->input->post();
       
-	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
+	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'], $add_array['id']), $add_array);
 	  $data['page_title'] = 'Database Backup';
-	  if($add_array['id'] != ''){
+	  if ($add_array['id'] != '') {
       
-	  }else{
-		   if($this->form_validation->run() == FALSE) {
+	  } else {
+		   if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-		  }else{
+		  } else {
 			 $db_name     = $this->db->database;
 			 $db_username = $this->db->username;
 			 $db_password = $this->db->password;
 			 $db_hostname = $this->db->hostname;
 			 $filename = $add_array['path'];
-			 $backup_file=DATABASE_DIRECTORY.$filename;
-			if (substr($backup_file,-3)=='.gz'){
-				  $backup_file = substr($backup_file,0,-3);
-				  $do_gzip=1;
+			 $backup_file = DATABASE_DIRECTORY.$filename;
+			if (substr($backup_file, -3) == '.gz') {
+				  $backup_file = substr($backup_file, 0, -3);
+				  $do_gzip = 1;
 			}
 
-		   $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
-		   $error_zip=0;
-		   exec($run_backup,$output,$error);
-		   if ($do_gzip){
+		   $run_backup = "/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
+		   $error_zip = 0;
+		   exec($run_backup, $output, $error);
+		   if ($do_gzip) {
 			  $gzip = $this->config->item('gzip-path');
 			  $run_gzip = $gzip." ".$backup_file;
-			  exec($run_gzip,$output,$error_zip);
+			  exec($run_gzip, $output, $error_zip);
 		   }
           
-		   if($error == 0 && $error_zip == 0 ){      
+		   if ($error == 0 && $error_zip == 0) {      
 			  $this->system_model->backup_insert($add_array);
 			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
 			  exit;
-		   }else{
+		   } else {
 				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
 				exit;
 		   }
@@ -541,7 +541,7 @@ 
 	{
 	$json_data = array();
 		$count_all = $this->system_model->getbackup_list(false, "", "");
-		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 
 		$query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -551,56 +551,56 @@ 
 		echo json_encode($json_data);
 	exit;
 	}
-	function database_restore_one($id='')
+	function database_restore_one($id = '')
 	{
 	   $result = $this->system_model->get_backup_data($id);
-	   $result_array=$result->result_array();
-	   if($result->num_rows() > 0)
+	   $result_array = $result->result_array();
+	   if ($result->num_rows() > 0)
 	   {
 			$db_name     = $this->db->database;
 			$db_username = $this->db->username;
 			$db_password = $this->db->password;
 			$db_hostname = $this->db->hostname;            
-			$path=DATABASE_DIRECTORY.$result_array[0]['path'];
-			if(file_exists($path)){
-			  if (substr($path,-3)=='.gz') {
+			$path = DATABASE_DIRECTORY.$result_array[0]['path'];
+			if (file_exists($path)) {
+			  if (substr($path, -3) == '.gz') {
 							$GUNZIP_EXE = $this->config->item('gunzip-path');
 							$run_gzip = $GUNZIP_EXE." < ".$path." | ";
 			  }
-			  $MYSQL="/usr/bin/mysql";
+			  $MYSQL = "/usr/bin/mysql";
 			  $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
 			  exec($run_restore);
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
-			  redirect(base_url() . 'systems/database_restore/');
-			}else{
+			  redirect(base_url().'systems/database_restore/');
+			} else {
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
-			  redirect(base_url() . 'systems/database_restore/');
+			  redirect(base_url().'systems/database_restore/');
 			}
 	  }
-	  redirect(base_url() . 'systems/database_restore/');
+	  redirect(base_url().'systems/database_restore/');
 	}
 
- function database_download($id=''){
+ function database_download($id = '') {
     
 	$result = $this->system_model->get_backup_data($id);
-	$result_array=$result->result_array();
-	if($result->num_rows() > 0)
+	$result_array = $result->result_array();
+	if ($result->num_rows() > 0)
 	{
-	  $path=$result_array[0]['path'];
+	  $path = $result_array[0]['path'];
 	  $filename = basename($path);
 	  $len = filesize($path);
       
 	  header("Content-Encoding: binary");
 	  header("Content-Type: application/octet-stream");
-	  header( "content-length: " . $len );
-	  header( "content-disposition: attachment; filename=" . $filename );
+	  header("content-length: ".$len);
+	  header("content-disposition: attachment; filename=".$filename);
 	  header("Expires: 0");
 	  header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 	  header("Cache-Control: private");
 	  header("Pragma: public");
 	  ob_clean();
-	  $fp=fopen( $path, "r" );
-	  fpassthru( $fp );
+	  $fp = fopen($path, "r");
+	  fpassthru($fp);
 	  exit;
 	}
 	}
@@ -614,17 +614,17 @@ 
    function database_import_file()
 	{
 		$filename = $_POST['fname'];
-		$upload_greeting_file= $_FILES['userfile']['name'];
-		$db_file = explode(".",$upload_greeting_file); 
-		if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
-			$target_path = basename( $_FILES['userfile']['name']);
-			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
+		$upload_greeting_file = $_FILES['userfile']['name'];
+		$db_file = explode(".", $upload_greeting_file); 
+		if ($db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql') {
+			$target_path = basename($_FILES['userfile']['name']);
+			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path);
           
-			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
-			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
+			$query = $this->system_model->import_database($filename, $_FILES['userfile']['name']);
+			$this->session->set_flashdata('astpp_errormsg', "The file ".basename($_FILES['userfile']['name'])." has been uploaded");
 			redirect(base_url()."systems/database_restore/");            
-		}else{
-			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
+		} else {
+			$this->session->set_flashdata('astpp_notification', "There is a some issue or invalid file format.");
 			redirect(base_url()."systems/database_restore/");            
 		}
 	}
@@ -634,7 +634,7 @@ 
 	  $this->db->where($where);
 	  $this->db->delete("backup_database");
 	  $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
-	  redirect(base_url() . 'systems/database_restore/');
+	  redirect(base_url().'systems/database_restore/');
 	  return true;
 	}
 	function database_backup_delete_multiple() {

Braces +10 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
 		$this->load->model('system_model');
 		$this->load->dbutil();
 
-		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 configuration_edit($edit_id = '') {
@@ -106,7 +107,7 @@ 
 		}
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
 			redirect(base_url() . 'systems/configuration/'.$group_title);
-		}else{
+		} else{
 	 	$this->load->view('view_systemconf', $data);
 	}
 	}
@@ -167,8 +168,7 @@ 
 			 $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
 			 $this->resellertemplate_save($add_array,$reseller);
-		}
-		else
+		} else
 		{
 			$this->admintemplate_save($add_array);
 		}
@@ -494,12 +494,12 @@ 
 	  $data['page_title'] = 'Database Backup';
 	  if($add_array['id'] != ''){
       
-	  }else{
+	  } else{
 		   if($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-		  }else{
+		  } else{
 			 $db_name     = $this->db->database;
 			 $db_username = $this->db->username;
 			 $db_password = $this->db->password;
@@ -524,7 +524,7 @@ 
 			  $this->system_model->backup_insert($add_array);
 			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
 			  exit;
-		   }else{
+		   } else{
 				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
 				exit;
 		   }
@@ -572,7 +572,7 @@ 
 			  exec($run_restore);
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
 			  redirect(base_url() . 'systems/database_restore/');
-			}else{
+			} else{
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
 			  redirect(base_url() . 'systems/database_restore/');
 			}
@@ -623,7 +623,7 @@ 
 			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
 			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
 			redirect(base_url()."systems/database_restore/");            
-		}else{
+		} else{
 			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
 			redirect(base_url()."systems/database_restore/");            
 		}

web_interface/astpp/application/modules/systems/libraries/system_form.php

Braces +3 added lines, -2 removed lines

@@ -21,8 +21,9 @@
 # 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 System_form {

 

Indentation +43 added lines, -43 removed lines

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

 	}

 

-    function build_system_list_for_admin() {

-        $grid_field_arr = json_encode(array(

-            array("Name", "190", "name", "", "", ""),

-            array("Value", "190", "value", "", "", ""),

-            array("Description", "320", "comment", "", "", ""),

-            array("Group", "120", "group_title", "", "", ""),

-            array(gettext("Action"), "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

-            ))

-                ));

-        return $grid_field_arr;

-    }

+	function build_system_list_for_admin() {

+		$grid_field_arr = json_encode(array(

+			array("Name", "190", "name", "", "", ""),

+			array("Value", "190", "value", "", "", ""),

+			array("Description", "320", "comment", "", "", ""),

+			array("Group", "120", "group_title", "", "", ""),

+			array(gettext("Action"), "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

+			))

+				));

+		return $grid_field_arr;

+	}

 

 	function build_grid_buttons() {

 		$buttons_json = json_encode(array(

@@ -104,28 +104,28 @@ 
 		return $buttons_json;

 	}

 

-    function build_template_list_for_admin() {

-        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

-            array("Subject", "650", "subject", "", "", "","","true","center"),

-            array(gettext("Action"), "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

-            ))

-                ));

-        return $grid_field_arr;

-    }

+	function build_template_list_for_admin() {

+		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

+			array("Subject", "650", "subject", "", "", "","","true","center"),

+			array(gettext("Action"), "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

+			))

+				));

+		return $grid_field_arr;

+	}

 

-    function build_country_list_for_admin() {     

-            $action = 'systems/country_list_edit/';

-            $action_remove = 'systems/country_remove/';

-            $mode="popup";

-        $grid_field_arr = json_encode(array(

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

-            array("Name", "705", "country", "", "", "","","true","center"),

-               array(gettext("Action"), "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

-                    "DELETE" => array("url" => "$action_remove", "mode" => "single")

-                ))

-                ));

-        return $grid_field_arr;

-     }

+	function build_country_list_for_admin() {     

+			$action = 'systems/country_list_edit/';

+			$action_remove = 'systems/country_remove/';

+			$mode="popup";

+		$grid_field_arr = json_encode(array(

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

+			array("Name", "705", "country", "", "", "","","true","center"),

+			   array(gettext("Action"), "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

+					"DELETE" => array("url" => "$action_remove", "mode" => "single")

+				))

+				));

+		return $grid_field_arr;

+	 }

 

     

 	 function build_admin_grid_buttons() {

@@ -170,17 +170,17 @@ 
 			$action_remove = 'systems/currency_remove/';

 			$mode="popup";

         

-        $grid_field_arr = json_encode(array(

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

-            array("Name", "320", "currencyname", "", "", "","","true","center"),

-	    array("Code", "290", "currency", "", "", "","","true","center"),

-	    array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

-               array(gettext("Action"), "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

-                    "DELETE" => array("url" => "$action_remove", "mode" => "single")

-                ))

-                ));

-        return $grid_field_arr;

-     }

+		$grid_field_arr = json_encode(array(

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

+			array("Name", "320", "currencyname", "", "", "","","true","center"),

+		array("Code", "290", "currency", "", "", "","","true","center"),

+		array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

+			   array(gettext("Action"), "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

+					"DELETE" => array("url" => "$action_remove", "mode" => "single")

+				))

+				));

+		return $grid_field_arr;

+	 }

 

 	function get_search_currency_form() {

 

Spacing +43 added lines, -43 removed lines

@@ -21,19 +21,19 @@ 
 # 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 System_form {

 

 	function get_template_form_fields() {

 

-		$form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));

+		$form['forms'] = array(base_url().'systems/template_save/', array("template_form", "name" => "template_form"));

 		$form['Email Template'] = array(

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

-			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

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

-			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20',  'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

+			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

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

+			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

 		);

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

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

@@ -46,7 +46,7 @@ 
 		$form['Search'] = array(

             

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

-			array('Subject', 'INPUT', array('name' => 'subject[subject]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''),array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('Subject', 'INPUT', array('name' => 'subject[subject]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''), array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

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

 		);

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

@@ -56,12 +56,12 @@ 
 

 	function get_configuration_form_fields() {

 

-		$form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

+		$form['forms'] = array(base_url().'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

 		$form['Edit Settings '] = array(

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

-			array('Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('Value', 'INPUT', array('name' => 'value', 'size' => '20', 'class' => "text field medium"), 'trim|required', 'tOOL TIP', ''),

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

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

 		);

 

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

@@ -77,7 +77,7 @@ 
 			array('Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),

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

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

-			array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown','where_arr',"group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

+			array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown', 'where_arr', "group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

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

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

 		);

@@ -92,7 +92,7 @@ 
             array("Value", "190", "value", "", "", ""),

             array("Description", "320", "comment", "", "", ""),

             array("Group", "120", "group_title", "", "", ""),

-            array(gettext("Action"), "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

+            array(gettext("Action"), "442", "", "", "", array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

             ))

                 ));

         return $grid_field_arr;

@@ -105,9 +105,9 @@ 
 	}

 

     function build_template_list_for_admin() {

-        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

-            array("Subject", "650", "subject", "", "", "","","true","center"),

-            array(gettext("Action"), "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

+        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "", "", "true", "center"),

+            array("Subject", "650", "subject", "", "", "", "", "true", "center"),

+            array(gettext("Action"), "200", "", "", "", array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

             ))

                 ));

         return $grid_field_arr;

@@ -116,10 +116,10 @@ 
     function build_country_list_for_admin() {     

             $action = 'systems/country_list_edit/';

             $action_remove = 'systems/country_remove/';

-            $mode="popup";

+            $mode = "popup";

         $grid_field_arr = json_encode(array(

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

-            array("Name", "705", "country", "", "", "","","true","center"),

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

+            array("Name", "705", "country", "", "", "", "", "true", "center"),

                array(gettext("Action"), "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

                     "DELETE" => array("url" => "$action_remove", "mode" => "single")

                 ))

@@ -129,8 +129,8 @@ 
 

     

 	 function build_admin_grid_buttons() {

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

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

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

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

 		   ));

 		return $buttons_json;

 	}

@@ -154,10 +154,10 @@ 
 	 function get_country_form_fields() {

      

         

-		$form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['forms'] = array(base_url().'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

 		$form['Country List'] = array(

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

-			array('Name', 'INPUT', array('name' => 'country', 'size' => '20',  'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Name', 'INPUT', array('name' => 'country', 'size' => '20', 'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

 		);

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -168,13 +168,13 @@ 
 	  function build_currency_list_for_admin() {        

 			$action = 'systems/currency_list_edit/';

 			$action_remove = 'systems/currency_remove/';

-			$mode="popup";

+			$mode = "popup";

         

         $grid_field_arr = json_encode(array(

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

-            array("Name", "320", "currencyname", "", "", "","","true","center"),

-	    array("Code", "290", "currency", "", "", "","","true","center"),

-	    array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

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

+            array("Name", "320", "currencyname", "", "", "", "", "true", "center"),

+	    array("Code", "290", "currency", "", "", "", "", "true", "center"),

+	    array(" Rate", "330", "currencyrate", "", "", "", "", "true", "right"),

                array(gettext("Action"), "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

                     "DELETE" => array("url" => "$action_remove", "mode" => "single")

                 ))

@@ -202,12 +202,12 @@ 
 	function get_currency_form_fields() {

      

         

-		$form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['forms'] = array(base_url().'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

 		$form['Currency List'] = array(

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

-			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20','maxlength' => '40',  'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20','maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20', 'maxlength' => '40', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20', 'maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20', 'maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

 		);

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -216,21 +216,21 @@ 
 	}

 

 	 function build_admin_currency_grid_buttons() {

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

-			array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

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

+			array("Update Currencies", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

 		   ));

 		return $buttons_json;

 	}

  

   

-  function get_backup_database_form_fields($file_name,$id='') {

+  function get_backup_database_form_fields($file_name, $id = '') {

    $val = $id > 0 ? "backup_database.path.$id" : 'backup_database.path';

-	  $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

+	  $form['forms'] = array(base_url().'systems/database_backup_save/', array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

 	  $form['Database Information'] = array(

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

 	  array('Name', 'INPUT', array('name' => 'backup_name', 'size' => '20', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),

-	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name,'class' => "text field medium"), 'trim|required|is_unique[' . $val . ']', 'tOOL TIP', ''),

+	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name, 'class' => "text field medium"), 'trim|required|is_unique['.$val.']', '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\')');

 	  $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -238,10 +238,10 @@ 
   }

   function build_backupdastabase_list() {

 		$grid_field_arr = json_encode(array(

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

-			array("Date", "260", "date", "date", "date", "convert_GMT_to","","true","center"),

-			array("Name", "295", "backup_name", "", "", "","","true","center"),

-			array("File Name", "480", "path", "", "", "","","true","center"),

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

+			array("Date", "260", "date", "date", "date", "convert_GMT_to", "", "true", "center"),

+			array("Name", "295", "backup_name", "", "", "", "", "true", "center"),

+			array("File Name", "480", "path", "", "", "", "", "true", "center"),

 			array(gettext("Action"), "185", "", "", "",

 			array("EDIT_RESTORE" => array("url" => "systems/database_restore_one/", "mode" => ""),

 			"DOWNLOAD_DATABASE" => array("url" => "systems/database_download/", "mode" => ""),

@@ -250,9 +250,9 @@ 
 		return $grid_field_arr;

 	}

 	function build_backupdastabase_buttons() {

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

-		  array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

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

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

+		  array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

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

 						));

 		  return $buttons_json;

 	}

web_interface/astpp/application/modules/pricing/models/pricing_model.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 		/*
         ASTPP  3.0  Add Rategroup add creation date.
         */
-		$add_array['creation_date']=gmdate("Y-m-d H:i:s");
+		$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");
@@ -67,7 +67,7 @@ 
 		/*
         ASTPP  3.0  Edit Rategroup time update last mofied date.
         */
-		$data['last_modified_date']=gmdate("Y-m-d H:i:s");
+		$data['last_modified_date'] = gmdate("Y-m-d H:i:s");
 		/*********************************************************/
 		$this->db->where("id", $id);
 		$this->db->update("pricelists", $data);