iNextrix / ASTPP

web_interface/astpp/application/modules/reports/libraries/reports_form.php

Spacing +177 added lines, -177 removed lines

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

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

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

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Reports_form {

@@ -29,7 +29,7 @@ 
 	}

 	function get_customer_cdr_form() {

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

-		 if($logintype != 1){

+		 if ($logintype != 1) {

 		if ($this->CI->session->userdata('logintype') == 1 || $this->CI->session->userdata('logintype') == 5) {

 			$accountinfo = $this->CI->session->userdata['accountinfo'];

 			$reseller_id = $accountinfo["id"];

@@ -48,7 +48,7 @@ 
 		array('Debit ', 'INPUT', array('name' => 'debit[debit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'debit[debit-integer]', '', '', '', 'search_int_type', ''),

 			array('Cost ', 'INPUT', array('name' => 'cost[cost]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'cost[cost-integer]', '', '', '', 'search_int_type', ''),

 		array('Disposition', 'disposition', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_despostion'),

-			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"GLOBAL")),

+			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"GLOBAL")),

  

 	  array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`status`=2, concat(name,"","^"),name) as name', 'trunks', 'build_dropdown_deleted', '', array("status" => "1")),

 

@@ -71,7 +71,7 @@ 
 		array('Debit ', 'INPUT', array('name' => 'debit[debit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'debit[debit-integer]', '', '', '', 'search_int_type', ''),

 			array('Cost ', 'INPUT', array('name' => 'cost[cost]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'cost[cost-integer]', '', '', '', 'search_int_type', ''),

 		array('Disposition', 'disposition', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_despostion'),

-			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"GLOBAL")),

+			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"GLOBAL")),

  

 	  //array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`status`=2, concat(name,"","^"),name) as name', 'trunks', 'build_dropdown_deleted', '', array("status" => "1")),

 

@@ -109,17 +109,17 @@ 
 			array('Cost ', 'INPUT', array('name' => 'cost[cost]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'cost[cost-integer]', '', '', '', 'search_int_type', ''),

             

 			array('Disposition', 'disposition', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_despostion'),

-		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"1")),

+		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"1")),

 		 array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`status`=2, concat(name,"","^"),name) as name', 'pricelists', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0")),

 			array('Call Type', 'calltype', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_calltype'),

         

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

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

 		if ($this->CI->session->userdata('logintype') != 1 && $this->CI->session->userdata('logintype') != 5) {

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

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

 	}

 	

-	$form['display_in']=array('name' => 'search_in',"id"=>"search_in","function"=>"search_report_in", "content"=>"Display records in &nbsp;&nbsp;",'label_class' => "search_label col-md-3 no-padding","dropdown_class"=>"form-control","label_style"=>"font-size:13px;text-align:right;","dropdown_style"=>"background: #ddd; width: 23% !important;");

+	$form['display_in'] = array('name' => 'search_in', "id"=>"search_in", "function"=>"search_report_in", "content"=>"Display records in &nbsp;&nbsp;", 'label_class' => "search_label col-md-3 no-padding", "dropdown_class"=>"form-control", "label_style"=>"font-size:13px;text-align:right;", "dropdown_style"=>"background: #ddd; width: 23% !important;");

 	

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

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

@@ -141,14 +141,14 @@ 
 		array('Cost ', 'INPUT', array('name' => 'provider_call_cost[provider_call_cost]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'provider_call_cost[provider_call_cost-integer]', '', '', '', 'search_int_type', ''),

 //	  array('Cost ', 'INPUT', array('name' => 'cost[cost]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'cost[cost-integer]', '', '', '', 'search_int_type', ''),

 		  array('Disposition', 'disposition', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_despostion'),

- array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"3")),

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

+ array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"3")),

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

 

 //	  array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', '', ''),

             

             

 		);

-	$form['display_in']=array('name' => 'search_in',"id"=>"search_in","function"=>"search_report_in", "content"=>"Display records in",'label_class' => "search_label col-md-3 no-padding","dropdown_class"=>"form-control","label_style"=>"font-size:13px;","dropdown_style"=>"background: #ddd; width: 21% !important;");

+	$form['display_in'] = array('name' => 'search_in', "id"=>"search_in", "function"=>"search_report_in", "content"=>"Display records in", 'label_class' => "search_label col-md-3 no-padding", "dropdown_class"=>"form-control", "label_style"=>"font-size:13px;", "dropdown_style"=>"background: #ddd; width: 21% !important;");

 	

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

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

@@ -163,52 +163,52 @@ 
 ******/

 	function build_report_list_for_customer() {

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

-		 if($logintype != 1){

+		 if ($logintype != 1) {

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

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

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

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

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

              

-			 $recording=array();

+			 $recording = array();

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

-		 if($account_data['type'] == 1){

-				$recording=array("Recording", "127", "recording", "", "", ""); 

+		 if ($account_data['type'] == 1) {

+				$recording = array("Recording", "127", "recording", "", "", ""); 

 			 }

 		$grid_field_arr = json_encode(array(

-		array(gettext("Date"), "100", "callstart","callstart", "callstart", "convert_GMT_to","","true","center"),

-		array("Caller ID", "120", "callerid", "", "", "","","true","center"),

-		array("Called Number", "103", "callednum", "", "", "","","true","center"),

-		array("Code", "71", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

-		array("Destination", "90", "notes", "", "", "","","true","center"),

-		array("Duration", "80", "billseconds", "customer_cdr_list_search", "billseconds", "convert_to_show_in","","true","center"),

-		array("Debit($currency)", "75", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-		array("Cost($currency)", "75", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-		array("Disposition", "150", "disposition", "", "", "","","true","center"),

-		array("Account", "110", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

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

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

+		array(gettext("Date"), "100", "callstart", "callstart", "callstart", "convert_GMT_to", "", "true", "center"),

+		array("Caller ID", "120", "callerid", "", "", "", "", "true", "center"),

+		array("Called Number", "103", "callednum", "", "", "", "", "true", "center"),

+		array("Code", "71", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+		array("Destination", "90", "notes", "", "", "", "", "true", "center"),

+		array("Duration", "80", "billseconds", "customer_cdr_list_search", "billseconds", "convert_to_show_in", "", "true", "center"),

+		array("Debit($currency)", "75", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+		array("Cost($currency)", "75", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+		array("Disposition", "150", "disposition", "", "", "", "", "true", "center"),

+		array("Account", "110", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

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

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

 		array("Call Type", "112", "calltype", "", "", ""),

 				$recording,

 				));

                 

 				}

-				else{

+				else {

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

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

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

-		$recording=array("Recording", "127", "recording", "", "", "");			

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

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

+		$recording = array("Recording", "127", "recording", "", "", "");			

 		$grid_field_arr = json_encode(array(

-		array("Date", "100", "callstart","callstart", "callstart", "convert_GMT_to","","true","center"),

-		array("Caller ID", "100", "callerid", "", "", "","","true","center"),

-		array("Called Number", "103", "callednum", "", "", "","","true","center"),

-		array("Code", "71", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

-		array("Destination", "90", "notes", "", "", "","","true","center"),

-		array("Duration", "80", "billseconds", "customer_cdr_list_search", "billseconds", "convert_to_show_in","","true","center"),

-		array("Debit($currency)", "75", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-		array("Cost($currency)", "75", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-		array("Disposition", "130", "disposition", "", "", "","","true","center"),

-		array("Account", "110", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

+		array("Date", "100", "callstart", "callstart", "callstart", "convert_GMT_to", "", "true", "center"),

+		array("Caller ID", "100", "callerid", "", "", "", "", "true", "center"),

+		array("Called Number", "103", "callednum", "", "", "", "", "true", "center"),

+		array("Code", "71", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+		array("Destination", "90", "notes", "", "", "", "", "true", "center"),

+		array("Duration", "80", "billseconds", "customer_cdr_list_search", "billseconds", "convert_to_show_in", "", "true", "center"),

+		array("Debit($currency)", "75", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+		array("Cost($currency)", "75", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+		array("Disposition", "130", "disposition", "", "", "", "", "true", "center"),

+		array("Account", "110", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

 		//array("Trunk", "90", "trunk_id", "name", "trunks", "get_field_name","","true","center"),

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

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

 		array("Call Type", "112", "calltype", "", "", ""),

 				$recording,

 				));

@@ -222,23 +222,23 @@ 
 	function build_report_list_for_reseller() {

 		

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

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

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

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

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

 		

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

 		$grid_field_arr = json_encode(array(

-			array("Date", "100", "callstart", "callstart", "callstart", "convert_GMT_to","","true","center"),

-			array("Caller ID", "100", "callerid", "", "", "","","true","center"),

-			array("Called Number", "120", "callednum", "", "", "","","true","center"),

-			array("Code", "80", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

-			array("Destination", "120", "notes", "", "", "","","true","center"),

-			array("Duration", "107", "billseconds", "reseller_cdr_list_search", "billseconds", "convert_to_show_in","","true","center"),

-			array("Debit($currency)", "105", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-			array("Cost($currency)", "104", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-			array("Disposition", "100", "disposition", "", "", "","","true","center"),

-			array("Account", "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

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

- 			array("Call Type", "120", "calltype", "", "", "","","true","center"), 

+			array("Date", "100", "callstart", "callstart", "callstart", "convert_GMT_to", "", "true", "center"),

+			array("Caller ID", "100", "callerid", "", "", "", "", "true", "center"),

+			array("Called Number", "120", "callednum", "", "", "", "", "true", "center"),

+			array("Code", "80", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+			array("Destination", "120", "notes", "", "", "", "", "true", "center"),

+			array("Duration", "107", "billseconds", "reseller_cdr_list_search", "billseconds", "convert_to_show_in", "", "true", "center"),

+			array("Debit($currency)", "105", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+			array("Cost($currency)", "104", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+			array("Disposition", "100", "disposition", "", "", "", "", "true", "center"),

+			array("Account", "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

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

+ 			array("Call Type", "120", "calltype", "", "", "", "", "true", "center"), 

 		    

 		   ));

 		return $grid_field_arr;

@@ -247,25 +247,25 @@ 
 	function build_report_list_for_provider() {

 

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

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

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

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

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

 		

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

-		$grid_field_arr = json_encode(array(array("Date", "100", "callstart", "callstart", "callstart", "convert_GMT_to","","true","center"),

-		  array("Caller ID", "120", "callerid", "", "", "","","true","center"),

-		  array("Called Number", "160", "callednum", "", "", "","","true","center"),

-		  array("Code", "117", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

-		  array("Destination", "130", "notes", "", "", "","","true","center"),

-		  array("Duration", "110", "billseconds", "provider_cdr_list_search", "billseconds", "convert_to_show_in","","true","center"),

-		  array("Cost($currency)", "150", "provider_call_cost", "provider_cost", "provider_cost", "convert_to_currency","","true","right"),

-		  array("Disposition", "200", "disposition", "", "", "","","true","center"),

-		  array("Account", "181", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

+		$grid_field_arr = json_encode(array(array("Date", "100", "callstart", "callstart", "callstart", "convert_GMT_to", "", "true", "center"),

+		  array("Caller ID", "120", "callerid", "", "", "", "", "true", "center"),

+		  array("Called Number", "160", "callednum", "", "", "", "", "true", "center"),

+		  array("Code", "117", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+		  array("Destination", "130", "notes", "", "", "", "", "true", "center"),

+		  array("Duration", "110", "billseconds", "provider_cdr_list_search", "billseconds", "convert_to_show_in", "", "true", "center"),

+		  array("Cost($currency)", "150", "provider_call_cost", "provider_cost", "provider_cost", "convert_to_currency", "", "true", "right"),

+		  array("Disposition", "200", "disposition", "", "", "", "", "true", "center"),

+		  array("Account", "181", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

 		));

 		return $grid_field_arr;

 	}

 

 	function build_grid_customer() {

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

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

 		return $buttons_json;

 	}

 /**

@@ -274,43 +274,43 @@ 
 **/

 

 	function build_grid_buttons_user() {

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

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

 		return $buttons_json;

 	}

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

 	function build_grid_buttons_reseller() {

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

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

 		return $buttons_json;

 	}

 	function build_grid_buttons_provider() {

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

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

 		return $buttons_json;

 	}

     

 	function build_report_list_for_user($accounttype = 'customer') {

 		

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

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

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

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

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

 		

 		

-		if($accounttype == 'customer' || $accounttype =='reseller'){

-			$cost_array=array("Debit($currency)", "100", "debit", "debit", "debit", "convert_to_currency","","true","right");

+		if ($accounttype == 'customer' || $accounttype == 'reseller') {

+			$cost_array = array("Debit($currency)", "100", "debit", "debit", "debit", "convert_to_currency", "", "true", "right");

 		}

-		if(strtolower($accounttype)=='provider'){

-			$cost_array=array("Debit($currency)", "140", "cost", "cost", "cost", "convert_to_currency");

+		if (strtolower($accounttype) == 'provider') {

+			$cost_array = array("Debit($currency)", "140", "cost", "cost", "cost", "convert_to_currency");

 		}

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

 		$grid_field_arr = json_encode(array(

-		array("Date", "130", "callstart", "callstart", "callstart", "convert_GMT_to","","true","center"),

-			array("Caller ID", "100", "callerid", "", "", "","","true","center"),

-			array("Called Number", "120", "callednum", "", "", "","","true","center"),

-			array("Destination", "135", "notes", "", "", "","","true","center"),

+		array("Date", "130", "callstart", "callstart", "callstart", "convert_GMT_to", "", "true", "center"),

+			array("Caller ID", "100", "callerid", "", "", "", "", "true", "center"),

+			array("Called Number", "120", "callednum", "", "", "", "", "true", "center"),

+			array("Destination", "135", "notes", "", "", "", "", "true", "center"),

 //            array("Account Number", "120", "accountid", "number", "accounts", "get_field_name"),

-			array("Duration", "120", "billseconds", "user_cdrs_report_search", "billseconds", "convert_to_show_in","","true","center"),

+			array("Duration", "120", "billseconds", "user_cdrs_report_search", "billseconds", "convert_to_show_in", "", "true", "center"),

 			$cost_array,

-			array("Disposition", "160", "disposition", "", "", "","","true","center"),

-			array("Call Type", "140", "calltype", "", "", "","","true","center"),

+			array("Disposition", "160", "disposition", "", "", "", "", "true", "center"),

+			array("Call Type", "140", "calltype", "", "", "", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

@@ -322,37 +322,37 @@ 
 	function build_refill_report_for_admin() {

 		

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

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

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

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

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

 	  $grid_field_arr = json_encode(array(

-			array(gettext("Date"), "225", "payment_date", "", "", "","","true","center"),

-			array(gettext("Account"), "240", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

-			array("Amount($currency)", "250", "credit", "credit", "credit", "convert_to_currency","","true","right"),

-			array(gettext("Refill By"), "230", "payment_by", "payment_by", "payment_by", "get_refill_by","","true","center"),

-			array(gettext("Note"), "327", "notes", "", "", "","","true","center")

+			array(gettext("Date"), "225", "payment_date", "", "", "", "", "true", "center"),

+			array(gettext("Account"), "240", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+			array("Amount($currency)", "250", "credit", "credit", "credit", "convert_to_currency", "", "true", "right"),

+			array(gettext("Refill By"), "230", "payment_by", "payment_by", "payment_by", "get_refill_by", "", "true", "center"),

+			array(gettext("Note"), "327", "notes", "", "", "", "", "true", "center")

 				));

 		return $grid_field_arr;

 	}

 	function build_refillreport_buttons() {

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

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

 		return $buttons_json;

 	}

 	function build_search_refill_report_for_admin() {

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

-		 $reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0 ;

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

+		 $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;

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

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

-			 $acc_arr= array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id,"type"=>"0,1,3"));

+			 $acc_arr = array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id, "type"=>"0,1,3"));

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

 		if ($logintype == 1 || $logintype == 5) {

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

 			$loginid = $account_data['id'];

 

-		}else{

+		} else {

 			$loginid = "0";

 		}

-		if($logintype==0 || $logintype==3){

-		$acc_arr=null;

+		if ($logintype == 0 || $logintype == 3) {

+		$acc_arr = null;

 		}    

 		$form['Search'] = array(

 		array('From Date', 'INPUT', array('name' => 'payment_date[]', 'id' => 'refill_from_date', 'size' => '20',

@@ -362,7 +362,7 @@ 
 //	    array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0")), 

 			array('Amount ', 'INPUT', array('name' => 'credit[credit]', 'value' => '', 'size' => '20', 'class' => "text field"), '', 'Tool tips info', '1', 'credit[credit-integer]', '', '', '', 'search_int_type', ''),

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

-			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

+			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''), array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

 

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

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

@@ -392,9 +392,9 @@ 
 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

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

 			array('From Date', 'INPUT', array('name' => 'date[]', 'id' => 'commission_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

-			array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'commission_to_date', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"1", "deleted" => "0")),

-			array('Amount', 'INPUT', array('name' => 'amount[amount]', 'value' => '', 'size' => '20',  'class' => "text field"), '', 'Tool tips info', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),

+			array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'commission_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

+		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"1", "deleted" => "0")),

+			array('Amount', 'INPUT', array('name' => 'amount[amount]', 'value' => '', 'size' => '20', 'class' => "text field"), '', 'Tool tips info', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),

 		);

 

 		$form['button_search'] = array('name' => 'action', 'id' => "commission_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'ui-state-default float-right ui-corner-all ui-button');

@@ -407,8 +407,8 @@ 
 		$form['Search'] = array(

 	array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		   array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"3")),

-		   array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+		   array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"3")),

+		   array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

             

 			array('Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

 		// array('Account Number', 'number', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("type"=>"3", "deleted" => "0")),

@@ -419,99 +419,99 @@ 
 

 		return $form;

 	}

-	function build_providersummary(){

+	function build_providersummary() {

 		$grid_field_arr = json_encode(array(

 			array("Provider", "220", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string"),

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

 			array("Destination", "150", "notes", "", "", ""),

 			array("Attempted Calls", "130", "attempted_calls", "", "", ""),

 			array("Completed Calls", "150", "description", "", "", ""),

-			array("ASR","95","asr",'','',''),

-			array("ACD","95","acd  ",'','',''),

-			array("MCD","95","mcd",'','',''),

-			array("Bilable","100","billable",'','',''),

-			array("Cost","115","cost",'','',''),

+			array("ASR", "95", "asr", '', '', ''),

+			array("ACD", "95", "acd  ", '', '', ''),

+			array("MCD", "95", "mcd", '', '', ''),

+			array("Bilable", "100", "billable", '', '', ''),

+			array("Cost", "115", "cost", '', '', ''),

 //            array("Profit", "95", "profit", "", "", ""),

 			));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_providersummary() {

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

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

 		return $buttons_json;

 	}

 	function get_resellersummary_search_form() {

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

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

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"1")),

-		   array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+		array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"1")),

+		   array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

             

 			array('Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

 		   // array('Account Number', 'number', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("type"=>"1", "deleted" => "0")),

-array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

+array('', 'HIDDEN', 'ajax_search', '1', '', '', ''), array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

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

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

 

 		return $form;

 	}

-	function build_resellersummary(){

+	function build_resellersummary() {

 		$grid_field_arr = json_encode(array(

 			array("Account", "148", "accountid", "first_name,last_name,number", "accounts", "build_concat_string"),

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

 			array("Destination", "150", "notes", "", "", ""),

 			array("Attempted Calls", "120", "attempted_calls", "", "", ""),

 			array("Completed Calls", "120", "description", "", "", ""),

-			array("ASR","80","asr",'','',''),

-			array("ACD","80","acd  ",'','',''),

-			array("MCD","80","mcd",'','',''),

-			array("Bilable","90","billable",'','',''),

-			array("Price","90","price",'','',''),

-			array("Cost","90","cost",'','',''),

+			array("ASR", "80", "asr", '', '', ''),

+			array("ACD", "80", "acd  ", '', '', ''),

+			array("MCD", "80", "mcd", '', '', ''),

+			array("Bilable", "90", "billable", '', '', ''),

+			array("Price", "90", "price", '', '', ''),

+			array("Cost", "90", "cost", '', '', ''),

 			array("Profit", "100", "profit", "", "", ""),

 			));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_resellersummary() {

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

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

 		return $buttons_json;

 	}

 	function get_customersummary_search_form() {

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

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

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"GLOBAL")),

+		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"GLOBAL")),

 			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

             

 			array('Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''),

 		   // array('Account Number', 'number', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("type"=>"0", "deleted" => "0")),

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

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

 		);

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

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

 

 		return $form;

 	}

-	function build_customersummary(){

+	function build_customersummary() {

 		$grid_field_arr = json_encode(array(

 			array("Account", "190", "accountid", "first_name,last_name,number", "accounts", "build_concat_string"),

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

 			array("Destination", "110", "notes", "", "", ""),

 			array("Attempted Calls", "140", "attempted_calls", "", "", ""),

 			array("Completed Calls", "130", "description", "", "", ""),

-			array("ASR","70","asr",'','',''),

-			array("ACD","70","acd  ",'','',''),

-			array("MCD","80","mcd",'','',''),

-			array("Bilable","80","billable",'','',''),

-			array("Debit","85","cost",'','',''),

-			array("Cost","110","price",'','',''),            

+			array("ASR", "70", "asr", '', '', ''),

+			array("ACD", "70", "acd  ", '', '', ''),

+			array("MCD", "80", "mcd", '', '', ''),

+			array("Bilable", "80", "billable", '', '', ''),

+			array("Debit", "85", "cost", '', '', ''),

+			array("Cost", "110", "price", '', '', ''),            

 			array("Profit", "123", "profit", "", "", ""),

 			));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_customersummary() {

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

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

 		return $buttons_json;

 	}

 /*********

@@ -520,45 +520,45 @@ 
 *********/

 	function build_charge_list_for_admin() {

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

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

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

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

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

 	 if ($this->CI->session->userdata("logintype") == '1') {

 		$grid_field_arr = json_encode(array(

-			array(gettext("Created Date"), "120", "created_date", "", "", "","","true","center"),

-			array(gettext("Invoice Number"), "120", "created_date", "", "", "","","true","center"),

-			array(gettext("Account"), "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

+			array(gettext("Created Date"), "120", "created_date", "", "", "", "", "true", "center"),

+			array(gettext("Invoice Number"), "120", "created_date", "", "", "", "", "true", "center"),

+			array(gettext("Account"), "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

 //            array("Reseller", "120", "reseller_id", "first_name,last_name,number", "accounts", "reseller_select_value"),

-			array(gettext("Charge Type"), "120", "item_type", "", "", "","","true","center"),

-			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency","","true","right"),

-			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency","","true","right"),

-		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),	

-			array(gettext("Description"), "300", "description", "", "", "","","true","center"),

+			array(gettext("Charge Type"), "120", "item_type", "", "", "", "", "true", "center"),

+			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency", "", "true", "right"),

+			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency", "", "true", "right"),

+		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency", "", "true", "right"),	

+			array(gettext("Description"), "300", "description", "", "", "", "", "true", "center"),

 				));

-	}else{

+	} else {

 		$grid_field_arr = json_encode(array(

-			array("Created Date", "120", "created_date", "", "", "","","true","center"),

-			array("Invoice Number", "120", "created_date", "", "", "","","true","center"),

-   		array("Account", "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

-			array("Charge Type", "120", "item_type", "", "", "","","true","center"),

-			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency","","true","right"),

-			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency","","true","right"),

-		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),	

-			array("Description", "300", "description", "", "", "","","true","center"),

+			array("Created Date", "120", "created_date", "", "", "", "", "true", "center"),

+			array("Invoice Number", "120", "created_date", "", "", "", "", "true", "center"),

+   		array("Account", "120", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+			array("Charge Type", "120", "item_type", "", "", "", "", "true", "center"),

+			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency", "", "true", "right"),

+			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency", "", "true", "right"),

+		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency", "", "true", "right"),	

+			array("Description", "300", "description", "", "", "", "", "true", "center"),

 				));

 

 	}

 		return $grid_field_arr;

 	}

 	function get_charges_search_form() {

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

-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;

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

+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;

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

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'created_date[]', 'id' => 'charge_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'created_date[]', 'id' => 'charge_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id,"type"=>"GLOBAL")),

+		array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id, "type"=>"GLOBAL")),

 		array('Debit ', 'INPUT', array('name' => 'debit[debit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'debit[debit-integer]', '', '', '', 'search_int_type', ''),

 		array('Credit ', 'INPUT', array('name' => 'credit[credit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'credit[credit-integer]', '', '', '', 'search_int_type', ''),

 

@@ -575,20 +575,20 @@ 
         ASTPP  3.0

         Charges History

     *********/

-	function build_charge_list_for_customer(){

+	function build_charge_list_for_customer() {

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

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

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

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

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

 		

 		$grid_field_arr = json_encode(array(

-			array("Created Date", "100", "created_date", "", "", "","","true","center"),

-			array("Invoice Number", "110", "created_date", "", "", "","","true","center"),

-			array("Charge Type", "100", "item_type", "", "", "","","true","center"),

-			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency","","true","right"),

-			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency","","true","right"),

-			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency","","true","right"),

-		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),

-			array("Description", "270", "description", "", "", "","","true","center"),

+			array("Created Date", "100", "created_date", "", "", "", "", "true", "center"),

+			array("Invoice Number", "110", "created_date", "", "", "", "", "true", "center"),

+			array("Charge Type", "100", "item_type", "", "", "", "", "true", "center"),

+			array("Before Balance<br/>($currency)", "120", "before_balance", "before_balance", "before_balance", "convert_to_currency", "", "true", "right"),

+			array("Debit (-)<br/>($currency)", "110", "debit", "debit", "debit", "convert_to_currency", "", "true", "right"),

+			array("Credit (+)<br/>($currency)", "110", "credit", "credit", "credit", "convert_to_currency", "", "true", "right"),

+		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency", "", "true", "right"),

+			array("Description", "270", "description", "", "", "", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

@@ -596,17 +596,17 @@ 
         ASTPP  3.0

         Refill History

     *********/

-	function build_refillreport_for_customer(){

+	function build_refillreport_for_customer() {

 		

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

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

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

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

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

 		

 		 $grid_field_arr = json_encode(array(

-			array("Date", "225", "payment_date", "", "", "","","true","center"),

-			array("Amount($currency)", "250", "credit", "credit", "credit", "convert_to_currency","","true","right"),

-			array("Refill By", "230", "payment_by", "payment_by", "payment_by", "get_refill_by","","true","center"),

-			array("Note", "325", "notes", "", "", "","","true","center")

+			array("Date", "225", "payment_date", "", "", "", "", "true", "center"),

+			array("Amount($currency)", "250", "credit", "credit", "credit", "convert_to_currency", "", "true", "right"),

+			array("Refill By", "230", "payment_by", "payment_by", "payment_by", "get_refill_by", "", "true", "center"),

+			array("Note", "325", "notes", "", "", "", "", "true", "center")

 				));

 		return $grid_field_arr;

 	}

Braces +7 added lines, -8 removed lines

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

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

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

-if (!defined('BASEPATH'))

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

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

 class Reports_form {

 	function __construct() {

@@ -56,8 +57,7 @@ 
 			array('Call Type', 'calltype', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_calltype'),

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

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

-			 }

-		else

+			 } else

 		{

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

 		$form['Search'] = array(

@@ -190,8 +190,7 @@ 
 				$recording,

 				));

                 

-				}

-				else{

+				} else{

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

 		$currency_id=$account_info['currency_id'];

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

@@ -348,7 +347,7 @@ 
 			$account_data = $this->CI->session->userdata("accountinfo");

 			$loginid = $account_data['id'];

 

-		}else{

+		} else{

 			$loginid = "0";

 		}

 		if($logintype==0 || $logintype==3){

@@ -535,7 +534,7 @@ 
 		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),	

 			array(gettext("Description"), "300", "description", "", "", "","","true","center"),

 				));

-	}else{

+	} else{

 		$grid_field_arr = json_encode(array(

 			array("Created Date", "120", "created_date", "", "", "","","true","center"),

 			array("Invoice Number", "120", "created_date", "", "", "","","true","center"),

web_interface/astpp/application/modules/opensips/models/opensips_model.php

Spacing +44 added lines, -44 removed lines

@@ -25,21 +25,21 @@ 
 	function Opensips_model() {
 		parent::__construct();
 		$db_config = Common_model::$global_config['system_config'];
-		$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+		$opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);
 	}
     
 	function getopensipsdevice_list($flag, $start = 0, $limit = 0) {
-		$this->db_model->build_search_opensips($this->opensips_db,'opensipsdevice_list_search');
-		$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
-		$this->opensips_db->where('reseller_id',$reseller_id);
+		$this->db_model->build_search_opensips($this->opensips_db, 'opensipsdevice_list_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$this->opensips_db->where('reseller_id', $reseller_id);
 		if ($flag) {
-			$this->opensips_db->limit($limit,$start);
-			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
-			$this->opensips_db->order_by('username','asc');
+			$this->opensips_db->limit($limit, $start);
+			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
+			$this->opensips_db->order_by('username', 'asc');
 		}
 			$query = $this->opensips_db->get("subscriber");
 		} else {
@@ -49,52 +49,52 @@ 
 		return $query;
 	}
     
-	function getopensipsdevice_customer_list($flag, $accountid = "",$accounttype, $start = "0", $limit = "0") {
+	function getopensipsdevice_customer_list($flag, $accountid = "", $accounttype, $start = "0", $limit = "0") {
 
 		if ($accountid != "") {
 			$where = array("accountcode" => $this->common->get_field_name('number', 'accounts', array('id' => $accountid)));
 		}
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_opensips');
-		$like_str=!empty($instant_search) ? "(username like '%$instant_search%'
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_opensips');
+		$like_str = ! empty($instant_search) ? "(username like '%$instant_search%'
                                             OR  password like '%$instant_search%'
                                             OR  domain like '%$instant_search%'
                                             OR  effective_caller_id_name like '%$instant_search%'
                                             OR  effective_caller_id_number like '%$instant_search%'
                                                 )"
 										   :null;
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->opensips_db->where($like_str);
 		$this->opensips_db->where($where);
 		if ($flag) {
-		  $this->opensips_db->limit($limit,$start);            
+		  $this->opensips_db->limit($limit, $start);            
 		}
 		$result = $this->opensips_db->get("subscriber");
-		if($result->num_rows() > 0){
-	  if($flag){
+		if ($result->num_rows() > 0) {
+	  if ($flag) {
 		return $result;
 	  }
-	  else{
+	  else {
 		return $result->num_rows();
 	  }
-		}else{
-		 if($flag){
-		  $result=(object)array('num_rows'=>0);
+		} else {
+		 if ($flag) {
+		  $result = (object)array('num_rows'=>0);
 	  }
-	  else{
-		  $result=0;
+	  else {
+		  $result = 0;
 	  }
 	  return $result;
 		}
 	}
 
 	function getopensipsdispatcher_list($flag, $start = '', $limit = '') {
-	   $this->db_model->build_search_opensips($this->opensips_db,'opensipsdispatcher_list_search');
+	   $this->db_model->build_search_opensips($this->opensips_db, 'opensipsdispatcher_list_search');
 	  if ($flag) {
-			$this->opensips_db->limit( $limit,$start);
-			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
-			$this->opensips_db->order_by('setid','asc');
+			$this->opensips_db->limit($limit, $start);
+			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
+			$this->opensips_db->order_by('setid', 'asc');
 		}
 			$query = $this->opensips_db->get("dispatcher");
 		} else {
@@ -109,18 +109,18 @@ 
 
  function add_opensipsdevices($data) {
 		unset($data["action"]);
-		$data['creation_date']=gmdate("Y-m-d H:i:s");
-		$accountinfo=$this->session->userdata('accountinfo');
-		$data['reseller_id']=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
+		$data['creation_date'] = gmdate("Y-m-d H:i:s");
+		$accountinfo = $this->session->userdata('accountinfo');
+		$data['reseller_id'] = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
 		unset($data["id"]);	
 		$this->opensips_db->insert("subscriber", $data);
 	}
 
 	function edit_opensipsdevices($data, $id) {
 	  unset($data["action"]);
-	  $data=array("username"=>$data['username'],"password"=>$data['password'],"accountcode"=>$data['accountcode'],"domain"=>$data['domain'],"effective_caller_id_name"=>$data['effective_caller_id_name'],"effective_caller_id_number"=>$data['effective_caller_id_number'],"status"=>$data['status']);
+	  $data = array("username"=>$data['username'], "password"=>$data['password'], "accountcode"=>$data['accountcode'], "domain"=>$data['domain'], "effective_caller_id_name"=>$data['effective_caller_id_name'], "effective_caller_id_number"=>$data['effective_caller_id_number'], "status"=>$data['status']);
 	  $this->opensips_db->where("id", $id);
-	  $data['last_modified_date']=gmdate("Y-m-d H:i:s");
+	  $data['last_modified_date'] = gmdate("Y-m-d H:i:s");
 	  $this->opensips_db->update("subscriber", $data);
 	}
 	function delete_opensips_devices($id) {
@@ -160,11 +160,11 @@ 
 			foreach ($account_search as $key => $value) {
 				if ($value != "") {
 					if (is_array($value)) {
-						if (array_key_exists($key . "-integer", $value)) {
-							$this->get_interger_array($key, $value[$key . "-integer"], $value[$key]);
+						if (array_key_exists($key."-integer", $value)) {
+							$this->get_interger_array($key, $value[$key."-integer"], $value[$key]);
 						}
-						if (array_key_exists($key . "-string", $value)) {
-							$this->get_string_array($key, $value[$key . "-string"], $value[$key]);
+						if (array_key_exists($key."-string", $value)) {
+							$this->get_string_array($key, $value[$key."-string"], $value[$key]);
 						}
 					} else {
 						$this->opensips_db->where($key, $value);
@@ -181,19 +181,19 @@ 
 					$this->opensips_db->where($field, $search_array);
 					break;
 				case "2":
-					$this->opensips_db->where($field . ' <>', $search_array);
+					$this->opensips_db->where($field.' <>', $search_array);
 					break;
 				case "3":
-					$this->opensips_db->where($field . ' > ', $search_array);
+					$this->opensips_db->where($field.' > ', $search_array);
 					break;
 				case "4":
-					$this->opensips_db->where($field . ' < ', $search_array);
+					$this->opensips_db->where($field.' < ', $search_array);
 					break;
 				case "5":
-					$this->opensips_db->where($field . ' >= ', $search_array);
+					$this->opensips_db->where($field.' >= ', $search_array);
 					break;
 				case "6":
-					$this->opensips_db->where($field . ' <= ', $search_array);
+					$this->opensips_db->where($field.' <= ', $search_array);
 					break;
 			}
 		}
@@ -212,7 +212,7 @@ 
 					$this->opensips_db->where($field, $search_array);
 					break;
 				case "4":
-					$this->opensips_db->where($field . ' <>', $search_array);
+					$this->opensips_db->where($field.' <>', $search_array);
 					break;
 			}
 		}

Braces +8 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 			$this->opensips_db->limit($limit,$start);
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->opensips_db->order_by('username','asc');
 		}
 			$query = $this->opensips_db->get("subscriber");
@@ -62,8 +62,9 @@ 
                                             OR  effective_caller_id_number like '%$instant_search%'
                                                 )"
 										   :null;
-		if(!empty($like_str))
-		$this->opensips_db->where($like_str);
+		if(!empty($like_str)) {
+				$this->opensips_db->where($like_str);
+		}
 		$this->opensips_db->where($where);
 		if ($flag) {
 		  $this->opensips_db->limit($limit,$start);            
@@ -72,15 +73,13 @@ 
 		if($result->num_rows() > 0){
 	  if($flag){
 		return $result;
-	  }
-	  else{
+	  } else{
 		return $result->num_rows();
 	  }
-		}else{
+		} else{
 		 if($flag){
 		  $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $result=0;
 	  }
 	  return $result;
@@ -93,7 +92,7 @@ 
 			$this->opensips_db->limit( $limit,$start);
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->opensips_db->order_by('setid','asc');
 		}
 			$query = $this->opensips_db->get("dispatcher");

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

Spacing +32 added lines, -32 removed lines

@@ -31,10 +31,10 @@ 
 		$this->load->library('astpp/form');
 		$this->load->model('opensips_model');
 		$db_config = Common_model::$global_config['system_config'];
-		$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+		$opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function opensips_add() {
@@ -69,7 +69,7 @@ 
 		$data['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields_for_customer($accountid), $edit_data);
 		$this->load->view('view_opensips_add_edit', $data);
 	}
-	 function customer_opensips_add($accountid='') {
+	 function customer_opensips_add($accountid = '') {
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
 		$data['page_title'] = 'Create Opensips';
@@ -88,11 +88,11 @@ 
 				exit;
 			} else {
 				$auth_flag = $this->validate_device_data($add_array);
-				if($auth_flag == "TRUE"){
+				if ($auth_flag == "TRUE") {
 						$this->opensips_model->edit_opensipsdevices($add_array, $add_array['id']);
 						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
 						exit;
-				}else{
+				} else {
 					   echo json_encode($auth_flag);
 					   exit;
 				}
@@ -105,36 +105,36 @@ 
 				exit;
 			} else {
 				$auth_flag = $this->validate_device_data($add_array);
-				if($auth_flag == "TRUE"){
+				if ($auth_flag == "TRUE") {
 						$this->opensips_model->add_opensipsdevices($add_array);
 						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
 						exit;
-				}else{
+				} else {
 					   echo json_encode($auth_flag);
 						exit;
 				}
 			}
 		}
 	}
-	function validate_device_data($data){
+	function validate_device_data($data) {
 
-		if(isset($data["username"]) && $data["username"] != ""){
+		if (isset($data["username"]) && $data["username"] != "") {
 				$db_config = Common_model::$global_config['system_config'];
-				$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+				$opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 				$this->opensips_db = $this->load->database($opensipdsn, true);
 				$where = array("username"=>$data["username"]);
-				if($data['id'] != ""){
-					$this->opensips_db->where("id <>",$data['id']);
+				if ($data['id'] != "") {
+					$this->opensips_db->where("id <>", $data['id']);
 				}
 				$this->opensips_db->where($where);
 				$auth_flag = $this->opensips_db->get("subscriber");
 				$auth_flag = $auth_flag->num_rows();
-				if($auth_flag == 0){
+				if ($auth_flag == 0) {
 					return "TRUE";
-				}else{
+				} else {
 					return array("username_error"=>"Duplicate Email Address Found Email Must Be Unique.");
 				}
-		}else{
+		} else {
 		  return array("username_error"=>"User name is required field.");
 		}
 		return "0";
@@ -155,13 +155,13 @@ 
 				echo json_encode(array("SUCCESS"=> "Opensips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else {
 		  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			}else{
+			} else {
 		$this->opensips_model->add_opensipsdevices($array_add);
 				echo json_encode(array("SUCCESS"=> "Opensips Added Successfully!"));
 				exit;
@@ -184,13 +184,13 @@ 
 				echo json_encode(array("SUCCESS"=> "OpenSips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else {
 			  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			 }else{
+			 } else {
 		$this->opensips_model->add_opensipsdevices($add_array);
 				echo json_encode(array("SUCCESS"=> "OpenSips Added Successfully!"));
 				exit;
@@ -198,14 +198,14 @@ 
 		}
 	}
 
-	function customer_opensips_json($accountid,$accounttype) {
+	function customer_opensips_json($accountid, $accounttype) {
 	
 		$json_data = array();
-		$count_all = $this->opensips_model->getopensipsdevice_customer_list(false, $accountid,$accounttype);
+		$count_all = $this->opensips_model->getopensipsdevice_customer_list(false, $accountid, $accounttype);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 
-		$query = $this->opensips_model->getopensipsdevice_customer_list(true, $accountid,$accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$query = $this->opensips_model->getopensipsdevice_customer_list(true, $accountid, $accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->opensips_form->opensips_customer_build_opensips_list($accountid));
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 
@@ -220,7 +220,7 @@ 
 	function opensips_remove($id) {
 		$this->opensips_model->remove_opensips($id);
 		$this->session->set_flashdata('astpp_notification', 'OpenSips Removed Successfully!');
-		redirect(base_url() . 'opensips/opensips_list/');
+		redirect(base_url().'opensips/opensips_list/');
 	}
 
 	function opensips_list() {
@@ -248,7 +248,7 @@ 
 		$grid_fields = json_decode($this->opensips_form->build_opensips_list());
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		$result = $this->opensips_db->get("subscriber");
-		if($result->num_rows() <= 0){
+		if ($result->num_rows() <= 0) {
 			$json_data['page'] = 0;
 			$json_data['total'] = 0;
 		}
@@ -267,12 +267,12 @@ 
 			$this->session->set_userdata('opensipsdevice_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'opensips/opensips_list/');
+			redirect(base_url().'opensips/opensips_list/');
 		}
 	}
 	function opensips_list_clearsearchfilter() {
-			$this->session->set_userdata('advance_search','');
-			$this->session->set_userdata('opensipsdevice_list_search','');
+			$this->session->set_userdata('advance_search', '');
+			$this->session->set_userdata('opensipsdevice_list_search', '');
 	}
 
 //    dispather List add edit delete
@@ -303,7 +303,7 @@ 
 			$data['page_title'] = 'Edit Dispatcher';
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
-				echo $data['validation_errors'];exit;
+				echo $data['validation_errors']; exit;
 			} else {
 				$this->opensips_model->edit_opensipsdispatcher($add_array, $add_array['id']);
 				echo json_encode(array("SUCCESS"=> "Dispatcher Updated Successfully!"));
@@ -313,7 +313,7 @@ 
 			$data['page_title'] = 'Add Dispatcher';
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
-				 echo $data['validation_errors'];exit;
+				 echo $data['validation_errors']; exit;
 			} else {
 				$this->opensips_model->add_opensipsdispatcher($add_array);
 				echo json_encode(array("SUCCESS"=> "Dispatcher Added Successfully!"));
@@ -325,7 +325,7 @@ 
 	function dispatcher_remove($id) {
 		$this->opensips_model->remove_dispatcher($id);
 		$this->session->set_flashdata('astpp_notification', 'Dispatcher Removed Successfully!');
-		redirect(base_url() . 'opensips/dispatcher_list/');
+		redirect(base_url().'opensips/dispatcher_list/');
 	}
 
 	function dispatcher_list() {
@@ -353,7 +353,7 @@ 
 		$grid_fields = json_decode($this->opensips_form->build_opensipsdispatcher_list());
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		$result = $this->opensips_db->get("subscriber");
-		if($result->num_rows() <= 0){
+		if ($result->num_rows() <= 0) {
 			$json_data['page'] = 0;
 			$json_data['total'] = 0;
 		}
@@ -369,7 +369,7 @@ 
 			$this->session->set_userdata('opensipsdispatcher_list_search', $this->input->post());
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'opensips/dispatcher_list/');
+			redirect(base_url().'opensips/dispatcher_list/');
 		}
 	}
 

Braces +11 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
 		$db_config = Common_model::$global_config['system_config'];
 		$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function opensips_add() {
@@ -92,7 +93,7 @@ 
 						$this->opensips_model->edit_opensipsdevices($add_array, $add_array['id']);
 						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 					   exit;
 				}
@@ -109,7 +110,7 @@ 
 						$this->opensips_model->add_opensipsdevices($add_array);
 						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 						exit;
 				}
@@ -131,10 +132,10 @@ 
 				$auth_flag = $auth_flag->num_rows();
 				if($auth_flag == 0){
 					return "TRUE";
-				}else{
+				} else{
 					return array("username_error"=>"Duplicate Email Address Found Email Must Be Unique.");
 				}
-		}else{
+		} else{
 		  return array("username_error"=>"User name is required field.");
 		}
 		return "0";
@@ -155,13 +156,13 @@ 
 				echo json_encode(array("SUCCESS"=> "Opensips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else{
 		  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			}else{
+			} else{
 		$this->opensips_model->add_opensipsdevices($array_add);
 				echo json_encode(array("SUCCESS"=> "Opensips Added Successfully!"));
 				exit;
@@ -184,13 +185,13 @@ 
 				echo json_encode(array("SUCCESS"=> "OpenSips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else{
 			  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			 }else{
+			 } else{
 		$this->opensips_model->add_opensipsdevices($add_array);
 				echo json_encode(array("SUCCESS"=> "OpenSips Added Successfully!"));
 				exit;

web_interface/astpp/application/modules/opensips/libraries/opensips_form.php

Spacing +29 added lines, -29 removed lines

@@ -21,7 +21,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Opensips_form {

@@ -35,18 +35,18 @@ 
 

 		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');

 		$password = $this->CI->common->generate_password();

-		$val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';

+		$val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';

 

 		// echo '<pre>'; print_r($val); exit;

 		$loginid = $this->CI->session->userdata('logintype') == 2 ? 0 : $accountinfo['id'];

-		$form['forms'] = array(base_url() . 'opensips/opensips_save/', array("id" => "opensips_form", "name" => "opensips_form"));

+		$form['forms'] = array(base_url().'opensips/opensips_save/', array("id" => "opensips_form", "name" => "opensips_form"));

 		$form['Opensips Device'] = array(

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

-			array('Username', 'INPUT', array('name' => 'username', 'size' => '30',  'value' => $uname_user, 'id' => 'username', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

-			array('Password', 'INPUT', array('name' => 'password', 'size' => '30',  'value' => $password, 'id' => 'password', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

+			array('Username', 'INPUT', array('name' => 'username', 'size' => '30', 'value' => $uname_user, 'id' => 'username', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

+			array('Password', 'INPUT', array('name' => 'password', 'size' => '30', 'value' => $password, 'id' => 'password', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

 			array('Account', 'accountcode', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'number', 'number', 'accounts', 'build_dropdown', 'where_arr', array("reseller_id" => $loginid, "type" => "GLOBAL", "deleted" => "0")),

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

-			array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+			array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

 			array('Caller Number', 'INPUT', array('name' => 'effective_caller_id_number', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),

 		);

@@ -58,14 +58,14 @@ 
 

 	function get_dispatcher_form_fields() {

 

-		$form['forms'] = array(base_url() . 'opensips/dispatcher_save/', array("id" => "opensips_dispatcher_form", "name" => "opensips_dispatcher_form"));

+		$form['forms'] = array(base_url().'opensips/dispatcher_save/', array("id" => "opensips_dispatcher_form", "name" => "opensips_dispatcher_form"));

 		$form['Dispatcher Information'] = array(

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

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

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

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

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

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

-			array('Description', 'INPUT', array('name' => 'description', 'size' => '100',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Description', 'INPUT', array('name' => 'description', 'size' => '100', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 		);

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

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

@@ -103,12 +103,12 @@ 
 	function build_opensips_list() {

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

 		$grid_field_arr = json_encode(array(

-			array("Username", "150", "username", "", "", "","","true","center"),

-			array("Password", "150", "password", "", "", "","","true","center"),

-			array("Account", "150", "accountcode", "", "", "","","true","center"),

-			array("Domain", "317", "domain", "", "", "","","true","center"),

-			array("Caller Name", "200", "effective_caller_id_name", "", "", "","","true","center"),

-			array("Caller Number", "200", "effective_caller_id_number", "", "", "","","true","center"),

+			array("Username", "150", "username", "", "", "", "", "true", "center"),

+			array("Password", "150", "password", "", "", "", "", "true", "center"),

+			array("Account", "150", "accountcode", "", "", "", "", "true", "center"),

+			array("Domain", "317", "domain", "", "", "", "", "true", "center"),

+			array("Caller Name", "200", "effective_caller_id_name", "", "", "", "", "true", "center"),

+			array("Caller Number", "200", "effective_caller_id_number", "", "", "", "", "true", "center"),

 			array("Action", "100", "", "", "", array("EDIT" => array("url" => "/opensips/opensips_edit/", "mode" => "popup"),

 					"DELETE" => array("url" => "/opensips/opensips_remove/", "mode" => "single")))

 				));

@@ -118,11 +118,11 @@ 
 	function build_opensipsdispatcher_list() {

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

 		$grid_field_arr = json_encode(array(

-			array("Set Id", "160", "setid", "", "", "","","true","center"),

-			array("Destination", "160", "destination", "", "", "","","true","center"),

-			array("Weight", "190", "weight", "", "", "","","true","center"),

-			array("Attrs", "180", "attrs", "", "", "","","true","center"),

-			array("Description", "190", "description", "", "", "","","true","center"),

+			array("Set Id", "160", "setid", "", "", "", "", "true", "center"),

+			array("Destination", "160", "destination", "", "", "", "", "true", "center"),

+			array("Weight", "190", "weight", "", "", "", "", "true", "center"),

+			array("Attrs", "180", "attrs", "", "", "", "", "true", "center"),

+			array("Description", "190", "description", "", "", "", "", "true", "center"),

 			array("Action", "170", "", "", "", array("EDIT" => array("url" => "/opensips/dispatcher_edit/", "mode" => "popup"),

 					"DELETE" => array("url" => "/opensips/dispatcher_remove/", "mode" => "single")))

 				));

@@ -144,19 +144,19 @@ 
 	}

 

 	function get_opensips_form_fields_for_customer($accountid, $id = false) {

-		$val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';

+		$val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';

 		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');

 		$password = $this->CI->common->generate_password();

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

-		$link = ($accountinfo['type']==1 || $accountinfo['type']==3 )? base_url() . 'opensips/user_opensips_save/true/' : base_url() . 'opensips/customer_opensips_save/true/';    

+		$link = ($accountinfo['type'] == 1 || $accountinfo['type'] == 3) ? base_url().'opensips/user_opensips_save/true/' : base_url().'opensips/customer_opensips_save/true/';    

 			$form['forms'] = array($link, array("id" => "opensips_form", "name" => "opensips_form"));

 			$form['Opensips Device'] = array(

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

 				array('', 'HIDDEN', array('name' => 'accountcode', 'value' => $this->CI->common->get_field_name('number', 'accounts', array('id' => $accountid))), '', '', '', ''),

-				array('Username', 'INPUT', array('name' => 'username', 'size' => '20',  'id' => 'username', 'value' => $uname_user, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

+				array('Username', 'INPUT', array('name' => 'username', 'size' => '20', 'id' => 'username', 'value' => $uname_user, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

 				array('Password', 'PASSWORD', array('name' => 'password', 'size' => '20', 'id' => 'password1', 'value' => $password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

-				array('Domain', 'INPUT', array('name' => 'domain', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Domain', 'INPUT', array('name' => 'domain', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

 				array('Caller Number', 'INPUT', array('name' => 'effective_caller_id_number', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

 				array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),                

 			);

@@ -192,10 +192,10 @@ 
 			array("Username", "200", "username", "", "", ""),

 			array("Password", "200", "password", "", "", ""),

 			array("Domain", "200", "domain", "", "", ""),

-			array("Caller Name", "150", "effective_caller_id_name", "", "", "","","true","center"),

-			array("Caller Number", "150", "effective_caller_id_number", "", "", "","","true","center"),

-			array("Action", "100", "", "", "", array("EDIT" => array("url" => 'accounts/customer_opensips_action/edit/' . $accountid . '/', "mode" => "popup"),

-					"DELETE" => array("url" => 'accounts/customer_opensips_action/delete/' . $accountid . "/", "mode" => "popup")))

+			array("Caller Name", "150", "effective_caller_id_name", "", "", "", "", "true", "center"),

+			array("Caller Number", "150", "effective_caller_id_number", "", "", "", "", "true", "center"),

+			array("Action", "100", "", "", "", array("EDIT" => array("url" => 'accounts/customer_opensips_action/edit/'.$accountid.'/', "mode" => "popup"),

+					"DELETE" => array("url" => 'accounts/customer_opensips_action/delete/'.$accountid."/", "mode" => "popup")))

 				));

 

 		return $grid_field_arr;

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

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

 

-if (!defined('BASEPATH'))

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

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

 class Package_form {

 

web_interface/astpp/application/modules/email/models/email_model.php

Spacing +33 added lines, -33 removed lines

@@ -38,27 +38,27 @@ 
 	$account_email = $account_data['email'];
 	$account_type = $account_data['type'];
 	
-	if($account_type == 0){
-		$this->db->where('accountid',$account_id);	
+	if ($account_type == 0) {
+		$this->db->where('accountid', $account_id);	
 	}
-	if($account_type == 1){
+	if ($account_type == 1) {
 	  $this->db->where_in('reseller_id');
 		  $this->db->select('id');
-		  $email_address=$this->db->get('accounts');
+		  $email_address = $this->db->get('accounts');
 
-		  $email_address=$email_address->result_array();
+		  $email_address = $email_address->result_array();
 
-	  if(empty($email_address)){
-		$this->db->or_where('accountid',0);
-	  } else{
-		$this->db->where('reseller_id',$account_id);
+	  if (empty($email_address)) {
+		$this->db->or_where('accountid', 0);
+	  } else {
+		$this->db->where('reseller_id', $account_id);
 	  }
 	  }
 		  $this->db_model->build_search('email_search_list');
 		  if ($flag) {
 		   $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
 		  } else {
-			$query = $this->db_model->countQuery("*", "mail_details",'');
+			$query = $this->db_model->countQuery("*", "mail_details", '');
 		  }
 		return $query;
 	}
@@ -78,9 +78,9 @@ 
 		$this->db->where("id", $id);
 		$this->db->update("mail_details", $data);
 	}
-   function customer_get_email_list($flag,$accountid, $start = 0, $limit = 0) {
+   function customer_get_email_list($flag, $accountid, $start = 0, $limit = 0) {
 
-	  $this->db->where('accountid',$accountid);
+	  $this->db->where('accountid', $accountid);
 	   		if ($flag) {
 			$query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
 		} else {
@@ -90,11 +90,11 @@ 
 
 		return $query;
 	}
-	function get_email_client_data($data, $start = 0, $limit = 0){
-	if($data['type'] == ''){
-		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
-	} else{
-		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
+	function get_email_client_data($data, $start = 0, $limit = 0) {
+	if ($data['type'] == '') {
+		$where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'deleted'=>'0');
+	} else {
+		$where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'type'=>$data['type'], 'deleted'=>'0');
 	}
 	
 		$query = $this->db_model->getSelect("email,id", "accounts", $where);
@@ -102,28 +102,28 @@ 
 	return $query;	
 	}
 	/*Mass mail*/
-	function multipal_email($data){
-	   $mail_ids=explode(',',$data['to']);
-	foreach($mail_ids as $key=>$val)
+	function multipal_email($data) {
+	   $mail_ids = explode(',', $data['to']);
+	foreach ($mail_ids as $key=>$val)
 	{
-		if($val!='')
+		if ($val != '')
 		{
-			$template_type['message']=$data['template'];
-			$template_type['subject']=$data['subject'];
-			$act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val,"deleted"=>0));
-			$count=$act_details->num_rows();
-			$account_info=array();
-			if($count<=0)
+			$template_type['message'] = $data['template'];
+			$template_type['subject'] = $data['subject'];
+			$act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val, "deleted"=>0));
+			$count = $act_details->num_rows();
+			$account_info = array();
+			if ($count <= 0)
 			{
-				$account_info['email']=$val;
-				$account_info['accountid']='0';
-			} else{
+				$account_info['email'] = $val;
+				$account_info['accountid'] = '0';
+			} else {
 				$res_data = $act_details->result_array();
-				$account_info=$res_data[0];
-				$account_info['accountid']=$account_info['id'];
+				$account_info = $res_data[0];
+				$account_info['accountid'] = $account_info['id'];
 			}
 			$account_info['password'] = $this->common->decode($account_info['password']);	
-			$this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
+			$this->email_lib->send_email($template_type, $account_info, '', $data['file'], 0, 1);
 		}
 	}
 		return true;

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

Spacing +84 added lines, -84 removed lines

@@ -36,7 +36,7 @@ 
 		$this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function email_edit($edit_id = '') {
@@ -56,9 +56,9 @@ 
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $edit_data);
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 	}
 
 	function email_resend() {
@@ -78,7 +78,7 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}
-		$add_array=array('accountid'=>$edit_data['accountid'],
+		$add_array = array('accountid'=>$edit_data['accountid'],
 				 'subject'=>$add_array['subject'],
 				 'body'=>$add_array['body'],
 				 'from'=>$edit_data['from'],
@@ -91,7 +91,7 @@ 
 				$this->email_re_send($add_array);		
         
 		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 	}
 	function email_resend_edit($edit_id = '') {
 	$data['page_title'] = 'Resend Email';
@@ -106,7 +106,7 @@ 
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 
 	}
@@ -123,7 +123,7 @@ 
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 
 	}
@@ -136,7 +136,7 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}
-		$add_array=array('accountid'=>$edit_data['accountid'],
+		$add_array = array('accountid'=>$edit_data['accountid'],
 				 'subject'=>$add_array['subject'],
 				 'body'=>$add_array['body'],
 				 'from'=>$edit_data['from'],
@@ -146,11 +146,11 @@ 
 				 'attachment'=>$edit_data['attachment'],
 				);
 			$this->email_model->add_email($add_array);
-			$this->email_lib->send_email('',$add_array,'','',1);
+			$this->email_lib->send_email('', $add_array, '', '', 1);
 
 			$this->load->module('accounts/accounts');
 		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-			redirect(base_url() . 'accounts/customer_edit/'.$value["accountid"]);
+			redirect(base_url().'accounts/customer_edit/'.$value["accountid"]);
 	}
 	function email_add($type = "") {
 
@@ -189,9 +189,9 @@ 
 		}
 	}
 	function email_re_send($edit_data) {
-	$this->email_lib->send_email('',$edit_data,'',$edit_data['attachment'],1);
+	$this->email_lib->send_email('', $edit_data, '', $edit_data['attachment'], 1);
 	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-		redirect(base_url() . '/email/email_history_list/');
+		redirect(base_url().'/email/email_history_list/');
 	}
 	function email_view($edit_id = '') {
 	$data['page_title'] = 'View Email';
@@ -201,16 +201,16 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}  
-			if($edit_data['status'] == 1){
-				$edit_data['status']='Not Sent';
-			} else{
-				$edit_data['status']='Sent';
+			if ($edit_data['status'] == 1) {
+				$edit_data['status'] = 'Not Sent';
+			} else {
+				$edit_data['status'] = 'Sent';
 			}
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 	}
 	function email_view_customer($edit_id = '') {
@@ -224,140 +224,140 @@ 
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus(), $edit_data);
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/'.$edit_id);
+			redirect(base_url().'email/email_history_list/'.$edit_id);
 		}
 	}
 	function email_delete($id) {
 		$this->email_model->remove_email($id);
 		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
-		redirect(base_url() . '/email/email_history_list/');
+		redirect(base_url().'/email/email_history_list/');
 	}
-	function email_delete_customer($accounttype,$accountid,$id) {
+	function email_delete_customer($accounttype, $accountid, $id) {
 		$this->email_model->remove_email($id);
 		$where = array('id' => $id);
 		$account = $this->db_model->getSelect("*", "mail_details", $where);
 	foreach ($account->result_array() as $key => $value) {
 		$edit_data = $value;
 	}
-		$url ="accounts/".$accounttype."_emailhistory/$accountid/";
+		$url = "accounts/".$accounttype."_emailhistory/$accountid/";
 		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
 	$this->load->module('accounts/accounts');
-		redirect(base_url() . $url);
+		redirect(base_url().$url);
 	}
 	function email_mass() {
 		$account_data = $this->session->userdata("accountinfo");
-		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
-			redirect(base_url() . '/astpp/dashboard/');
+		if ($account_data['type'] == '1' || $account_data['type'] == 0 || $account_data['type'] == 3)
+			redirect(base_url().'/astpp/dashboard/');
 	$data['username'] = $this->session->userdata('user_name');	
 		$data['page_title'] = 'Email Mass';
 		$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
-	$this->load->view('view_email_client_area',$data); 
+	$this->load->view('view_email_client_area', $data); 
 	}
  /*Mass Email*/
-   function attachment_icons($select = "", $table = "", $attachement="") {
-	if($attachement!="")
+   function attachment_icons($select = "", $table = "", $attachement = "") {
+	if ($attachement != "")
 	{
-		$array=explode(",", $attachement);
-		$str='';
-		foreach($array as $key =>$val){
-			$link = base_url() . "email/email_history_list_attachment/".$val;
-			$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
+		$array = explode(",", $attachement);
+		$str = '';
+		foreach ($array as $key =>$val) {
+			$link = base_url()."email/email_history_list_attachment/".$val;
+			$str .= "<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
 		}
 		return $str;
-	} else{
+	} else {
 		return "";
 	}
 	}
 	function email_client_get()
 	  {
-		   $files=$_FILES;
+		   $files = $_FILES;
 		   $add_array = $this->input->post();
 		   $add_array['page_title'] = 'Compose email';
-		   $nooffile= $files['file']['name'];
-		   $count=count($nooffile);
-		   $add_array['attachment']='';
-		   $add_array['file']='';
-		   for($i=0;$i<$count;$i++){
-			   $tmp_name[]= $files['file']['tmp_name'][$i];
-			   if($files['file']['error'][$i]==0){
+		   $nooffile = $files['file']['name'];
+		   $count = count($nooffile);
+		   $add_array['attachment'] = '';
+		   $add_array['file'] = '';
+		   for ($i = 0; $i < $count; $i++) {
+			   $tmp_name[] = $files['file']['tmp_name'][$i];
+			   if ($files['file']['error'][$i] == 0) {
 				   $cur_name = $files['file']['name'][$i];
 				   $parts = explode(".", $cur_name);
-				   $add_array['attachment'].=date('ymdhis').$i.'.'.$parts[1].',';
-				   $add_array['file'].=date('ymdhis').$i.'.'.$parts[1].',';
+				   $add_array['attachment'] .= date('ymdhis').$i.'.'.$parts[1].',';
+				   $add_array['file'] .= date('ymdhis').$i.'.'.$parts[1].',';
 			 		   $uploadedFile1 = $files['file']['tmp_name'][$i];
-				   $user_name='inextrix';
-				   $actual_file_name=date('ymdhis').$i.'.'.$parts[1];
-				   $dir_path=  getcwd()."/attachments/";
-				   $path =$dir_path.$actual_file_name;
-				   if (move_uploaded_file($uploadedFile1,$path)) {
+				   $user_name = 'inextrix';
+				   $actual_file_name = date('ymdhis').$i.'.'.$parts[1];
+				   $dir_path = getcwd()."/attachments/";
+				   $path = $dir_path.$actual_file_name;
+				   if (move_uploaded_file($uploadedFile1, $path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
 				   }
-				   else{
+				   else {
 					$this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
 				   }
 			   }
 		   }
-		   $add_array['attachment']=trim($add_array['attachment'],',');
-		   $add_array['file']=trim($add_array['file'],',');
-			   $add_array['email']= explode(",",$add_array['to']);   
+		   $add_array['attachment'] = trim($add_array['attachment'], ',');
+		   $add_array['file'] = trim($add_array['file'], ',');
+			   $add_array['email'] = explode(",", $add_array['to']);   
 			   $this->email_model->multipal_email($add_array);
 			   $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);
 			   $this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-			   redirect(base_url() . 'email/email_history_list/');
+			   redirect(base_url().'email/email_history_list/');
 			   exit; 
 		}
     
 	   function email_client_area() {
 		$add_array = $this->input->post();
-		if($add_array['temp'] == ''){
+		if ($add_array['temp'] == '') {
 	 	$subject = '';
-		$body ='';	
+		$body = '';	
 			 }
-		else{
+		else {
 				$where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
-		$account_data =$account->result_array();
-				$subject = isset($account_data[0]['subject'])?$account_data[0]['subject']:'';
-		$body = isset($account_data[0]['template'])?$account_data[0]['template']:'';	
+		$account_data = $account->result_array();
+				$subject = isset($account_data[0]['subject']) ? $account_data[0]['subject'] : '';
+		$body = isset($account_data[0]['template']) ? $account_data[0]['template'] : '';	
 	
             
 		}
 	   	$count_all = $this->email_model->get_email_client_data($add_array);
 	$email_arr = array();
 	$id_arr = array();
-	foreach($count_all as $key=>$value){
+	foreach ($count_all as $key=>$value) {
 		$value = $value;
-		if($value['email']!=''){
-		$email_arr[$value['email']]= $value['email'];
-		$id_arr[]= $value['id'];}
+		if ($value['email'] != '') {
+		$email_arr[$value['email']] = $value['email'];
+		$id_arr[] = $value['id']; }
 	} 
 	if (empty($email_arr))
 	{
 			$this->session->set_flashdata('astpp_notification', 'No record found! ');
-			redirect(base_url() . 'email/email_mass/');
+			redirect(base_url().'email/email_mass/');
 	}
 	$to_email = $email_arr;
 	
 	$to_id = $id_arr;
-	$to_send_mail = implode(",",$to_email);
-	if($to_send_mail != ''){
-		$add_arr['email']= $email_arr;
+	$to_send_mail = implode(",", $to_email);
+	if ($to_send_mail != '') {
+		$add_arr['email'] = $email_arr;
 	}
 	$data['username'] = $this->session->userdata('user_name');	
 	$data['page_title'] = 'Compose Email';
 	$send_id = $this->db_model->getSelect("emailaddress", "invoice_conf", array());
-	$send_id =$send_id->result_array();
-	$send_id =$send_id[0]['emailaddress'];
+	$send_id = $send_id->result_array();
+	$send_id = $send_id[0]['emailaddress'];
 	$add_arr['template'] = $body;
 	$add_arr['subject'] = $subject;
 		$add_arr['accountid'] = $id_arr;
 	$add_arr['from'] = $send_id;
 	$add_arr['temp'] = $add_array['temp'];
-	$add_arr['to']=$to_send_mail;
-	$add_arr['temp']=$add_array['temp'];
+	$add_arr['to'] = $to_send_mail;
+	$add_arr['temp'] = $add_array['temp'];
 		$this->load->view('view_email_brod', $add_arr);
 	}
 
@@ -370,10 +370,10 @@ 
 				$edit_data = $value;
 			}
 		$this->load->module('accounts/accounts');
-			redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
+			redirect(base_url().'accounts/customer_edit/'.$value['accountid']);
 	}
 	function email_history_list() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$data['logintype'] = $this->session->userdata('logintype');
 		$data['username'] = $this->session->userdata('user_name');
 		$data['search_flag'] = true;
 		$this->session->set_userdata('advance_search', 0);
@@ -384,7 +384,7 @@ 
 	$this->load->view('view_email_list', $data);
 	}
 	function email_history_list_json() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$data['logintype'] = $this->session->userdata('logintype');
 		$json_data = array();
 		$count_all = $this->email_model->get_email_list(false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -395,13 +395,13 @@ 
 		echo json_encode($json_data);
 	}
 
-	function customer_mail_record($accountid,$accounttype){
+	function customer_mail_record($accountid, $accounttype) {
 		$json_data = array();
-		$count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
+		$count_all = $this->email_model->customer_get_email_list(false, $accountid, "", "");
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		$query = $this->email_model->customer_get_email_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-	$grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid,$accounttype));
+		$query = $this->email_model->customer_get_email_list(true, $accountid, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+	$grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		echo json_encode($json_data);
 	}    
@@ -412,11 +412,11 @@ 
 		echo $this->db->delete("email");
 	}
 
-	function email_send_multipal(){
+	function email_send_multipal() {
 	$add_array = $this->input->post();
-	if($add_array['email'] == '' || $add_array['subject'] == '' || $add_array['template'] == ''){
+	if ($add_array['email'] == '' || $add_array['subject'] == '' || $add_array['template'] == '') {
 		$this->session->set_flashdata('astpp_notification', 'Email address not found!');
-			redirect(base_url() . '/email/email_client_area/');
+			redirect(base_url().'/email/email_client_area/');
 	}
 		$this->email_model->multipal_email($add_array);
 	$screen_path = "/var/www/html/ITPLATP/cron";
@@ -424,7 +424,7 @@ 
 	$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
 		exec($command);
 	$this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-		redirect(base_url() . 'email/email_history_list/');
+		redirect(base_url().'email/email_history_list/');
 
 	}
 	function email_history_list_search() {
@@ -438,7 +438,7 @@ 
 			$this->session->set_userdata('email_search_list', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 	}
 
@@ -451,7 +451,7 @@ 
 	* Version 2.1
     */
 	function email_history_list_attachment($file_name) {
-	if(file_exists(getcwd().'/attachments/'.$file_name)){
+	if (file_exists(getcwd().'/attachments/'.$file_name)) {
 		header('Content-Type: application/octet-stream');
 		header('Content-Disposition: attachment; filename='.$file_name);
 		ob_clean();

Braces +8 added lines, -8 removed lines

@@ -35,8 +35,9 @@ 
 		$this->load->model('email_model');
 		$this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function email_edit($edit_id = '') {
@@ -246,8 +247,9 @@ 
 	}
 	function email_mass() {
 		$account_data = $this->session->userdata("accountinfo");
-		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
-			redirect(base_url() . '/astpp/dashboard/');
+		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3) {
+					redirect(base_url() . '/astpp/dashboard/');
+		}
 	$data['username'] = $this->session->userdata('user_name');	
 		$data['page_title'] = 'Email Mass';
 		$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
@@ -291,8 +293,7 @@ 
 				   $path =$dir_path.$actual_file_name;
 				   if (move_uploaded_file($uploadedFile1,$path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
-				   }
-				   else{
+				   } else{
 					$this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
 				   }
 			   }
@@ -315,8 +316,7 @@ 
 		if($add_array['temp'] == ''){
 	 	$subject = '';
 		$body ='';	
-			 }
-		else{
+			 } else{
 				$where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
 		$account_data =$account->result_array();

web_interface/astpp/application/modules/email/libraries/email_form.php

Spacing +65 added lines, -65 removed lines

@@ -22,7 +22,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Email_form {

@@ -31,13 +31,13 @@ 
 	}

 

   function get_form_fields_email() {

-		 $form['forms'] = array(base_url() . 'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Resend Email'] = array(

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

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

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

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

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

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

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

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

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

             

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

 	           

@@ -49,15 +49,15 @@ 
 	}

 

 	function get_form_fields_email_edit() {

-	 $readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+	 $readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 	 $form['Resent Email'] = array(

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

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

-		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

 	           

 	 );

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

@@ -66,48 +66,48 @@ 
 	}

     

 	function get_form_fields_email_view() {

-		$readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['View Email'] = array(

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

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

-			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,'style'=>'margin-top: 3px;' ,'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Status', 'INPUT', array('name' => 'status', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'width: 18% !important;margin-top: 3px;' , 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),   

+			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Status', 'INPUT', array('name' => 'status', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'width: 18% !important;margin-top: 3px;', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),   

 	           

 );

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

 		return $form;

 	}

 	function get_form_fields_email_view_cus() {

-	 $readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+	 $readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		 $form['View Email'] = array(

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

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

-		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-	   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+	   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

             

-		array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;','class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

+		array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;', 'class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

 	           

 );

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

 		return $form;

 	}

 	function get_form_fields_email_view_cus_edit() {

-		$readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Resent Email'] = array(

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

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

-			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

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

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),           

+			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

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

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),           

 );

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

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

@@ -117,49 +117,49 @@ 
 	function build_list_for_email() {

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

 		$grid_field_arr = json_encode(array(

-			array("Date", "100", "date", "", "", "","","true","center"),

-			array("Account", "99", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

-			array("From", "145", "from", "", "", "","","true","center"),

-			array("To", "140", "to", "", "", "","","true","center"),

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

-			array("Body", "320", "body", "", "", "","","true","center"),

-			array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

-			array("Status", "70", "status", "status", "status", "email_status","","true","center"),

+			array("Date", "100", "date", "", "", "", "", "true", "center"),

+			array("Account", "99", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new", "", "true", "center"),

+			array("From", "145", "from", "", "", "", "", "true", "center"),

+			array("To", "140", "to", "", "", "", "", "true", "center"),

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

+			array("Body", "320", "body", "", "", "", "", "true", "center"),

+			array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons", "", "true", "center"),

+			array("Status", "70", "status", "status", "status", "email_status", "", "true", "center"),

 			array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit/", "mode" => "popup"),

-			"VIEW" => array("url" => "email/email_view/", "mode" => "popup","layout"=>"medium"),

+			"VIEW" => array("url" => "email/email_view/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "/email/email_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

 	}

 

-	function build_list_for_email_customer($accountid,$accounttype) {

+	function build_list_for_email_customer($accountid, $accounttype) {

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

 			   $grid_field_arr = json_encode(array(

-					array("Date", "140", "date", "", "", "","","true","center"),

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

-					array("Body", "350", "body", "", "", "","","true","center"),

-					array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

-					array("Status", "100", "status", "status", "status", "email_status","","true","center"),

+					array("Date", "140", "date", "", "", "", "", "true", "center"),

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

+					array("Body", "350", "body", "", "", "", "", "true", "center"),

+					array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons", "", "true", "center"),

+					array("Status", "100", "status", "status", "status", "email_status", "", "true", "center"),

 					array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit_customer/", "mode" => "popup"),

-							"VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup","layout"=>"medium"),

+							"VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup", "layout"=>"medium"),

 							"DELETE" => array("url" => "email/email_delete_customer/".$accounttype."/".$accountid."/", "mode" => "single")))

 					));

 		return $grid_field_arr;

 	}

 

-	function build_list_for_email_client_area(){

+	function build_list_for_email_client_area() {

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

 	if ($logintype == 1 || $logintype == 5) {

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

 			$loginid = $account_data['id'];

 

-		}else{

+		} else {

 			$loginid = "0";

 		}

-		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Filter'] = array(

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

-		  array('Account Type',array('name' => 'posttoexternal','class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

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

+		  array('Account Type', array('name' => 'posttoexternal', 'class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

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

 	  array('Entity Type', 'type', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_entity_type_email_mass'),

 	);

@@ -174,26 +174,26 @@ 
 		return $form;

 	} 

 	function get_form_fields_email_view_client($add_arr) {

-	if($add_arr['type'] == ''){

-	   $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

-	} else{

-	 $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id'],'type'=>$add_arr['type']), 'multi');

+	if ($add_arr['type'] == '') {

+	   $email_add = array('To', 'email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr', array('status'=>$add_arr['status'], 'posttoexternal'=>$add_arr['posttoexternal'], 'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

+	} else {

+	 $email_add = array('To', 'email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr', array('status'=>$add_arr['status'], 'posttoexternal'=>$add_arr['posttoexternal'], 'pricelist_id'=>$add_arr['pricelist_id'], 'type'=>$add_arr['type']), 'multi');

 	}

 

-		 $form['forms'] = array(base_url() . 'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Compose Email'] = array(

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

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

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

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

 			$email_add,

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

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

 );

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

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

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

 		return $form;

 	}

-	function build_grid_buttons_email(){

+	function build_grid_buttons_email() {

 	$buttons_json = json_encode(array(

 					));

 	return $buttons_json;

@@ -205,10 +205,10 @@ 
  'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

 			array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'customer_cdr_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

 			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "deleted" => "0")),

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

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

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

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

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

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

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

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

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

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

 		);

Braces +4 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

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

 

-if (!defined('BASEPATH'))

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

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

 class Email_form {

 	function __construct($library_name = '') {

@@ -153,7 +154,7 @@ 
 			$account_data = $this->CI->session->userdata("accountinfo");

 			$loginid = $account_data['id'];

 

-		}else{

+		} else{

 			$loginid = "0";

 		}

 		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

web_interface/astpp/application/modules/email/views/view_email_brod.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
               <div class="col-md-12">
             	<div class="w-box">
             	 <span  style="margin-left:10px; text-align: center;background-color: none;color:#1c8400;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
                         echo $error;
                     }?>
                  </span>

web_interface/astpp/application/modules/email/views/view_email_add_edit.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@
             </div>

             <?php echo $form; ?>

         </div>    

-        <?php if(isset($maildata) && $maildata != ''){

+        <?php if (isset($maildata) && $maildata != '') {

 		  echo "<div class='col-md-12 no-padding'>Attachments :</div>";

-		  $imgArr = explode(",",$maildata);

-		  foreach($imgArr as $key => $imgname){

+		  $imgArr = explode(",", $maildata);

+		  foreach ($imgArr as $key => $imgname) {

 			$imgpath = base_url()."email/email_history_list_attachment/".$imgname;

 			echo "<div class='col-md-4 no-padding'>

                   <a href='".$imgpath."'>".$imgname."</a>