iNextrix / ASTPP

web_interface/astpp/application/controllers/feedback.php

Spacing +38 added lines, -38 removed lines

@@ -28,59 +28,59 @@ 
 		parent::__construct();
 	}
 	
-	function index(){
+	function index() {
 		$data['account_info'] = $this->session->userdata['accountinfo'];
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = "Feedback";
-		$this->load->view('view_feedback',$data);
+		$this->load->view('view_feedback', $data);
 	}
-	function customer_feedback_result($flag=FALSE){
-		if($flag){
+	function customer_feedback_result($flag = FALSE) {
+		if ($flag) {
 			$account_info = array();
-			$this->db->where("accountid","1");
+			$this->db->where("accountid", "1");
 			$res = $this->db->get('invoice_conf');
-			if($res->num_rows > 0){
+			if ($res->num_rows > 0) {
 				$masterdata = $res->result_array();
 				$account_info = $masterdata['0'];
 
-				$company_name=$account_info['company_name'];
-				$address=$account_info['address'];
-				$city=$account_info['city'];
-				$province=$account_info['province'];
-				$country=$account_info['country'];
-				$zipcode=$account_info['zipcode'];
-				$telephone=$account_info['telephone'];
-				$fax=$account_info['fax'];
-				$emailaddress=$account_info['emailaddress'];
-				$website=$account_info['website'];
+				$company_name = $account_info['company_name'];
+				$address = $account_info['address'];
+				$city = $account_info['city'];
+				$province = $account_info['province'];
+				$country = $account_info['country'];
+				$zipcode = $account_info['zipcode'];
+				$telephone = $account_info['telephone'];
+				$fax = $account_info['fax'];
+				$emailaddress = $account_info['emailaddress'];
+				$website = $account_info['website'];
 
-				$data=array("name"=>"Admin","company_name"=>$company_name,"address"=>$address,"city"=>$city,"province"=>$province,"country"=>$country,"zipcode"=>$zipcode,"telephone"=>$telephone,"fax"=>$fax,"emailaddress"=>$emailaddress,"website"=>$website,"serverip"=>$_SERVER['SERVER_NAME'],"FLAG"=>"TRUE");				
+				$data = array("name"=>"Admin", "company_name"=>$company_name, "address"=>$address, "city"=>$city, "province"=>$province, "country"=>$country, "zipcode"=>$zipcode, "telephone"=>$telephone, "fax"=>$fax, "emailaddress"=>$emailaddress, "website"=>$website, "serverip"=>$_SERVER['SERVER_NAME'], "FLAG"=>"TRUE");				
 			}
-		} else{
+		} else {
 			$account_info = array();
-			$this->db->where("type","-1");
+			$this->db->where("type", "-1");
 			$res = $this->db->get('accounts');
-			if($res->num_rows > 0){
+			if ($res->num_rows > 0) {
 				$masterdata = $res->result_array();
 				$account_info = $masterdata['0'];
 
-			$name=$_REQUEST['name']="Admin";
-			$email=$_REQUEST['email']=$account_info['email'];
-			$feedback=$_REQUEST['feedback'];
-			$first_name=$account_info['first_name'];
-			$last_name=$account_info['last_name'];
-			$city=$account_info['city'];
-			$telephone_1=$account_info['telephone_1'];
-			$account_email=$account_info['email'];
-			$company_name=$account_info['company_name'];
-			$address_1=$account_info['address_1'];
-			$address_2=$account_info['address_2'];
-			$telephone_2=$account_info['telephone_2'];
-			$province=$account_info['province'];
+			$name = $_REQUEST['name'] = "Admin";
+			$email = $_REQUEST['email'] = $account_info['email'];
+			$feedback = $_REQUEST['feedback'];
+			$first_name = $account_info['first_name'];
+			$last_name = $account_info['last_name'];
+			$city = $account_info['city'];
+			$telephone_1 = $account_info['telephone_1'];
+			$account_email = $account_info['email'];
+			$company_name = $account_info['company_name'];
+			$address_1 = $account_info['address_1'];
+			$address_2 = $account_info['address_2'];
+			$telephone_2 = $account_info['telephone_2'];
+			$province = $account_info['province'];
 
-			$data=array("name"=>$name,"email"=>$email,"feedback"=>$feedback,"first_name"=>$first_name,"last_name"=>$last_name,"city"=>$city,"telephone_1"=>$telephone_1,"account_email"=>$account_email,"company_name"=>$company_name,"address_1"=>$address_1,"address_2"=>$address_2,"telephone_2"=>$telephone_2,"province"=>$province,"serverip"=>$_SERVER['SERVER_ADDR'],"FLAG"=>"FALSE");
+			$data = array("name"=>$name, "email"=>$email, "feedback"=>$feedback, "first_name"=>$first_name, "last_name"=>$last_name, "city"=>$city, "telephone_1"=>$telephone_1, "account_email"=>$account_email, "company_name"=>$company_name, "address_1"=>$address_1, "address_2"=>$address_2, "telephone_2"=>$telephone_2, "province"=>$province, "serverip"=>$_SERVER['SERVER_ADDR'], "FLAG"=>"FALSE");
 
-				$data_new= json_encode($data);
+				$data_new = json_encode($data);
 			}
 		}
 		$ch = curl_init();
@@ -96,12 +96,12 @@ 
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 
 		$response = curl_exec($ch);
-		if(!$flag)
-		 redirect(base_url() . 'feedback/thanks');
+		if ( ! $flag)
+		 redirect(base_url().'feedback/thanks');
 	    
 
 	}
-	function thanks(){
+	function thanks() {
 			$this->load->view('view_feedback_response');
 	}	
 

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 
 		$response = curl_exec($ch);
-		if(!$flag)
-		 redirect(base_url() . 'feedback/thanks');
+		if(!$flag) {
+				 redirect(base_url() . 'feedback/thanks');
+		}
 	    
 
 	}

web_interface/astpp/application/controllers/currencyupdate.php

Indentation +48 added lines, -48 removed lines

@@ -21,48 +21,48 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 class Currencyupdate extends CI_Controller {
-    function __construct()
-    {
-        parent::__construct();
-     //   if(!defined( 'CRON' ) )
-       //   exit();
-        $this->load->model("db_model");
-        $this->load->library("astpp/common");
-    }
-    function update_currency() {
-        $where = array("currency <>"=> Common_model::$global_config['system_config']['base_currency']);
-        $query = $this->db_model->getSelect("*", "currency", $where);
+	function __construct()
+	{
+		parent::__construct();
+	 //   if(!defined( 'CRON' ) )
+	   //   exit();
+		$this->load->model("db_model");
+		$this->load->library("astpp/common");
+	}
+	function update_currency() {
+		$where = array("currency <>"=> Common_model::$global_config['system_config']['base_currency']);
+		$query = $this->db_model->getSelect("*", "currency", $where);
 
-        if ($query->num_rows > 0) {
-            $currency_data = $query->result_array();
-    		$url = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s=";
-	    	foreach ($currency_data as $currency_value) {
-	    	    $url .= Common_model::$global_config['system_config']['base_currency'].$currency_value['currency'].'=X+';
-	    	}
-	    	$url .= '&f=l1';
+		if ($query->num_rows > 0) {
+			$currency_data = $query->result_array();
+			$url = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s=";
+			foreach ($currency_data as $currency_value) {
+				$url .= Common_model::$global_config['system_config']['base_currency'].$currency_value['currency'].'=X+';
+			}
+			$url .= '&f=l1';
 
-	    	$sql = '';
-	    	$response = $this->curl_response($url);
-	    	$content_data = explode(' ', $response);
+			$sql = '';
+			$response = $this->curl_response($url);
+			$content_data = explode(' ', $response);
 
-	    	foreach ($content_data as $content_data1) {
-	    	   $currency_arr = explode("\n", $content_data1);
-	    	    foreach ($currency_arr as $final_val)
-	    	    {
-	    	        $currency_final = array();
-	    		    $currency_final = explode(',', $final_val);
-	    		    if (isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0] != '' && $currency_final[1] != 'N/A') {
-			      $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0], 4, 3)."'";
-			      $this->db->query($sql);
-	    		    }
-	    	    }
-	    	}
-	    	$sql = "UPDATE currency SET currencyRate = '1' WHERE currency = '".Common_model::$global_config['system_config']['base_currency']."'";
-                $this->db->query($sql);
-      }
-	      $this->session->set_flashdata("astpp_errormsg", "Currency exchange rates successfully updated.");
-	      redirect(base_url()."/systems/currency_list/");
-	      exit;
+			foreach ($content_data as $content_data1) {
+			   $currency_arr = explode("\n", $content_data1);
+				foreach ($currency_arr as $final_val)
+				{
+					$currency_final = array();
+					$currency_final = explode(',', $final_val);
+					if (isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0] != '' && $currency_final[1] != 'N/A') {
+				  $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0], 4, 3)."'";
+				  $this->db->query($sql);
+					}
+				}
+			}
+			$sql = "UPDATE currency SET currencyRate = '1' WHERE currency = '".Common_model::$global_config['system_config']['base_currency']."'";
+				$this->db->query($sql);
+	  }
+		  $this->session->set_flashdata("astpp_errormsg", "Currency exchange rates successfully updated.");
+		  redirect(base_url()."/systems/currency_list/");
+		  exit;
 	}
 
 	/**
@@ -70,15 +70,15 @@ 
 	 */
 	function curl_response($url)
 	{
-		    $ch = curl_init(); // Initialising cURL
-		    curl_setopt($ch, CURLOPT_URL, $url);
-		    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-		    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		    curl_setopt($ch, CURLOPT_ENCODING, "");
-		    curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)");
-		    $data = curl_exec($ch); // Executing the cURL request and assigning the returned data to the $data variable
-		    curl_close($ch); // Closing cURL
-		    return $data;
+			$ch = curl_init(); // Initialising cURL
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_ENCODING, "");
+			curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)");
+			$data = curl_exec($ch); // Executing the cURL request and assigning the returned data to the $data variable
+			curl_close($ch); // Closing cURL
+			return $data;
 	}
 }
 ?>

web_interface/astpp/application/controllers/updateBalance.php

Indentation +240 added lines, -240 removed lines

@@ -24,271 +24,271 @@
 
 class UpdateBalance extends MX_Controller {
 
-    public $account_arr = array();
-    public $currentdate = '';
+	public $account_arr = array();
+	public $currentdate = '';
 
-    function __construct() {
-        parent::__construct();
-        $this->load->model("db_model");
-        $this->load->model("common_model");
-        $this->load->library("astpp/common");
-        $this->currentdate = gmdate('Y-m-d H:i:s');
-    }
+	function __construct() {
+		parent::__construct();
+		$this->load->model("db_model");
+		$this->load->model("common_model");
+		$this->load->library("astpp/common");
+		$this->currentdate = gmdate('Y-m-d H:i:s');
+	}
 
-    function GetUpdateBalance() {
-        $accounts_data = $this->get_table_data("*", "accounts", array("status" => "0", "deleted" => "0"));
-        foreach ($accounts_data as $account_val) {
-            $this->process_subscriptions($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
-            $this->process_DID_charges($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
-        }
-    }
+	function GetUpdateBalance() {
+		$accounts_data = $this->get_table_data("*", "accounts", array("status" => "0", "deleted" => "0"));
+		foreach ($accounts_data as $account_val) {
+			$this->process_subscriptions($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
+			$this->process_DID_charges($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
+		}
+	}
 
-    function process_subscriptions($accountinfo, $startdate, $enddate, $Manualflg = false) {
+	function process_subscriptions($accountinfo, $startdate, $enddate, $Manualflg = false) {
 //        Defined Original Sweep it for calculation start date for first time.
-        $accountinfo['original_sweep_id'] = $accountinfo['sweep_id'];
-        $invoiceid = 0;
+		$accountinfo['original_sweep_id'] = $accountinfo['sweep_id'];
+		$invoiceid = 0;
         
-        // Check Charge is applied that is for first time or already calculated before
+		// Check Charge is applied that is for first time or already calculated before
 
-        $where = "(charge_upto ='0000-00-00 00:00:00' OR charge_upto <='".gmdate("Y-m-d H:i:s")."')";
-        $this->db->where('accountid', $accountinfo['id']);
-        $this->db->where($where);
-        $this->db->select('*');
-        $account_charges = $this->db->get('charge_to_account');
-        if ($account_charges->num_rows() > 0) {
-            $accountchargs = $account_charges->result_array();
+		$where = "(charge_upto ='0000-00-00 00:00:00' OR charge_upto <='".gmdate("Y-m-d H:i:s")."')";
+		$this->db->where('accountid', $accountinfo['id']);
+		$this->db->where($where);
+		$this->db->select('*');
+		$account_charges = $this->db->get('charge_to_account');
+		if ($account_charges->num_rows() > 0) {
+			$accountchargs = $account_charges->result_array();
 
-            foreach ($accountchargs as $accharges) {
-                //Get information from database of active charges.
-                $charge_data = $this->get_table_data("*", "charges", array("id" => $accharges['charge_id'], "status" => "0"));
-                if ($charge_data && ! empty($charge_data)) {
-                    $charge_data = $charge_data[0];
-                    //Get Start Date of Charge
-                    $charge_upto = ($accharges["charge_upto"] != "0000-00-00 00:00:00" && $accharges["charge_upto"] != "") ?
-                            date("Y-m-d H:i:s", strtotime("+1 Second", strtotime($accharges["charge_upto"]))) : $accharges["assign_date"];
-                   if ($accountinfo['original_sweep_id'] == 2 && $charge_data['pro_rate'] == 0 && $charge_data['sweep_id'] == 2 && ($accountinfo['invoice_day'] < gmdate("d", strtotime($accharges['assign_date'])))) {
-                      $charge_upto = date("Y-m-".$accountinfo['invoice_day']." H:i:s", strtotime($accharges["assign_date"]));
-                   }
-                    //Overwrite Billing scehdule of customer assign proper charge
-                    if ($accountinfo['sweep_id'] != $charge_data['sweep_id']) {
-                        $accountinfo['sweep_id'] = $charge_data['sweep_id'];
-                    }
-                    //IF its already assigned before invoice start date then no need to applied same charge one more time
-                    if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
-                        $fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                        if ($Manualflg) {
-                            $todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
-                        } else {
-                            $todate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                        }
-                        /*
+			foreach ($accountchargs as $accharges) {
+				//Get information from database of active charges.
+				$charge_data = $this->get_table_data("*", "charges", array("id" => $accharges['charge_id'], "status" => "0"));
+				if ($charge_data && ! empty($charge_data)) {
+					$charge_data = $charge_data[0];
+					//Get Start Date of Charge
+					$charge_upto = ($accharges["charge_upto"] != "0000-00-00 00:00:00" && $accharges["charge_upto"] != "") ?
+							date("Y-m-d H:i:s", strtotime("+1 Second", strtotime($accharges["charge_upto"]))) : $accharges["assign_date"];
+				   if ($accountinfo['original_sweep_id'] == 2 && $charge_data['pro_rate'] == 0 && $charge_data['sweep_id'] == 2 && ($accountinfo['invoice_day'] < gmdate("d", strtotime($accharges['assign_date'])))) {
+					  $charge_upto = date("Y-m-".$accountinfo['invoice_day']." H:i:s", strtotime($accharges["assign_date"]));
+				   }
+					//Overwrite Billing scehdule of customer assign proper charge
+					if ($accountinfo['sweep_id'] != $charge_data['sweep_id']) {
+						$accountinfo['sweep_id'] = $charge_data['sweep_id'];
+					}
+					//IF its already assigned before invoice start date then no need to applied same charge one more time
+					if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
+						$fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+						if ($Manualflg) {
+							$todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
+						} else {
+							$todate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+						}
+						/*
                          * Add assign_date and charge_upto variable for calculation purpose.
                          */
-                        $itemArr = array('description' => $charge_data['description'],
-                            'item_id' => $charge_data['id'],
-                            "type" => "SUBCHRG",
-                            "cycle" => $charge_data["sweep_id"],
-                            "assign_date"=>$accharges['assign_date'],
-                            "charge_upto"=>$accharges['charge_upto']);
+						$itemArr = array('description' => $charge_data['description'],
+							'item_id' => $charge_data['id'],
+							"type" => "SUBCHRG",
+							"cycle" => $charge_data["sweep_id"],
+							"assign_date"=>$accharges['assign_date'],
+							"charge_upto"=>$accharges['charge_upto']);
 			//Add a new arguement ($accharges) which have all information of charges.
-                        $lastdate = $this->calculate_charges($accountinfo, $itemArr, $charge_data["charge"], $fromdate, $todate, $charge_data["pro_rate"]);
-                        if ($lastdate) {
-                                               $this->db->update("charge_to_account", array("charge_upto" => $lastdate), array("charge_id" => $charge_data["id"], "accountid" => $accountinfo["id"]));
-                        }
-                    }
-                }
-            }
-        }
-    }
+						$lastdate = $this->calculate_charges($accountinfo, $itemArr, $charge_data["charge"], $fromdate, $todate, $charge_data["pro_rate"]);
+						if ($lastdate) {
+											   $this->db->update("charge_to_account", array("charge_upto" => $lastdate), array("charge_id" => $charge_data["id"], "accountid" => $accountinfo["id"]));
+						}
+					}
+				}
+			}
+		}
+	}
 
-    function process_DID_charges($AccountDATA, $startdate, $enddate, $Manualflg = false) {
-        $dids_data = $this->get_table_data("*", "dids", array("status" => "0", "accountid " => $AccountDATA["id"]));
-        $AccountDATA['original_sweep_id'] = $AccountDATA['sweep_id'];
-        $AccountDATA['sweep_id'] = '2';
-        if ($dids_data) {
-            foreach ($dids_data as $did_value) {
-                $charge_upto = ($did_value["charge_upto"] != "0000-00-00 00:00:00" && $did_value["charge_upto"] != "") ? $did_value["charge_upto"] : $did_value["assign_date"];
+	function process_DID_charges($AccountDATA, $startdate, $enddate, $Manualflg = false) {
+		$dids_data = $this->get_table_data("*", "dids", array("status" => "0", "accountid " => $AccountDATA["id"]));
+		$AccountDATA['original_sweep_id'] = $AccountDATA['sweep_id'];
+		$AccountDATA['sweep_id'] = '2';
+		if ($dids_data) {
+			foreach ($dids_data as $did_value) {
+				$charge_upto = ($did_value["charge_upto"] != "0000-00-00 00:00:00" && $did_value["charge_upto"] != "") ? $did_value["charge_upto"] : $did_value["assign_date"];
 
-                if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
-                    $fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                    if ($Manualflg) {
-                        $todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
-                    } else {
-                        $todate = gmdate("Y-m-d H:i:s", strtotime($did_value["upto_date"]));
-                    }
-                    $itemArr = array('description' => $did_value['number'],
-                                    'item_id' => $did_value['id'],
-                                    "type" => "DIDCHRG",
-                                    "cycle" => "2",
-                                    "assign_date"=>$did_value['assign_date'],
-                                    "charge_upto"=>$did_value['charge_upto']);
-                    if ($did_value['parent_id'] > 0) {
-                        $parent_id = $did_value['parent_id'];
-                        while ($parent_id != 0) {
-                            $reseller_dids = $this->get_table_data("*", "reseller_pricing", array("reseller_id" => $parent_id, "note" => $did_value['number']));
-                            $reseller_acc_data = $this->get_table_data("*", "accounts", array("id" => $parent_id));
-                            $reseller_acc_data = $reseller_acc_data['0'];
-                            $reseller_acc_data['sweep_id'] = '2';
-                            $reseller_dids = $reseller_dids[0];
-                            if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
-                                //Apply charges to resellers customers.
-                                $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
-                            } else {
-                                //Apply charges to Resellers.
-                                $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
-                            }
-                            $parent_id = $reseller_dids['parent_id'];
-                        }
-                    }
+				if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
+					$fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+					if ($Manualflg) {
+						$todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
+					} else {
+						$todate = gmdate("Y-m-d H:i:s", strtotime($did_value["upto_date"]));
+					}
+					$itemArr = array('description' => $did_value['number'],
+									'item_id' => $did_value['id'],
+									"type" => "DIDCHRG",
+									"cycle" => "2",
+									"assign_date"=>$did_value['assign_date'],
+									"charge_upto"=>$did_value['charge_upto']);
+					if ($did_value['parent_id'] > 0) {
+						$parent_id = $did_value['parent_id'];
+						while ($parent_id != 0) {
+							$reseller_dids = $this->get_table_data("*", "reseller_pricing", array("reseller_id" => $parent_id, "note" => $did_value['number']));
+							$reseller_acc_data = $this->get_table_data("*", "accounts", array("id" => $parent_id));
+							$reseller_acc_data = $reseller_acc_data['0'];
+							$reseller_acc_data['sweep_id'] = '2';
+							$reseller_dids = $reseller_dids[0];
+							if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
+								//Apply charges to resellers customers.
+								$lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
+								if ($lastdate)
+									$this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+							} else {
+								//Apply charges to Resellers.
+								$lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
+								if ($lastdate)
+									$this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+							}
+							$parent_id = $reseller_dids['parent_id'];
+						}
+					}
 //   		else{
-                    $lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
-                    if ($lastdate)
-                      $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
+					$lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
+					if ($lastdate)
+					  $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
 //            	}
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
 
-    /**
-     * @param string $fromdate
-     * @param string $todate
-     */
-    function calculate_charges($AccountDATA, $itemArr, $charge, $fromdate, $todate, $pro_rate = "1") {
-        $lastdate = false;
-        $billing_cycle = ($AccountDATA['sweep_id'] == "0") ? "1 day" : "1 month";
-        $last_invoice_date = $this->common->get_invoice_date("invoice_date", $AccountDATA['id'], $AccountDATA['reseller_id']);
-      //Below variable gives date based on assign or creation or monthly user billing day
-        $last_invoice_date = ($last_invoice_date) ? $last_invoice_date : (($pro_rate == 0 && $AccountDATA['original_sweep_id'] == 2 && ($AccountDATA['invoice_day'] < gmdate("d", strtotime($itemArr['assign_date'])))) ? date("Y-m-".$AccountDATA['invoice_day']." 00:00:00") : (($pro_rate == 1 && $AccountDATA['original_sweep_id'] == 0) ? date("Y-m-d 00:00:00", strtotime($itemArr['assign_date'])) : date("Y-m-d 00:00:00", strtotime($AccountDATA['creation']))));
-        $last_invoice_date = ($last_invoice_date <= $fromdate) ? $last_invoice_date : $fromdate;
-        $Charges_date_range = array();
-        $prorate_array = array();
-        $daylen = 60 * 60 * 24;
-        /*Get assign day and billing day for postpaid monthly user.
+	/**
+	 * @param string $fromdate
+	 * @param string $todate
+	 */
+	function calculate_charges($AccountDATA, $itemArr, $charge, $fromdate, $todate, $pro_rate = "1") {
+		$lastdate = false;
+		$billing_cycle = ($AccountDATA['sweep_id'] == "0") ? "1 day" : "1 month";
+		$last_invoice_date = $this->common->get_invoice_date("invoice_date", $AccountDATA['id'], $AccountDATA['reseller_id']);
+	  //Below variable gives date based on assign or creation or monthly user billing day
+		$last_invoice_date = ($last_invoice_date) ? $last_invoice_date : (($pro_rate == 0 && $AccountDATA['original_sweep_id'] == 2 && ($AccountDATA['invoice_day'] < gmdate("d", strtotime($itemArr['assign_date'])))) ? date("Y-m-".$AccountDATA['invoice_day']." 00:00:00") : (($pro_rate == 1 && $AccountDATA['original_sweep_id'] == 0) ? date("Y-m-d 00:00:00", strtotime($itemArr['assign_date'])) : date("Y-m-d 00:00:00", strtotime($AccountDATA['creation']))));
+		$last_invoice_date = ($last_invoice_date <= $fromdate) ? $last_invoice_date : $fromdate;
+		$Charges_date_range = array();
+		$prorate_array = array();
+		$daylen = 60 * 60 * 24;
+		/*Get assign day and billing day for postpaid monthly user.
          */
-        $assign_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? gmdate("d", strtotime($itemArr['assign_date'])) : 0;
-        $billing_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? $AccountDATA['invoice_day'] : 0;
-        //Create an array if charge not applied yet and invoice day is greater than assign_day
-        if ($itemArr['charge_upto'] == "0000-00-00 00:00:00" && ($billing_day > $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2) {
+		$assign_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? gmdate("d", strtotime($itemArr['assign_date'])) : 0;
+		$billing_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? $AccountDATA['invoice_day'] : 0;
+		//Create an array if charge not applied yet and invoice day is greater than assign_day
+		if ($itemArr['charge_upto'] == "0000-00-00 00:00:00" && ($billing_day > $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2) {
 	  $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("-1 second", strtotime(date("Y-m-".$AccountDATA['invoice_day']." 00:00:00", strtotime($itemArr["assign_date"])))));
 	  $prorate_array[] = array("start_date" => date("Y-m-d H:i:s", strtotime($itemArr['assign_date'])), "end_date" => $last_invoice_date);
 	  
-        }
-        while (strtotime($last_invoice_date) <= strtotime($todate)) {
-            $startdate = $last_invoice_date;
-            $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+".$billing_cycle, strtotime($last_invoice_date)));
-            $Charges_date_range[] = array("start_date" =>gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($startdate))), "end_date" => $last_invoice_date);
-        }
-        if ( ! empty($prorate_array)) {
-         array_pop($Charges_date_range);
-         $Charges_date_range = array_merge($prorate_array, $Charges_date_range);
-        }
-        if ( ! empty($Charges_date_range)) {
-            foreach ($Charges_date_range as $ChargeVal) {
-                if (($pro_rate == 0 && $itemArr['cycle'] != 2) || (($billing_day <= $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2)) {
-                    $ChargeVal['end_date'] = gmdate("Y-m-d 23:59:59", strtotime("-1 Day", strtotime($ChargeVal['end_date'])));
-                }
-                if ( ! empty($itemArr['charge_upto']) && empty($lastdate)) {
-                    $start_date = ($itemArr['charge_upto'] == '0000-00-00 00:00:00' && $AccountDATA['sweep_id'] == 2) ? $itemArr['assign_date'] : $ChargeVal['start_date'];
-                } else {
-                    $start_date = (empty($lastdate)) ? $ChargeVal['start_date'] : gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate)));
-                }
+		}
+		while (strtotime($last_invoice_date) <= strtotime($todate)) {
+			$startdate = $last_invoice_date;
+			$last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+".$billing_cycle, strtotime($last_invoice_date)));
+			$Charges_date_range[] = array("start_date" =>gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($startdate))), "end_date" => $last_invoice_date);
+		}
+		if ( ! empty($prorate_array)) {
+		 array_pop($Charges_date_range);
+		 $Charges_date_range = array_merge($prorate_array, $Charges_date_range);
+		}
+		if ( ! empty($Charges_date_range)) {
+			foreach ($Charges_date_range as $ChargeVal) {
+				if (($pro_rate == 0 && $itemArr['cycle'] != 2) || (($billing_day <= $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2)) {
+					$ChargeVal['end_date'] = gmdate("Y-m-d 23:59:59", strtotime("-1 Day", strtotime($ChargeVal['end_date'])));
+				}
+				if ( ! empty($itemArr['charge_upto']) && empty($lastdate)) {
+					$start_date = ($itemArr['charge_upto'] == '0000-00-00 00:00:00' && $AccountDATA['sweep_id'] == 2) ? $itemArr['assign_date'] : $ChargeVal['start_date'];
+				} else {
+					$start_date = (empty($lastdate)) ? $ChargeVal['start_date'] : gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate)));
+				}
 
-                $lastdate = date("Y-m-d H:i:s", strtotime($ChargeVal['end_date']));
-                $end_date_str_time = strtotime("+1 Seconds", strtotime($lastdate));
-                $start_date_str_time = strtotime(gmdate("Y-m-d 00:00:00", strtotime($start_date)));
-                $temp_f_date = new DateTime(gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate))));
-                $temp_t_date = new DateTime($start_date);
-                $diff = $temp_f_date->diff($temp_t_date);
-                $month = (($diff->format('%y') * 12) + $diff->format('%m'));
-                $temp_charge = $charge;
-                if (($month != "1" || $pro_rate == "0") && $itemArr['cycle'] != '0') {
-                  //Calculate Number of days in month from start date
-                    $total_num_of_day = cal_days_in_month(CAL_GREGORIAN, date('m', $start_date_str_time), date('Y', $start_date_str_time));
-                    $days_diff = floor(($end_date_str_time - $start_date_str_time) / $daylen);
-                    $chrg_per_day = ($charge / $total_num_of_day);
-                    $temp_charge = ($chrg_per_day * $days_diff);
-                }
+				$lastdate = date("Y-m-d H:i:s", strtotime($ChargeVal['end_date']));
+				$end_date_str_time = strtotime("+1 Seconds", strtotime($lastdate));
+				$start_date_str_time = strtotime(gmdate("Y-m-d 00:00:00", strtotime($start_date)));
+				$temp_f_date = new DateTime(gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate))));
+				$temp_t_date = new DateTime($start_date);
+				$diff = $temp_f_date->diff($temp_t_date);
+				$month = (($diff->format('%y') * 12) + $diff->format('%m'));
+				$temp_charge = $charge;
+				if (($month != "1" || $pro_rate == "0") && $itemArr['cycle'] != '0') {
+				  //Calculate Number of days in month from start date
+					$total_num_of_day = cal_days_in_month(CAL_GREGORIAN, date('m', $start_date_str_time), date('Y', $start_date_str_time));
+					$days_diff = floor(($end_date_str_time - $start_date_str_time) / $daylen);
+					$chrg_per_day = ($charge / $total_num_of_day);
+					$temp_charge = ($chrg_per_day * $days_diff);
+				}
                 
-                if (strtotime($ChargeVal['start_date']) < strtotime($ChargeVal['end_date'])) {
-                                    $this->Manage_invoice_item($AccountDATA, $itemArr['description'], $itemArr['item_id'], $temp_charge, $itemArr['type'], $start_date, $lastdate, $todate);
-                }
-                //                echo "<br/> ORG CHARG : " . $charge . " Charges : " . $temp_charge . "<br/>";
-            }
-        }
-        return $lastdate;
-    }
+				if (strtotime($ChargeVal['start_date']) < strtotime($ChargeVal['end_date'])) {
+									$this->Manage_invoice_item($AccountDATA, $itemArr['description'], $itemArr['item_id'], $temp_charge, $itemArr['type'], $start_date, $lastdate, $todate);
+				}
+				//                echo "<br/> ORG CHARG : " . $charge . " Charges : " . $temp_charge . "<br/>";
+			}
+		}
+		return $lastdate;
+	}
 
-    /**
-     * @param string $todate
-     */
-    function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
-        $invoiceid = 0;
-        $Bal = "0.00"; 
-        if ($AccountData["posttoexternal"] == 0) {
-	    $reseller_id = $AccountData['type'] == 1 ? $AccountData['id'] : 0;
-	    $where = "accountid IN ('".$reseller_id."','1')";
-	    $this->db->where($where);
-	    $this->db->select('*');
-	    $this->db->order_by('accountid', 'desc');
-	    $this->db->limit(1);
-	    $invoiceconf = $this->db->get('invoice_conf');
-	    $invoice_conf = (array)$invoiceconf->first_row();
-	    $last_invoiceid = $this->common->get_invoice_date('invoiceid', '', $AccountData['reseller_id']);
-	    if ($last_invoiceid && $last_invoiceid > 0) {
-	    	$last_invoiceid = ($last_invoiceid + 1);
-  	    } else {
-	    	$last_invoiceid = $invoice_conf['invoice_start_from'];
-	    }
-	    $last_invoiceid = str_pad($last_invoiceid, (strlen($last_invoiceid) + 4), '0', STR_PAD_LEFT);
-	    $invoice_prefix = $invoice_conf['invoice_prefix'];
-	    $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
+	/**
+	 * @param string $todate
+	 */
+	function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
+		$invoiceid = 0;
+		$Bal = "0.00"; 
+		if ($AccountData["posttoexternal"] == 0) {
+		$reseller_id = $AccountData['type'] == 1 ? $AccountData['id'] : 0;
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->where($where);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoice_conf = (array)$invoiceconf->first_row();
+		$last_invoiceid = $this->common->get_invoice_date('invoiceid', '', $AccountData['reseller_id']);
+		if ($last_invoiceid && $last_invoiceid > 0) {
+			$last_invoiceid = ($last_invoiceid + 1);
+  		} else {
+			$last_invoiceid = $invoice_conf['invoice_start_from'];
+		}
+		$last_invoiceid = str_pad($last_invoiceid, (strlen($last_invoiceid) + 4), '0', STR_PAD_LEFT);
+		$invoice_prefix = $invoice_conf['invoice_prefix'];
+		$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
 
-            $invoiceid = $this->common_model->generate_receipt($AccountData["id"], $charge, $AccountData, $last_invoiceid, $invoice_prefix, $due_date);
-            $this->db->set('balance', 'balance-'.$charge, FALSE);
-            $this->db->where('id', $AccountData["id"]);
-            $this->db->update("accounts");
-            $AccountData['balance'] = ($AccountData['balance'] - $charge);
-            $Bal = $AccountData['balance'];
-        } else {
-            $Bal = ($AccountData["credit_limit"] - $AccountData["balance"]);
-        }
-        if ($Bal <= 0) {
-            $this->db->set('status', "1", FALSE);
-            $this->db->where('id', $AccountData["id"]);
-            $this->db->update("accounts");
-        }
-        $invoice_item_arr = array("accountid" => $AccountData["id"],
-            "reseller_id" => $AccountData["reseller_id"],
-            "description" => trim($description."-".$fromdate." to ".$todate),
-            "item_id" => $item_id, "debit" => $charge, "invoiceid" => $invoiceid,
-            "created_date" => trim($invoicedate),
-            "item_type" => $type
-        );
-        $this->manage_invoice($invoice_item_arr);
-    }
+			$invoiceid = $this->common_model->generate_receipt($AccountData["id"], $charge, $AccountData, $last_invoiceid, $invoice_prefix, $due_date);
+			$this->db->set('balance', 'balance-'.$charge, FALSE);
+			$this->db->where('id', $AccountData["id"]);
+			$this->db->update("accounts");
+			$AccountData['balance'] = ($AccountData['balance'] - $charge);
+			$Bal = $AccountData['balance'];
+		} else {
+			$Bal = ($AccountData["credit_limit"] - $AccountData["balance"]);
+		}
+		if ($Bal <= 0) {
+			$this->db->set('status', "1", FALSE);
+			$this->db->where('id', $AccountData["id"]);
+			$this->db->update("accounts");
+		}
+		$invoice_item_arr = array("accountid" => $AccountData["id"],
+			"reseller_id" => $AccountData["reseller_id"],
+			"description" => trim($description."-".$fromdate." to ".$todate),
+			"item_id" => $item_id, "debit" => $charge, "invoiceid" => $invoiceid,
+			"created_date" => trim($invoicedate),
+			"item_type" => $type
+		);
+		$this->manage_invoice($invoice_item_arr);
+	}
     
-    /**
-     * @param string $select
-     * @param string $table
-     */
-    function get_table_data($select, $table, $where) {
-        $query = $this->db_model->getSelect($select, $table, $where);
-        if ($query->num_rows > 0) {
-            $query_result = $query->result_array();
-            return $query_result;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * @param string $select
+	 * @param string $table
+	 */
+	function get_table_data($select, $table, $where) {
+		$query = $this->db_model->getSelect($select, $table, $where);
+		if ($query->num_rows > 0) {
+			$query_result = $query->result_array();
+			return $query_result;
+		} else {
+			return false;
+		}
+	}
 
-    function Manage_Invoice($invoice_item_arr) {
-       $this->db->insert("invoice_details", $invoice_item_arr);
-    }
+	function Manage_Invoice($invoice_item_arr) {
+	   $this->db->insert("invoice_details", $invoice_item_arr);
+	}
 
 }
 ?> 

Braces +10 added lines, -7 removed lines

@@ -133,22 +133,25 @@
                             if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
                                 //Apply charges to resellers customers.
                                 $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                if ($lastdate) {
+                                                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                }
                             } else {
                                 //Apply charges to Resellers.
                                 $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                if ($lastdate) {
+                                                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                }
                             }
                             $parent_id = $reseller_dids['parent_id'];
                         }
                     }
 //   		else{
                     $lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
-                    if ($lastdate)
-                      $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
-//            	}
+                    if ($lastdate) {
+                                          $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
+                    }
+                    //            	}
                 }
             }
         }

web_interface/astpp/application/controllers/generateInvoice.php

Indentation +234 added lines, -234 removed lines

@@ -24,264 +24,264 @@
 
 class GenerateInvoice extends MX_Controller {
 
-    public static $global_config;
+	public static $global_config;
 
-    function __construct() {
-        parent::__construct();
-        $this->load->model("db_model");
-        $this->load->library("astpp/common");
-        $this->load->library('html2pdf');
-        ini_set("memory_limit", "2048M");
-        ini_set("max_execution_time", "259200");
-        $this->get_system_config();
-    }
+	function __construct() {
+		parent::__construct();
+		$this->load->model("db_model");
+		$this->load->library("astpp/common");
+		$this->load->library('html2pdf');
+		ini_set("memory_limit", "2048M");
+		ini_set("max_execution_time", "259200");
+		$this->get_system_config();
+	}
 
-    function get_system_config() {
-        $query = $this->db->get("system");
-        $config = array();
-        $result = $query->result_array();
-        foreach ($result as $row) {
-            $config[$row['name']] = $row['value'];
-        }
-        self::$global_config['system_config'] = $config;
-    }
+	function get_system_config() {
+		$query = $this->db->get("system");
+		$config = array();
+		$result = $query->result_array();
+		foreach ($result as $row) {
+			$config[$row['name']] = $row['value'];
+		}
+		self::$global_config['system_config'] = $config;
+	}
 
-    function getInvoiceData() {
-        $where = array("posttoexternal" => 1, "deleted" => "0", "status" => "0");
-        $query = $this->db_model->getSelect("*", "accounts", $where);
-        if ($query->num_rows > 0) {
-            $account_data = $query->result_array();
-            foreach ($account_data as $data_key => $account_value) {
-                $end_date = gmdate("Y-m-d")." 23:59:59";
-                $account_value['sweep_id'] = (int)$account_value['sweep_id'];
-                switch ($account_value['sweep_id']) {
-                    case 0:
-                        $start_date = $this->validate_invoice_date($account_value);
-                        if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
-                            $start_date = gmdate("Y-m-d H:i:s");
-                        }
-                        $end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 days"));
-                        $this->Generate_Daily_invoice($account_value, $start_date, $end_date);
-                        break;
-                    case 2:
-                        if (date("d") == $account_value['invoice_day']) {
-                            $start_date = $this->validate_invoice_date($account_value);
-                            if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
-                                $start_date = gmdate("Y-m-d H:i:s");
-                            }
-                            $end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 month"));
-                            $this->Generate_Monthly_invoice($account_value, $start_date, $end_date);
-                        }
-                        break;
-                }
-            }
-            $screen_path = getcwd()."/cron";
-            $screen_filename = "Email_Broadcast_".strtotime('now');
-            $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-            exec($command);
-        }
-    }
+	function getInvoiceData() {
+		$where = array("posttoexternal" => 1, "deleted" => "0", "status" => "0");
+		$query = $this->db_model->getSelect("*", "accounts", $where);
+		if ($query->num_rows > 0) {
+			$account_data = $query->result_array();
+			foreach ($account_data as $data_key => $account_value) {
+				$end_date = gmdate("Y-m-d")." 23:59:59";
+				$account_value['sweep_id'] = (int)$account_value['sweep_id'];
+				switch ($account_value['sweep_id']) {
+					case 0:
+						$start_date = $this->validate_invoice_date($account_value);
+						if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
+							$start_date = gmdate("Y-m-d H:i:s");
+						}
+						$end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 days"));
+						$this->Generate_Daily_invoice($account_value, $start_date, $end_date);
+						break;
+					case 2:
+						if (date("d") == $account_value['invoice_day']) {
+							$start_date = $this->validate_invoice_date($account_value);
+							if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
+								$start_date = gmdate("Y-m-d H:i:s");
+							}
+							$end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 month"));
+							$this->Generate_Monthly_invoice($account_value, $start_date, $end_date);
+						}
+						break;
+				}
+			}
+			$screen_path = getcwd()."/cron";
+			$screen_filename = "Email_Broadcast_".strtotime('now');
+			$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
+			exec($command);
+		}
+	}
 
-    function validate_invoice_date($account_value) {
-        $last_invoice_date = $this->common->get_invoice_date("to_date", $account_value["id"], $account_value['reseller_id'], "to_date");
-        $last_invoice_date = ($last_invoice_date) ? $last_invoice_date : $account_value['creation'];
-        $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($last_invoice_date)));
-        return $last_invoice_date;
-    }
+	function validate_invoice_date($account_value) {
+		$last_invoice_date = $this->common->get_invoice_date("to_date", $account_value["id"], $account_value['reseller_id'], "to_date");
+		$last_invoice_date = ($last_invoice_date) ? $last_invoice_date : $account_value['creation'];
+		$last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($last_invoice_date)));
+		return $last_invoice_date;
+	}
 
-    /**
-     * @param string $start_date
-     * @param string $end_date
-     */
-    function Generate_Daily_invoice($account_value, $start_date, $end_date) {
-        //  echo "INVOICE SCRIPT-------start date :".$start_date."-------end date....".$end_date;
+	/**
+	 * @param string $start_date
+	 * @param string $end_date
+	 */
+	function Generate_Daily_invoice($account_value, $start_date, $end_date) {
+		//  echo "INVOICE SCRIPT-------start date :".$start_date."-------end date....".$end_date;
 
-        require_once('updateBalance.php');
-        $updateBalance = new updateBalance();
-        $updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
-        $updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE);
-        $this->process_invoice($account_value, $start_date, $end_date);
-    }
+		require_once('updateBalance.php');
+		$updateBalance = new updateBalance();
+		$updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
+		$updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE);
+		$this->process_invoice($account_value, $start_date, $end_date);
+	}
 
-    /**
-     * @param string $start_date
-     * @param string $end_date
-     */
-    function Generate_Monthly_invoice($account_value, $start_date, $end_date) {
-        require_once('updateBalance.php');
-        $updateBalance = new updateBalance();
-        $updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
-        $updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE); 
-        $this->process_invoice($account_value, $start_date, $end_date);
-    }
+	/**
+	 * @param string $start_date
+	 * @param string $end_date
+	 */
+	function Generate_Monthly_invoice($account_value, $start_date, $end_date) {
+		require_once('updateBalance.php');
+		$updateBalance = new updateBalance();
+		$updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
+		$updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE); 
+		$this->process_invoice($account_value, $start_date, $end_date);
+	}
 
-    function process_invoice($accountdata, $start_date, $end_date) {
-        //Get Invoice configuration using single query instead of multiple queries.
-        $invoice_conf = array();
-        $reseller_id = ($accountdata['reseller_id'] == 0) ? 1 : $accountdata['reseller_id'];
-        $where = "accountid IN ('".$reseller_id."','1')";
-        $this->db->select('*');
-        $this->db->where($where);
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoice_conf = $this->db->get('invoice_conf');
-        $invoice_conf = (array)$invoice_conf->first_row();
-        /*******************************************************/
-        $last_invoice_ID = $this->common->get_invoice_date("invoiceid", "", $accountdata['reseller_id']);
-        if ($last_invoice_ID && $last_invoice_ID > 0) {
-            $last_invoice_ID = ($last_invoice_ID + 1);
-        } else {
-            $last_invoice_ID = $invoice_conf['invoice_start_from'];
-        }
-        $last_invoice_ID = str_pad($last_invoice_ID, (strlen($last_invoice_ID) + 4), '0', STR_PAD_LEFT);
-        $invoice_sub_total = $this->count_invoice_data($accountdata, $start_date, $end_date);
-        if ($invoice_sub_total > 0) {
-            $invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
-            $this->update_cdrs_data($accountdata['id'], $invoiceid, $start_date, $end_date);
-            $sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
-            $invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
-            $this->download_invoice($invoiceid, $accountdata, $invoice_conf);
-        } else {
-            $invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
-            $sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
-            $invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
-        }
-    }
+	function process_invoice($accountdata, $start_date, $end_date) {
+		//Get Invoice configuration using single query instead of multiple queries.
+		$invoice_conf = array();
+		$reseller_id = ($accountdata['reseller_id'] == 0) ? 1 : $accountdata['reseller_id'];
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->select('*');
+		$this->db->where($where);
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoice_conf = $this->db->get('invoice_conf');
+		$invoice_conf = (array)$invoice_conf->first_row();
+		/*******************************************************/
+		$last_invoice_ID = $this->common->get_invoice_date("invoiceid", "", $accountdata['reseller_id']);
+		if ($last_invoice_ID && $last_invoice_ID > 0) {
+			$last_invoice_ID = ($last_invoice_ID + 1);
+		} else {
+			$last_invoice_ID = $invoice_conf['invoice_start_from'];
+		}
+		$last_invoice_ID = str_pad($last_invoice_ID, (strlen($last_invoice_ID) + 4), '0', STR_PAD_LEFT);
+		$invoice_sub_total = $this->count_invoice_data($accountdata, $start_date, $end_date);
+		if ($invoice_sub_total > 0) {
+			$invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
+			$this->update_cdrs_data($accountdata['id'], $invoiceid, $start_date, $end_date);
+			$sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
+			$invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
+			$this->download_invoice($invoiceid, $accountdata, $invoice_conf);
+		} else {
+			$invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
+			$sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
+			$invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
+		}
+	}
 
-    function count_invoice_data($account, $start_date = "", $end_date = "") {
-        $cdr_query = "";
-        $inv_data_query = "";
-        $cdr_query = "select calltype,sum(debit) as debit from cdrs where accountid = ".$account['id'];
-        $cdr_query .= " AND callstart >='".$start_date."' AND callstart <= '".$end_date."' AND invoiceid=0 group by calltype";
+	function count_invoice_data($account, $start_date = "", $end_date = "") {
+		$cdr_query = "";
+		$inv_data_query = "";
+		$cdr_query = "select calltype,sum(debit) as debit from cdrs where accountid = ".$account['id'];
+		$cdr_query .= " AND callstart >='".$start_date."' AND callstart <= '".$end_date."' AND invoiceid=0 group by calltype";
 //echo $cdr_query; 
-        $cdr_data = $this->db->query($cdr_query);
-        if ($cdr_data->num_rows > 0) {
-            $cdr_data = $cdr_data->result_array();
-            //echo '<pre>'; print_r($cdr_data); exit;
-            foreach ($cdr_data as $cdrvalue) {
-                $cdrvalue['debit'] = round($cdrvalue['debit'], self::$global_config['system_config']['decimalpoints']);
-                $tempArr = array("accountid" => $account['id'], "reseller_id" => $account['reseller_id'], "item_id" => "0",
-                    "description" => $cdrvalue['calltype']." CALLS for the period (".$start_date." to ".$end_date, "debit" => $cdrvalue['debit'], "item_type" => $cdrvalue['calltype'], "created_date" => $end_date);
-                $this->db->insert("invoice_details", $tempArr);
-            }
-        }
-        $inv_data_query = "select count(id) as count,sum(debit) as debit,sum(credit) as credit from invoice_details where accountid=".$account['id']." AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type != 'FREECALL'";
+		$cdr_data = $this->db->query($cdr_query);
+		if ($cdr_data->num_rows > 0) {
+			$cdr_data = $cdr_data->result_array();
+			//echo '<pre>'; print_r($cdr_data); exit;
+			foreach ($cdr_data as $cdrvalue) {
+				$cdrvalue['debit'] = round($cdrvalue['debit'], self::$global_config['system_config']['decimalpoints']);
+				$tempArr = array("accountid" => $account['id'], "reseller_id" => $account['reseller_id'], "item_id" => "0",
+					"description" => $cdrvalue['calltype']." CALLS for the period (".$start_date." to ".$end_date, "debit" => $cdrvalue['debit'], "item_type" => $cdrvalue['calltype'], "created_date" => $end_date);
+				$this->db->insert("invoice_details", $tempArr);
+			}
+		}
+		$inv_data_query = "select count(id) as count,sum(debit) as debit,sum(credit) as credit from invoice_details where accountid=".$account['id']." AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type != 'FREECALL'";
 //echo $inv_data_query;         
-        $invoice_data = $this->db->query($inv_data_query);
-        if ($invoice_data->num_rows > 0) {
-            $invoice_data = $invoice_data->result_array();
-            foreach ($invoice_data as $data_value) {
-                if ($data_value['count'] > 0) {
-                    $sub_total = ($data_value['debit'] - $data_value['credit']);
-                    $sub_total = round($sub_total, self::$global_config['system_config']['decimalpoints']);
-                    return $sub_total;
-                }
-            }
-        }
-        return "0";
-    }
+		$invoice_data = $this->db->query($inv_data_query);
+		if ($invoice_data->num_rows > 0) {
+			$invoice_data = $invoice_data->result_array();
+			foreach ($invoice_data as $data_value) {
+				if ($data_value['count'] > 0) {
+					$sub_total = ($data_value['debit'] - $data_value['credit']);
+					$sub_total = round($sub_total, self::$global_config['system_config']['decimalpoints']);
+					return $sub_total;
+				}
+			}
+		}
+		return "0";
+	}
 
-    //Change Order of arguements
-    function update_cdrs_data($accountid, $invoiceid, $start_date = "", $end_date = "") {
-        $inv_data_query = "update invoice_details SET invoiceid = '".$invoiceid."' where accountid=".$accountid;
-        $inv_data_query .= " AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type !='PAYMENT'";
-        $this->db->query($inv_data_query);
-        return true;
-    }
+	//Change Order of arguements
+	function update_cdrs_data($accountid, $invoiceid, $start_date = "", $end_date = "") {
+		$inv_data_query = "update invoice_details SET invoiceid = '".$invoiceid."' where accountid=".$accountid;
+		$inv_data_query .= " AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type !='PAYMENT'";
+		$this->db->query($inv_data_query);
+		return true;
+	}
 
-    /**
-     * @param string $last_invoice_ID
-     */
-    function create_invoice($account, $from_date, $to_date, $last_invoice_ID, $INVprefix, $invoiceconf) {
-        //$due_date = gmdate("Y-m-d H:i:s",strtotime($to_date." +".$invoiceconf['interval']." days"));
-        if ($invoiceconf['interval'] > 0) {
-            $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-        } else {
-            $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
-        }
-        // echo "due daye-------".$due_date.'----------'.$to_date.'------------> Invoice interval'.$invoiceconf['interval']; 
-        $balance = ($account['credit_limit'] - $account['balance']);
-        $automatic_flag = self::$global_config['system_config']['automatic_invoice'];
+	/**
+	 * @param string $last_invoice_ID
+	 */
+	function create_invoice($account, $from_date, $to_date, $last_invoice_ID, $INVprefix, $invoiceconf) {
+		//$due_date = gmdate("Y-m-d H:i:s",strtotime($to_date." +".$invoiceconf['interval']." days"));
+		if ($invoiceconf['interval'] > 0) {
+			$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+		} else {
+			$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
+		}
+		// echo "due daye-------".$due_date.'----------'.$to_date.'------------> Invoice interval'.$invoiceconf['interval']; 
+		$balance = ($account['credit_limit'] - $account['balance']);
+		$automatic_flag = self::$global_config['system_config']['automatic_invoice'];
 	if ($automatic_flag == 1) {
-	        $invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
-            $account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance);
+			$invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
+			$account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance);
 	} else {
-	        $invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
-            $account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance, "confirm" => 1);
+			$invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
+			$account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance, "confirm" => 1);
 	}
-        // echo "<pre>"; print_r($invoice_data); exit;
-        $this->db->insert("invoices", $invoice_data);
-        $invoiceid = $this->db->insert_id();
+		// echo "<pre>"; print_r($invoice_data); exit;
+		$this->db->insert("invoices", $invoice_data);
+		$invoiceid = $this->db->insert_id();
 	if ($automatic_flag == 0) {
-            $this->download_invoice($invoiceid, $account, $invoiceconf);
+			$this->download_invoice($invoiceid, $account, $invoiceconf);
+	}
+		return $invoiceid;
 	}
-        return $invoiceid;
-    }
 
-    function set_invoice_total($invoiceid, $accountid) {
-        $query = $this->db_model->getSelect("SUM(debit) as total", "invoice_details", array("invoiceid" => $invoiceid, "item_type <>" => "FREECALL"));
-        $query = $query->result_array();
-        $sub_total = $query["0"]["total"];
-        $updateArr = array("amount" => $sub_total);
-        $this->db->where(array("id" => $invoiceid));
-        $this->db->update("invoices", $updateArr);
+	function set_invoice_total($invoiceid, $accountid) {
+		$query = $this->db_model->getSelect("SUM(debit) as total", "invoice_details", array("invoiceid" => $invoiceid, "item_type <>" => "FREECALL"));
+		$query = $query->result_array();
+		$sub_total = $query["0"]["total"];
+		$updateArr = array("amount" => $sub_total);
+		$this->db->where(array("id" => $invoiceid));
+		$this->db->update("invoices", $updateArr);
 
-        $updateArr = array("balance" => "0.00");
-        $this->db->where(array("id" => $accountid));
-        $this->db->update("accounts", $updateArr);
+		$updateArr = array("balance" => "0.00");
+		$this->db->where(array("id" => $accountid));
+		$this->db->update("accounts", $updateArr);
 
-        return true;
-    }
+		return true;
+	}
 
-    function download_invoice($invoiceid, $accountdata, $invoice_conf) {
-        $invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoiceid));
-        $invoicedata = $invoicedata->result_array();
-        $invoicedata = $invoicedata[0];
-        $FilePath = FCPATH."invoices/".$accountdata["id"].'/'.$invoicedata['invoice_prefix']."".$invoicedata['invoiceid']."_invoice.pdf";
-        $Filenm = $invoicedata['invoice_prefix']."_".$invoicedata['invoiceid']."_invoice.pdf";
-        $this->common->get_invoice_template($invoicedata, $accountdata, false);
-        if ($invoice_conf['invoice_notification']) {
-            $this->send_email_notification($FilePath, $Filenm, $accountdata, $invoice_conf, $invoicedata);
-        }
-    }
+	function download_invoice($invoiceid, $accountdata, $invoice_conf) {
+		$invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoiceid));
+		$invoicedata = $invoicedata->result_array();
+		$invoicedata = $invoicedata[0];
+		$FilePath = FCPATH."invoices/".$accountdata["id"].'/'.$invoicedata['invoice_prefix']."".$invoicedata['invoiceid']."_invoice.pdf";
+		$Filenm = $invoicedata['invoice_prefix']."_".$invoicedata['invoiceid']."_invoice.pdf";
+		$this->common->get_invoice_template($invoicedata, $accountdata, false);
+		if ($invoice_conf['invoice_notification']) {
+			$this->send_email_notification($FilePath, $Filenm, $accountdata, $invoice_conf, $invoicedata);
+		}
+	}
 
-    /**
-     * @param string $FilePath
-     * @param string $Filenm
-     */
-    function send_email_notification($FilePath, $Filenm, $AccountData, $invoice_conf, $invData) {
-        $TemplateData = array();
-        $where = array('name' => 'email_new_invoice');
-        $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        foreach ($EmailTemplate->result_array() as $TemplateVal) {
-            $TemplateData = $TemplateVal;
-            $TemplateData['subject'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['subject']);
-            $TemplateData['subject'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#AMOUNT#', $invData['amount'], $TemplateData['template']);
+	/**
+	 * @param string $FilePath
+	 * @param string $Filenm
+	 */
+	function send_email_notification($FilePath, $Filenm, $AccountData, $invoice_conf, $invData) {
+		$TemplateData = array();
+		$where = array('name' => 'email_new_invoice');
+		$EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
+		foreach ($EmailTemplate->result_array() as $TemplateVal) {
+			$TemplateData = $TemplateVal;
+			$TemplateData['subject'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['subject']);
+			$TemplateData['subject'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['subject']);
+			$TemplateData['template'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#AMOUNT#', $invData['amount'], $TemplateData['template']);
 
-            $TemplateData['template'] = str_replace("#COMPANY_EMAIL#", $invoice_conf['emailaddress'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#COMPANY_NAME#", $invoice_conf['company_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#COMPANY_WEBSITE#", $invoice_conf['website'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#INVOICE_DATE#", $invData['invoice_date'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#DUE_DATE#", $invData['due_date'], $TemplateData['template']);
-        }
-        $dir_path = getcwd()."/attachments/";
-        $path = $dir_path.$Filenm;
-        $command = "cp ".$FilePath." ".$path;
-        exec($command);
-        $email_array = array('accountid' => $AccountData['id'],
-            'subject' => $TemplateData['subject'],
-            'body' => $TemplateData['template'],
-            'from' => $invoice_conf['emailaddress'],
-            'to' => $AccountData['email'],
-            'status' => "1",
-            'attachment' => $Filenm,
-            'template' => '');
-        //echo "<pre>"; print_r($TemplateData); exit;
-        $this->db->insert("mail_details", $email_array);
-    }
+			$TemplateData['template'] = str_replace("#COMPANY_EMAIL#", $invoice_conf['emailaddress'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#COMPANY_NAME#", $invoice_conf['company_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#COMPANY_WEBSITE#", $invoice_conf['website'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#INVOICE_DATE#", $invData['invoice_date'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#DUE_DATE#", $invData['due_date'], $TemplateData['template']);
+		}
+		$dir_path = getcwd()."/attachments/";
+		$path = $dir_path.$Filenm;
+		$command = "cp ".$FilePath." ".$path;
+		exec($command);
+		$email_array = array('accountid' => $AccountData['id'],
+			'subject' => $TemplateData['subject'],
+			'body' => $TemplateData['template'],
+			'from' => $invoice_conf['emailaddress'],
+			'to' => $AccountData['email'],
+			'status' => "1",
+			'attachment' => $Filenm,
+			'template' => '');
+		//echo "<pre>"; print_r($TemplateData); exit;
+		$this->db->insert("mail_details", $email_array);
+	}
 
 }
 

web_interface/astpp/application/controllers/broadcastemail.php

Spacing +6 added lines, -6 removed lines

@@ -25,21 +25,21 @@
 	function __construct()
 	{
 	parent::__construct();
-	if(!defined( 'CRON' ) )  
+	if ( ! defined('CRON'))  
 	  exit();
 		$this->load->model("db_model");
 		$this->load->library("astpp/email_lib");
 	}
-	function broadcast_email(){
+	function broadcast_email() {
 	
 	   $where = array("status"=>"1");
 		$query = $this->db_model->getSelect("*", "mail_details", $where);
-		if($query->num_rows >0){
+		if ($query->num_rows > 0) {
 			$account_data = $query->result_array();
-			foreach($account_data as $data_key =>$account_value){
-			 $account_value['history_id']=$account_value['id'];
+			foreach ($account_data as $data_key =>$account_value) {
+			 $account_value['history_id'] = $account_value['id'];
 			 unset($account_value['id']);
-			 $this->email_lib->send_email('',$account_value,'',$account_value['attachment'],1,0,1);
+			 $this->email_lib->send_email('', $account_value, '', $account_value['attachment'], 1, 0, 1);
 			}
 		}
 	}

Braces +3 added lines, -2 removed lines

@@ -25,8 +25,9 @@
 	function __construct()
 	{
 	parent::__construct();
-	if(!defined( 'CRON' ) )  
-	  exit();
+	if(!defined( 'CRON' ) ) {
+		  exit();
+	}
 		$this->load->model("db_model");
 		$this->load->library("astpp/email_lib");
 	}

web_interface/astpp/application/libraries/locale.php

Spacing +12 added lines, -12 removed lines

@@ -21,13 +21,13 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
 	exit('No direct script access allowed');
 
 /**
  * Dynamically build forms for display
  */
-class Locale{
+class Locale {
 
 	function __construct($library_name = '') {
 
@@ -38,23 +38,23 @@ 
 		$this->CI->load->driver('cache');
 	$this->set_lang();
 	}
-	function set_lang($lang=FALSE){
+	function set_lang($lang = FALSE) {
 
-		$current_locale=$this->CI->session->userdata('user_language');
-		if(empty($current_locale)){
-			 $current_locale= 'en_US';
+		$current_locale = $this->CI->session->userdata('user_language');
+		if (empty($current_locale)) {
+			 $current_locale = 'en_US';
 		}
 	putenv("LANG=$current_locale");
 	setlocale(LC_ALL, $current_locale.".UTF-8");
-		setlocale(LC_MESSAGES,$current_locale);
+		setlocale(LC_MESSAGES, $current_locale);
 	setlocale(LC_TIME, $current_locale);
-		setlocale(LC_CTYPE,$current_locale);
-	$domain='messages';
-	$uri_segment='';
+		setlocale(LC_CTYPE, $current_locale);
+	$domain = 'messages';
+	$uri_segment = '';
 	 $uri_segment = $this->CI->uri->segments;
-	if(isset($uri_segment[1])){	
+	if (isset($uri_segment[1])) {	
 		$filename = getcwd().'/application/modules/user/language/'.$lang.'/LC_MESSAGES/messages.mo';
-				bindtextdomain(WEBSITE_DOMAIN,getcwd().'/application/modules/'.$uri_segment[1].'/language/');
+				bindtextdomain(WEBSITE_DOMAIN, getcwd().'/application/modules/'.$uri_segment[1].'/language/');
 	}
 	bind_textdomain_codeset(WEBSITE_DOMAIN, 'UTF-8');
 	textdomain(WEBSITE_DOMAIN);

Braces +2 added lines, -1 removed lines

@@ -21,8 +21,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if (!defined('BASEPATH')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Dynamically build forms for display

web_interface/astpp/application/libraries/csvreader.php

Spacing +33 added lines, -33 removed lines

@@ -12,8 +12,8 @@ 
 */
 class CSVReader {
 
-	var $fields;        /** columns names retrieved after parsing */
-	var $separator = ',';    /** separator used to explode each line */
+	var $fields; /** columns names retrieved after parsing */
+	var $separator = ','; /** separator used to explode each line */
 
 	/**
 	 * Parse a text containing CSV formatted data.
@@ -34,23 +34,23 @@ 
 	 * @param    string
 	 * @return    array
 	 */
-	function parse_file($p_Filepath,$config_variable,$check_header_flag=false) {
+	function parse_file($p_Filepath, $config_variable, $check_header_flag = false) {
 		$lines = file($p_Filepath);
 		//Giving line numbers
-		for($i=0;$i<sizeof($lines);$i++)
+		for ($i = 0; $i < sizeof($lines); $i++)
 		{
         
-			if(trim($lines[$i]) != "")
+			if (trim($lines[$i]) != "")
 			{
 				$columnname = explode($this->separator, $lines[$i]);
-				for($i=0;$i<sizeof($columnname);$i++)
+				for ($i = 0; $i < sizeof($columnname); $i++)
 				{
-					$columnname[$i]=$columnname[$i];
+					$columnname[$i] = $columnname[$i];
 				}
 				 break;                    
 			}
 		}
-	return $this->parse_lines($lines,$config_variable,$check_header_flag);
+	return $this->parse_lines($lines, $config_variable, $check_header_flag);
 	}
 	/**
 	 * Parse an array of text lines containing CSV formatted data.
@@ -59,47 +59,47 @@ 
 	 * @param    array
 	 * @return    array
 	 */
-	function parse_lines($p_CSVLines,$config_variable,$check_header_flag=false) {
+	function parse_lines($p_CSVLines, $config_variable, $check_header_flag = false) {
 //     echo "<pre>";
-		 $t=0;    
-		 $content=array();
-		 $custom_array=array();
-		 $i=0;
-		 $flag_data=false;
-		 $data_arr[0]=$config_variable;
-		 $field_name_arr=array_keys($config_variable);
-	foreach( $p_CSVLines as $line_num => $line )
+		 $t = 0;    
+		 $content = array();
+		 $custom_array = array();
+		 $i = 0;
+		 $flag_data = false;
+		 $data_arr[0] = $config_variable;
+		 $field_name_arr = array_keys($config_variable);
+	foreach ($p_CSVLines as $line_num => $line)
 		{
-	  $line=trim($line);
-		  if(!empty($line)){
+	  $line = trim($line);
+		  if ( ! empty($line)) {
 		  // skip empty lines
 		  $elements = explode($this->separator, $line);
 	      
-		  if(array_filter($elements,'trim')) {
-		$custom_array[]=$elements;
+		  if (array_filter($elements, 'trim')) {
+		$custom_array[] = $elements;
 		  }
 		  $i++;
 	   }
 		}
         
-		if($check_header_flag == 'on'){
+		if ($check_header_flag == 'on') {
 		 unset($custom_array[0]);
 		}
-	 foreach($custom_array as $data){
-	  $j=0;
-	  foreach($data as $key=>$value){
-		$value=str_replace('"', '', $value);
-		$value=str_replace("'", '', $value);
-		if(isset($field_name_arr[$j])){
-			$field_key_value =$config_variable[$field_name_arr[$j]];
-		$value= strip_slashes(trim($value));
+	 foreach ($custom_array as $data) {
+	  $j = 0;
+	  foreach ($data as $key=>$value) {
+		$value = str_replace('"', '', $value);
+		$value = str_replace("'", '', $value);
+		if (isset($field_name_arr[$j])) {
+			$field_key_value = $config_variable[$field_name_arr[$j]];
+		$value = strip_slashes(trim($value));
 				$value = preg_replace('#<script.*</script>#is', '', $value);
-				if(isset($field_key_value) && !empty($field_key_value))
-		  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
+				if (isset($field_key_value) && ! empty($field_key_value))
+		  $content[$field_key_value] = strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
 		$j++;
 		}  
 	  }
-	  $data_arr[]=$content;
+	  $data_arr[] = $content;
 		}
 		return $data_arr;
 	}

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * CSVReader Class
 *
@@ -94,8 +96,9 @@ 
 			$field_key_value =$config_variable[$field_name_arr[$j]];
 		$value= strip_slashes(trim($value));
 				$value = preg_replace('#<script.*</script>#is', '', $value);
-				if(isset($field_key_value) && !empty($field_key_value))
-		  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
+				if(isset($field_key_value) && !empty($field_key_value)) {
+						  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));
+				}
 		$j++;
 		}  
 	  }

web_interface/astpp/application/libraries/Timezone.php

Spacing +11 added lines, -11 removed lines

@@ -24,22 +24,22 @@ 
 	exit('No direct script access allowed');
 }
 class Timezone {
-  function __construct(){
-	$this->CI =& get_instance();
+  function __construct() {
+	$this->CI = & get_instance();
 	$this->CI->load->library('session');
 	$this->CI->load->database();
   }
 
-  function uset_timezone(){
+  function uset_timezone() {
 		$account_data = $this->CI->session->userdata('accountinfo');
-		return $account_data['timezone_id'] ;
+		return $account_data['timezone_id'];
   }
-  function display_GMT($currDate,$fulldate = 1)
+  function display_GMT($currDate, $fulldate = 1)
   {	
 	  $number = $this->uset_timezone();
-	  $SERVER_GMT='0';
+	  $SERVER_GMT = '0';
 
-	  $result=$this->CI->db->query("select gmtoffset from timezone where id =".$number);
+	  $result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
 	  $timezone_offset = $result->result();
 
 	  $USER_GMT = $timezone_offset['0']->gmtoffset;
@@ -54,7 +54,7 @@ 
 	  $year = $date_time_array['year'];
 	  $timestamp = mktime($hours, $minutes, $seconds, $month, $day, $year);
 
-	  $timestamp = $timestamp+($USER_GMT-$SERVER_GMT);
+	  $timestamp = $timestamp + ($USER_GMT - $SERVER_GMT);
 	  if ($fulldate == 1) {
 		$date = date("Y-m-d H:i:s", $timestamp);
 	  } else {
@@ -64,11 +64,11 @@ 
 	  return $date;
   }
 
-  function convert_to_GMT($currDate,$fulldate = 1){
+  function convert_to_GMT($currDate, $fulldate = 1) {
 	  $number = $this->uset_timezone();
-	  $SERVER_GMT='0';
+	  $SERVER_GMT = '0';
 
-	  $result=$this->CI->db->query("select gmtoffset from timezone where id =".$number);
+	  $result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
 	  $timezone_offset = $result->result();
 
 	  $USER_GMT = $timezone_offset['0']->gmtoffset;

web_interface/astpp/application/libraries/astpp/form.php

Indentation +161 added lines, -161 removed lines

@@ -22,180 +22,180 @@
 ###############################################################################
 
 if ( ! defined('BASEPATH'))
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 
 /**
  * Dynamically build forms for display
  */
 class Form {
 
-    protected $CI; // codeigniter
-    protected $fields = array(); // array of fields
-    protected $form_title = 'Form';
-    protected $form_id = 'form';
-    protected $form_action = '';
-    protected $form_class = '';
-    protected $hidden = array();
-    protected $multipart = FALSE; // default to standard form
-    protected $submit_button = 'Submit';
-    protected $after_button = '';
-    protected $rules = array(); // storage for validation rules
-
-    function __construct() {
-        $this->CI = & get_instance();
-        $this->CI->load->library('form_validation');
-        $this->CI->load->library('astpp/common');
-        $this->CI->load->model('db_model');
-        $this->check_permissions();
-    }
+	protected $CI; // codeigniter
+	protected $fields = array(); // array of fields
+	protected $form_title = 'Form';
+	protected $form_id = 'form';
+	protected $form_action = '';
+	protected $form_class = '';
+	protected $hidden = array();
+	protected $multipart = FALSE; // default to standard form
+	protected $submit_button = 'Submit';
+	protected $after_button = '';
+	protected $rules = array(); // storage for validation rules
+
+	function __construct() {
+		$this->CI = & get_instance();
+		$this->CI->load->library('form_validation');
+		$this->CI->load->library('astpp/common');
+		$this->CI->load->model('db_model');
+		$this->check_permissions();
+	}
 
 // __construct
-    /**
-     * adds raw html to the field array
-     */
-    function check_permissions() {
-        if ($this->CI->session->userdata('user_login') == TRUE) {
-            $module_info = unserialize($this->CI->session->userdata("permited_modules"));
-            if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
-	    $module_info[] = 'dashboard';
-            }
-            $url = $this->CI->uri->uri_string;
-            $file_name = explode("/", $url);
-            if (isset($file_name['1'])) {
-	      $module = explode('_', $file_name['1']);
-            } else {
-              $module = $file_name;
-            }
-            if ($this->CI->session->userdata('userlevel_logintype') == 1) {
+	/**
+	 * adds raw html to the field array
+	 */
+	function check_permissions() {
+		if ($this->CI->session->userdata('user_login') == TRUE) {
+			$module_info = unserialize($this->CI->session->userdata("permited_modules"));
+			if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
+		$module_info[] = 'dashboard';
+			}
+			$url = $this->CI->uri->uri_string;
+			$file_name = explode("/", $url);
+			if (isset($file_name['1'])) {
+		  $module = explode('_', $file_name['1']);
+			} else {
+			  $module = $file_name;
+			}
+			if ($this->CI->session->userdata('userlevel_logintype') == 1) {
 				$module_info[] = 'user';
 			}
-            if (in_array($module[0], $module_info)) {
-                if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] != 'customer_transfer') {
-                     redirect(base_url().'user/user/');
-                } else {
-                   return true;
-                }
-            } else {
-                $this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
-                if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1') {
-                    redirect(base_url().'dashboard/');
-                } else {
-                    redirect(base_url().'user/user/');
-                }
-            }
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function build_form($fields_array, $values) {
-        $form_contents = '';
-        $form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
-        if (isset($fields_array['breadcrumb'])) {
-            $form_contents .= form_breadcrumb($fields_array['breadcrumb']);
-            unset($fields_array['breadcrumb']);
-        }
-        $form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
-        unset($fields_array['forms']);
-        $button_array = array();
-        if (isset($fields_array['button_save']) || isset($fields_array['button_cancel']) || isset($fields_array['additional_button'])) {
-            $save = $fields_array['button_save'];
-            unset($fields_array['button_save']);
-            if (isset($fields_array['button_cancel'])) {
-                $cancel = $fields_array['button_cancel'];
-                unset($fields_array['button_cancel']);
-            }
-            if (isset($fields_array['additional_button'])) {
-                $additiopnal_button = $fields_array['additional_button'];
-                unset($fields_array['additional_button']);
-            }
-        }
-        if (isset($additiopnal_button)) {
-            $form_contents .= form_button(gettext($additiopnal_button));
-        }
-        $i = 0;
-        foreach ($fields_array as $fieldset_key => $form_fileds) {
-            if (count($fields_array) > 1) {
-                if ($i == 1 || $i == 3) {
-                    $form_contents .= '<div class="col-md-6 no-padding pull-right">';
-                    $form_contents .= '<div class="col-md-12 padding-x-4">';
-                } else {
-                    $form_contents .= '<div class="col-md-6 no-padding">';
-                    $form_contents .= '<div class="col-md-12 padding-x-4">';
-                }
-            } else {
-               $form_contents .= '<div class="col-md-12 no-padding">';
-                $form_contents .= '<div class="col-md-12 no-padding">';
-            }
-            $form_contents .= '<ul class="no-padding">';
-                $form_contents .= '<div class="col-md-12 no-padding">';
-            if ($i == 1 || $i == 3) {
-                $form_contents .= form_fieldset(gettext($fieldset_key));
-            } else {
-                $form_contents .= form_fieldset(gettext($fieldset_key));
-            }
-            foreach ($form_fileds as $fieldkey => $fieldvalue) {
-                $form_contents .= '<li class="col-md-12">';
-                if ($fieldvalue[1] == 'HIDDEN') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
-                    $form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
-                } else {
-		      $validation_arr = array();
-		      if ($fieldvalue[1] == 'INPUT') {
-		        if ( ! empty($fieldvalue[3])) {
-		          $validation_arr = explode("|", $fieldvalue[3]);
-		        }
-		      }
-		      elseif ($fieldvalue[2] == 'SELECT') {
-
-		        if (is_array($fieldvalue[4])) {
-		          $validation_arr = explode("|", $fieldvalue[4]['rules']);
-		        } else {
-		        $validation_arr = explode("|", $fieldvalue[4]);
-		        }
-		      }
-		      if ( ! empty($validation_arr)) {
-		      $fieldvalue[0] = in_array('required', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
-		      $fieldvalue[0] = in_array('dropdown', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
-		      }
+			if (in_array($module[0], $module_info)) {
+				if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] != 'customer_transfer') {
+					 redirect(base_url().'user/user/');
+				} else {
+				   return true;
+				}
+			} else {
+				$this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
+				if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1') {
+					redirect(base_url().'dashboard/');
+				} else {
+					redirect(base_url().'user/user/');
+				}
+			}
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function build_form($fields_array, $values) {
+		$form_contents = '';
+		$form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
+		if (isset($fields_array['breadcrumb'])) {
+			$form_contents .= form_breadcrumb($fields_array['breadcrumb']);
+			unset($fields_array['breadcrumb']);
+		}
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		unset($fields_array['forms']);
+		$button_array = array();
+		if (isset($fields_array['button_save']) || isset($fields_array['button_cancel']) || isset($fields_array['additional_button'])) {
+			$save = $fields_array['button_save'];
+			unset($fields_array['button_save']);
+			if (isset($fields_array['button_cancel'])) {
+				$cancel = $fields_array['button_cancel'];
+				unset($fields_array['button_cancel']);
+			}
+			if (isset($fields_array['additional_button'])) {
+				$additiopnal_button = $fields_array['additional_button'];
+				unset($fields_array['additional_button']);
+			}
+		}
+		if (isset($additiopnal_button)) {
+			$form_contents .= form_button(gettext($additiopnal_button));
+		}
+		$i = 0;
+		foreach ($fields_array as $fieldset_key => $form_fileds) {
+			if (count($fields_array) > 1) {
+				if ($i == 1 || $i == 3) {
+					$form_contents .= '<div class="col-md-6 no-padding pull-right">';
+					$form_contents .= '<div class="col-md-12 padding-x-4">';
+				} else {
+					$form_contents .= '<div class="col-md-6 no-padding">';
+					$form_contents .= '<div class="col-md-12 padding-x-4">';
+				}
+			} else {
+			   $form_contents .= '<div class="col-md-12 no-padding">';
+				$form_contents .= '<div class="col-md-12 no-padding">';
+			}
+			$form_contents .= '<ul class="no-padding">';
+				$form_contents .= '<div class="col-md-12 no-padding">';
+			if ($i == 1 || $i == 3) {
+				$form_contents .= form_fieldset(gettext($fieldset_key));
+			} else {
+				$form_contents .= form_fieldset(gettext($fieldset_key));
+			}
+			foreach ($form_fileds as $fieldkey => $fieldvalue) {
+				$form_contents .= '<li class="col-md-12">';
+				if ($fieldvalue[1] == 'HIDDEN') {
+					if (isset($this->CI->input->post))
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					else
+						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+					$form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
+				} else {
+			  $validation_arr = array();
+			  if ($fieldvalue[1] == 'INPUT') {
+				if ( ! empty($fieldvalue[3])) {
+				  $validation_arr = explode("|", $fieldvalue[3]);
+				}
+			  }
+			  elseif ($fieldvalue[2] == 'SELECT') {
+
+				if (is_array($fieldvalue[4])) {
+				  $validation_arr = explode("|", $fieldvalue[4]['rules']);
+				} else {
+				$validation_arr = explode("|", $fieldvalue[4]);
+				}
+			  }
+			  if ( ! empty($validation_arr)) {
+			  $fieldvalue[0] = in_array('required', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+			  $fieldvalue[0] = in_array('dropdown', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+			  }
  
-                    if (is_array($fieldvalue[1]) || (is_array($fieldvalue[2]) && isset($fieldvalue[2]['hidden']))) {
-                        $form_contents .= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
-                    } else {
-                        $form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
-                    }
-                }
-                if ($fieldvalue[2] == 'SELECT' && ! isset($fieldvalue[13])) {
-
-                /*
+					if (is_array($fieldvalue[1]) || (is_array($fieldvalue[2]) && isset($fieldvalue[2]['hidden']))) {
+						$form_contents .= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
+					} else {
+						$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
+					}
+				}
+				if ($fieldvalue[2] == 'SELECT' && ! isset($fieldvalue[13])) {
+
+				/*
                  To make Drop down enabled disabled
                 */
-                 $extra = isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] : '';
-                 /***************************/
-                    if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-                        $str = $fieldvalue[7].",".$fieldvalue[8];
-
-                        if (isset($this->CI->input->post)) {
-                            $fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-                        } else {
-                            if (is_array($fieldvalue[1])) {
-                                $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
-                            } else {
-                                $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
-                            }
-                        }
-                        $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
-
-                        if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
-                            $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
-                        } else {
-                            $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
-                        }
-			            if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
-                        	if(is_array($fieldvalue[4])){
+				 $extra = isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] : '';
+				 /***************************/
+					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
+						$str = $fieldvalue[7].",".$fieldvalue[8];
+
+						if (isset($this->CI->input->post)) {
+							$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+						} else {
+							if (is_array($fieldvalue[1])) {
+								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
+							} else {
+								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+							}
+						}
+						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
+
+						if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
+							$form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
+						} else {
+							$form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+						}
+						if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+							if(is_array($fieldvalue[4])){
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];

Spacing +191 added lines, -191 removed lines

@@ -189,38 +189,38 @@ 
                         }
                         $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 
-                        if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
-                            $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
+                        if ($fieldset_key == gettext('System Configuration Information') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks') || $fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Account')) {
+                            $form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         } else {
-                            $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+                            $form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         }
-			            if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
-                        	if(is_array($fieldvalue[4])){
+			            if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
+                        	if (is_array($fieldvalue[4])) {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
 								$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-							}else{
+							} else {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
 							   $this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]);
 							}   
 						}
-						$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents.= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1])).'_error">
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1])).'_error">
                         </span></div>';                         
 					} else {
 						if (isset($this->CI->input->post)) {
-							$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+							$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
 						} else {
 							if (is_array($fieldvalue[1])) {
 								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
@@ -229,53 +229,53 @@ 
 							}
 						}
 
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
+						$str = $fieldvalue[7].",".$fieldvalue[8];
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
-						if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+						$form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+						if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			  $this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
 						}
-						$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents.= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error">
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error">
                         </span></div>';                        
 					}
 				} else if (isset($fieldvalue[13]) && $fieldvalue[13] != '') {
 
 					/* For multi select code */
-					$str = $fieldvalue[7] . "," . $fieldvalue[8];
+					$str = $fieldvalue[7].",".$fieldvalue[8];
 
 					if (isset($this->CI->input->post))
-						$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+						$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
 					else
 						$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
 
 					$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 					if ($fieldset_key === 'System Configuration Information') {
-						$form_contents.=form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
+						$form_contents .= form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
 					} else {
-						$form_contents.=form_dropdown_multiselect($fieldvalue[1] . "[]", $drp_array, $fieldvalue['value']);
+						$form_contents .= form_dropdown_multiselect($fieldvalue[1]."[]", $drp_array, $fieldvalue['value']);
 					}
-					if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+					if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			$this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
 					}
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
 					/* End---------------------   For multi select code */
 				} else if ($fieldvalue[1] == 'INPUT') {
 
 
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else{
-						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					else {
+						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
 					}    
-					$form_contents.= form_input($fieldvalue[2], 'readonly');
-					if(isset($fieldvalue[6]) && !empty($fieldvalue[6])){
-						$form_contents.=$fieldvalue[6];
+					$form_contents .= form_input($fieldvalue[2], 'readonly');
+					if (isset($fieldvalue[6]) && ! empty($fieldvalue[6])) {
+						$form_contents .= $fieldvalue[6];
 					}    
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				/* 
@@ -283,98 +283,98 @@ 
                  */
 				else if ($fieldvalue[1] == 'IMAGE') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
 					else
 						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-					$form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-						 $form_contents.=@$fieldvalue[6];
+					$form_contents .= form_image($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+						 $form_contents .= @$fieldvalue[6];
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				else if ($fieldvalue[1] == 'DEL_BUTTON') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
 					else
 						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-					$form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-						 $form_contents.=@$fieldvalue[6];
+					$form_contents .= form_img_delete($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+						 $form_contents .= @$fieldvalue[6];
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				/**********************************************************************************/
 				else if ($fieldvalue[1] == 'PASSWORD') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
 					else
-						$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-					$form_contents.= form_password($fieldvalue[2]);
+						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					$form_contents .= form_password($fieldvalue[2]);
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
 					$OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
+					if (isset($fieldvalue[7]) && $fieldvalue[7] != '')
 					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
-					if (isset($this->CI->input->post)){
-						$fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
+					if (isset($this->CI->input->post)) {
+						$fieldvalue[3]['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
 					}    
 					else
 					{
-						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
+						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1 : 0) : @$fieldvalue[3]['value'];
 					}
 					if ($fieldvalue[3]['value'] == "1") {
 						$checked = true;
 					} else {
 						$checked = false;
 					};
-					if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
+					if (isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != "") {
 							
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
+					} else {
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
 					}
 				} else if ($fieldvalue[1] == 'TEXTAREA') {
 
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
 					else
 						$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-					$form_contents.= form_textarea($fieldvalue[2]);
+					$form_contents .= form_textarea($fieldvalue[2]);
 				}
 				else if ($fieldvalue[2] == 'RADIO') {
 
-					$form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</li>';
+				$form_contents .= '</li>';
 			}
 
-			$form_contents.= '</ul>';
-			$form_contents.= '</div>';
-			$form_contents.= '</div>';
+			$form_contents .= '</ul>';
+			$form_contents .= '</div>';
+			$form_contents .= '</div>';
 			$i++;
 		}
 
-		$form_contents.= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
 
-		$form_contents.= form_button($save);
+		$form_contents .= form_button($save);
 
 	if (isset($cancel)) {
-			$form_contents.= form_button($cancel);
+			$form_contents .= form_button($cancel);
 		}
-		$form_contents.= '</center></div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
+		$form_contents .= '</center></div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
 
 
 		return $form_contents;
@@ -382,8 +382,8 @@ 
 
 	function build_serach_form($fields_array) {
 		$form_contents = '';
-		$form_contents.= '<div>';
-		$form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		$form_contents .= '<div>';
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
 		unset($fields_array['forms']);
 		$button_array = array();
 	/*******
@@ -396,13 +396,13 @@ 
 				$cancel = $fields_array['button_reset'];
 				unset($fields_array['button_reset']);
 			}
-		$button_search_delete='';
+		$button_search_delete = '';
 			if (isset($fields_array['button_search_delete'])) {
 				$button_search_delete = $fields_array['button_search_delete'];
 				unset($fields_array['button_search_delete']);
 			}
-			if(isset($fields_array['display_in'])){
-		  $display_in=$fields_array['display_in'];
+			if (isset($fields_array['display_in'])) {
+		  $display_in = $fields_array['display_in'];
 		  unset($fields_array['display_in']);
 		}
 		}
@@ -410,31 +410,31 @@ 
 		$i = 1;
 		foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-			$form_contents.= '<ul class="padding-15">';
-			$form_contents.= form_fieldset(gettext($fieldset_key),array('style' => 'font-weight:bold;'),"search");
+			$form_contents .= '<ul class="padding-15">';
+			$form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'font-weight:bold;'), "search");
 
 			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
-					$form_contents.= '<li class="col-md-12">';
+					$form_contents .= '<li class="col-md-12">';
 				}
-				$form_contents.= '<div class="col-md-3 no-padding">';
+				$form_contents .= '<div class="col-md-3 no-padding">';
 				if ($fieldvalue[1] == 'HIDDEN') {
-					$form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+					$form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
 				} else {
-					$form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+					$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
 				}
 				if ($fieldvalue[1] == 'INPUT') {
-					$form_contents.= form_input($fieldvalue[2]);
+					$form_contents .= form_input($fieldvalue[2]);
 				}
 
 
 				if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
 			  
 					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
+						$str = $fieldvalue[7].",".$fieldvalue[8];
 
 						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
-						$form_contents.=form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
+						$form_contents .= form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
 					} else {
 
 						if ($fieldvalue[1] == 'INPUT') {
@@ -442,54 +442,54 @@ 
 						}
 			
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
+						$form_contents .= form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
 					}
 				} else if ($fieldvalue[1] == 'PASSWORD') {
-					$form_contents.= form_password($fieldvalue[2]);
+					$form_contents .= form_password($fieldvalue[2]);
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
-					$form_contents.= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</div>';
+				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
-					$form_contents.= '</li>';
+					$form_contents .= '</li>';
 					$i = 0;
 				}
 				$i++;
 			}
 		}
-		$form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
-		$form_contents.= form_button($cancel);
-		$form_contents.= form_button($save);
-		if(!empty($display_in)){
-			$form_contents.="<div class='col-md-5 pull-right'>";
-			$form_contents.="<div class='col-md-3'></div>";
-			$extra_parameters['class']=$display_in['label_class'];
-			$extra_parameters['style']=$display_in['label_style'];
-			$form_contents.=form_label($display_in['content'], "",$extra_parameters);
-			$drp_array = call_user_func_array(array($this->CI->common,$display_in['function']),array());
-			$extra_parameters['class']=$display_in['dropdown_class'];
-			$extra_parameters['style']=$display_in['dropdown_style'];
-			$form_contents.=form_dropdown_all_search($display_in, $drp_array, '',$extra_parameters);
-			$form_contents.="</div>";
+		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
+		if ( ! empty($display_in)) {
+			$form_contents .= "<div class='col-md-5 pull-right'>";
+			$form_contents .= "<div class='col-md-3'></div>";
+			$extra_parameters['class'] = $display_in['label_class'];
+			$extra_parameters['style'] = $display_in['label_style'];
+			$form_contents .= form_label($display_in['content'], "", $extra_parameters);
+			$drp_array = call_user_func_array(array($this->CI->common, $display_in['function']), array());
+			$extra_parameters['class'] = $display_in['dropdown_class'];
+			$extra_parameters['style'] = $display_in['dropdown_style'];
+			$form_contents .= form_dropdown_all_search($display_in, $drp_array, '', $extra_parameters);
+			$form_contents .= "</div>";
 		}
-		if(isset($button_search_delete) && $button_search_delete != ''){
-	  $form_contents.= form_button($button_search_delete);
+		if (isset($button_search_delete) && $button_search_delete != '') {
+	  $form_contents .= form_button($button_search_delete);
 		}
-		$form_contents.='<div class="col-md-12 no-padding margin-t-15" style="">
+		$form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="">
 		<div class="pull-right btn-close" id="global_clearsearch_filter">Close</div> 
 	</div>';
-		$form_contents.= '</ul>';        
-		$form_contents.= '</div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
+		$form_contents .= '</ul>';        
+		$form_contents .= '</div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
 
 		return $form_contents;
 	}
 	function build_batchupdate_form($fields_array) {
 		$form_contents = '';
-		$form_contents.= '<div >';
-		$form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		$form_contents .= '<div >';
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
 		unset($fields_array['forms']);
 		$button_array = array();
 		if (isset($fields_array['button_search']) || isset($fields_array['button_reset'])) {
@@ -503,69 +503,69 @@ 
 		$i = 1;
 		foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-			$form_contents.= '<ul>';
-			$form_contents.= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
+			$form_contents .= '<ul>';
+			$form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
 			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
-					$form_contents.= '<li>';
+					$form_contents .= '<li>';
 				}
-				$form_contents.= '<div class="col-md-4 no-padding">';
+				$form_contents .= '<div class="col-md-4 no-padding">';
 				if ($fieldvalue[1] == 'HIDDEN') {
-					$form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+					$form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
 				} else {
-					$form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+					$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
 				}
 				if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
 					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
-						if(is_array($fieldvalue[13])){
+						$str = $fieldvalue[7].",".$fieldvalue[8];
+						if (is_array($fieldvalue[13])) {
 							$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[14]), array($fieldvalue[13]));
-							$form_contents.=form_dropdown($fieldvalue[13], $drp_array, '');
+							$form_contents .= form_dropdown($fieldvalue[13], $drp_array, '');
 						}
 						/**
   		        ASTPP  3.0 
    		        Reseller Batch Update
 						 **/ 
-						if($fieldvalue[10] == 'set_status'){
-			$drp_array =array('0'=>'Active','1'=>'Inactive');
+						if ($fieldvalue[10] == 'set_status') {
+			$drp_array = array('0'=>'Active', '1'=>'Inactive');
 			}
 			/************************************************************/
-			else{
-						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));}
-						$form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, '');
+			else {
+						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12])); }
+						$form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, '');
 					} else {
 						if ($fieldvalue[1] == 'INPUT') {
 							$drp_name = $fieldvalue[6];
 						}
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown($drp_name, $drp_array, '');
+						$form_contents .= form_dropdown($drp_name, $drp_array, '');
 					}
 				}
 				if ($fieldvalue[1] == 'INPUT') {
-					$form_contents.= form_input($fieldvalue[2]);
+					$form_contents .= form_input($fieldvalue[2]);
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
-					$form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</div>';
+				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
-					$form_contents.= '</li>';
+					$form_contents .= '</li>';
 					$i = 0;
 				}
 				$i++;
 			}
 		}
 
-		$form_contents.= '</ul>';
-		$form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= '</ul>';
+		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
 
-		$form_contents.= form_button($cancel);
-		$form_contents.= form_button($save);
-		$form_contents.='<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
+		$form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
 						<div class="pull-right btn-close" id="global_clearbatchupdate_filter">Close</div></div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
-		$form_contents.= '</div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
+		$form_contents .= '</div>';
 
 		return $form_contents;
 	}
@@ -597,21 +597,21 @@ 
                 ASTPP  3.0 
                 For Edit on Account number or name
             */
-		$row_id = isset($row['id']) ? $row["id"]: '';
+		$row_id = isset($row['id']) ? $row["id"] : '';
 /*****************************/
 				foreach ($grid_fields as $field_key => $field_arr) {
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-			 $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields,0));
+			 $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields, 0));
 /*********************************/
 					if ($field_arr[2] != "") {
 						if ($field_arr[3] != "") {
-						   if($field_arr[2]=="status"){
+						   if ($field_arr[2] == "status") {
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else {
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -620,53 +620,53 @@ 
 For Edit on Account number or name
 **/
 				$row[$field_arr[2]] = $jsn_tmp[$field_key];
-			} if(array_search("EDITABLE", $field_arr)){
+			} if (array_search("EDITABLE", $field_arr)) {
 				$ActionArr = $grid_fields[$Actionkey];
-				if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
 				}
-				if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 				}
 				$acctype = "";
-				if(isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')){
-					$acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '')? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("","",$row["posttoexternal"])."</span>":"";
+				if (isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')) {
+					$acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '') ? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("", "", $row["posttoexternal"])."</span>" : "";
 				}
 
-				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
-				if($acctype != ''){
+				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
+				if ($acctype != '') {
 					$jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-				}else{
+				} else {
 					$jsn_tmp[$field_key] = $fieldstr;
 				}
 			    
 
 /*********************************/
-			  }else {
+			  } else {
 							$jsn_tmp[$field_key] = $row[$field_arr[2]];
 				  }                  				
 			} else {
 				if ($field_arr[0] == gettext("Action")) {
-				if(isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)){
+				if (isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)) {
 		             
-					  if($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' ||$field_arr[5]->DELETE->url == 'accounts/customer_delete/'){
-					   if( $row['type'] == '0'|| strtolower($row['type']) == 'customer'){
-						$field_arr[5]->EDIT->url ='accounts/customer_edit/';
-						$field_arr[5]->DELETE->url ='accounts/customer_delete/';
+					  if ($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' || $field_arr[5]->DELETE->url == 'accounts/customer_delete/') {
+					   if ($row['type'] == '0' || strtolower($row['type']) == 'customer') {
+						$field_arr[5]->EDIT->url = 'accounts/customer_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/customer_delete/';
 					   }
-					   if($row['type'] == 3 || strtolower($row['type']) == 'provider'){
-						$field_arr[5]->EDIT->url ='accounts/provider_edit/';
-						$field_arr[5]->DELETE->url ='accounts/provider_delete/';
+					   if ($row['type'] == 3 || strtolower($row['type']) == 'provider') {
+						$field_arr[5]->EDIT->url = 'accounts/provider_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/provider_delete/';
 					   }
 					  }
-					  if($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' ||$field_arr[5]->DELETE->url == 'accounts/subadmin_delete/'){
-					   if($row['type'] == 2 || strtolower($row['type']) == 'administrator'){
-						$field_arr[5]->EDIT->url ='accounts/admin_edit/';
-						$field_arr[5]->DELETE->url ='accounts/admin_delete/';
+					  if ($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' || $field_arr[5]->DELETE->url == 'accounts/subadmin_delete/') {
+					   if ($row['type'] == 2 || strtolower($row['type']) == 'administrator') {
+						$field_arr[5]->EDIT->url = 'accounts/admin_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/admin_delete/';
 					   }
-					   if($row['type'] == 4 || strtolower($row['type']) == 'sub admin'){
-						$field_arr[5]->EDIT->url ='accounts/subadmin_edit/';
-						$field_arr[5]->DELETE->url ='accounts/subadmin_delete/';
+					   if ($row['type'] == 4 || strtolower($row['type']) == 'sub admin') {
+						$field_arr[5]->EDIT->url = 'accounts/subadmin_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/subadmin_delete/';
 					   }
 					}
 			   }
@@ -677,16 +677,16 @@ 
 							$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
 							/****************************************************************************/
 						}
-						elseif($field_arr[0] == gettext("Profile Action"))
+						elseif ($field_arr[0] == gettext("Profile Action"))
 						{
-						   if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
+						   if (isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)) {
 							}
 						   $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
 						}
 						else {
-							$className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
-							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
+							$className = (isset($field_arr['9']) && $field_arr['9'] != '') ? $field_arr['9'] : "chkRefNos";
+							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace '.$className.'" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>'; }
 					}
 				}
 				$json_data[] = array('cell' => $jsn_tmp);
@@ -700,20 +700,20 @@ 
 		$json_data = array();
 		foreach ($query as $row) {
 			foreach ($grid_fields as $field_key => $field_arr) {
-				$row_id = isset($row['id']) ? $row["id"]: '';
+				$row_id = isset($row['id']) ? $row["id"] : '';
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-		$Actionkey = array_search('Action',$this->CI->common->array_column($grid_fields,0)); 
+		$Actionkey = array_search('Action', $this->CI->common->array_column($grid_fields, 0)); 
 /*******************************/
 
 				if ($field_arr[2] != "") {
 					if ($field_arr[3] != "") {
-						 if($field_arr[2]=="status"){
+						 if ($field_arr[2] == "status") {
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else {
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -721,17 +721,17 @@ 
 For Edit on Account number or name
 **/
  			$row[$field_arr[2]] = $jsn_tmp[$field_key];
-					  } if(array_search("EDITABLE", $field_arr)){
+					  } if (array_search("EDITABLE", $field_arr)) {
 				$ActionArr = $grid_fields[$Actionkey];
-				if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
 				}
-				if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 				}
-				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
+				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
 /*******************************/
-			}else {
+			} else {
 						$jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
 					}
 				} else {
@@ -739,7 +739,7 @@ 
 						$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
 					}
 			  else {
-							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
+							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace chkRefNos" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>';
 						}
 				}
 			}

Braces +57 added lines, -57 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if ( ! defined('BASEPATH'))
+if ( ! defined('BASEPATH')) {
     exit('No direct script access allowed');
+}
 
 /**
  * Dynamically build forms for display
@@ -137,10 +138,11 @@ 
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
                 $form_contents .= '<li class="col-md-12">';
                 if ($fieldvalue[1] == 'HIDDEN') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+                    }
                     $form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
                 } else {
 		      $validation_arr = array();
@@ -148,8 +150,7 @@ 
 		        if ( ! empty($fieldvalue[3])) {
 		          $validation_arr = explode("|", $fieldvalue[3]);
 		        }
-		      }
-		      elseif ($fieldvalue[2] == 'SELECT') {
+		      } elseif ($fieldvalue[2] == 'SELECT') {
 
 		        if (is_array($fieldvalue[4])) {
 		          $validation_arr = explode("|", $fieldvalue[4]['rules']);
@@ -199,16 +200,16 @@ 
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
 								$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-							}else{
+							} else{
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
@@ -244,10 +245,11 @@ 
 					/* For multi select code */
 					$str = $fieldvalue[7] . "," . $fieldvalue[8];
 
-					if (isset($this->CI->input->post))
-						$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-					else
-						$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+					} else {
+											$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+					}
 
 					$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 					if ($fieldset_key === 'System Configuration Information') {
@@ -264,9 +266,9 @@ 
 				} else if ($fieldvalue[1] == 'INPUT') {
 
 
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else{
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else{
 						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
 					}    
 					$form_contents.= form_input($fieldvalue[2], 'readonly');
@@ -282,11 +284,11 @@ 
                  * Image upload from invoice configuration code.
                  */
 				else if ($fieldvalue[1] == 'IMAGE') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-					else
-						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
 					$form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
 						 $form_contents.=@$fieldvalue[6];
@@ -294,13 +296,12 @@ 
 					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
 					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
-				}
-				else if ($fieldvalue[1] == 'DEL_BUTTON') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-					else
-						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+				} else if ($fieldvalue[1] == 'DEL_BUTTON') {
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
 					$form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
 						 $form_contents.=@$fieldvalue[6];
@@ -311,10 +312,11 @@ 
 				}
 				/**********************************************************************************/
 				else if ($fieldvalue[1] == 'PASSWORD') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else
-						$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 					$form_contents.= form_password($fieldvalue[2]);
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
 					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
@@ -323,12 +325,12 @@ 
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
 					$OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
-					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					if(isset($fieldvalue[7]) && $fieldvalue[7] != '') {
+										$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					}
 					if (isset($this->CI->input->post)){
 						$fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
-					}    
-					else
+					} else
 					{
 						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
 					}
@@ -340,18 +342,18 @@ 
 					if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
 							
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
+					} else{
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
 					}
 				} else if ($fieldvalue[1] == 'TEXTAREA') {
 
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else
-						$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 					$form_contents.= form_textarea($fieldvalue[2]);
-				}
-				else if ($fieldvalue[2] == 'RADIO') {
+				} else if ($fieldvalue[2] == 'RADIO') {
 
 					$form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
@@ -581,8 +583,9 @@ 
 		$json_data["json_paging"]['total'] = $config['total_rows'];
 		$perpage = $config['per_page'];
 		$start = ($page_no - 1) * $perpage;
-		if ($start < 0)
-			$start = 0;
+		if ($start < 0) {
+					$start = 0;
+		}
 		$json_data["paging"]['start'] = $start;
 		$json_data["paging"]['page_no'] = $perpage;
 		return $json_data;
@@ -611,7 +614,7 @@ 
 						   if($field_arr[2]=="status"){
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else{
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -636,13 +639,13 @@ 
 				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
 				if($acctype != ''){
 					$jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-				}else{
+				} else{
 					$jsn_tmp[$field_key] = $fieldstr;
 				}
 			    
 
 /*********************************/
-			  }else {
+			  } else {
 							$jsn_tmp[$field_key] = $row[$field_arr[2]];
 				  }                  				
 			} else {
@@ -676,15 +679,13 @@ 
 */			   
 							$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
 							/****************************************************************************/
-						}
-						elseif($field_arr[0] == gettext("Profile Action"))
+						} elseif($field_arr[0] == gettext("Profile Action"))
 						{
 						   if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
 							}
 						   $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
-						}
-						else {
+						} else {
 							$className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
 							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
 					}
@@ -713,7 +714,7 @@ 
 						 if($field_arr[2]=="status"){
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else{
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -731,14 +732,13 @@ 
 				}
 				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
 /*******************************/
-			}else {
+			} else {
 						$jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
 					}
 				} else {
 					if ($field_arr[0] == "Action") {
 						$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
-					}
-			  else {
+					} else {
 							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
 						}
 				}