iNextrix / ASTPP

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

Spacing +94 added lines, -94 removed lines

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

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

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

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class rates_form {

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

 	}

 	function get_termination_rate_form_fields() {

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

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

 		$form['Rate Information'] = array(

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

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

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

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

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

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

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

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

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

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

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

             

         

 );

 		$form['Billing Information'] = array(

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

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

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

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

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

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

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

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

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

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

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

 	

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

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

 

 	function get_origination_rate_form_fields() {

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

-		$trunk=null;

-		if($logintype !=1)

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

+		$trunk = null;

+		if ($logintype != 1)

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

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

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

 		$form['Rate Information'] = array(

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

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

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

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

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

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

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

 );

 		$form['Billing Information'] = array(

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

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

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

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

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

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

 /**

 ASTPP  3.0 

 For Add Initial Increment field

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

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

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

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

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

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

  /******

 ASTPP  3.0 

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

 Batch Delete

 ******/

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

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

 

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

 /******

 ASTPP  3.0 

 Batch Delete

 ******/

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

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

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

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

 

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

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

 		$form['Batch Update'] = array(

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

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

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

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

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

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

             

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

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

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

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

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

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

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

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

 		);

 

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

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

 	}

 	function origination_rate_batch_update_form() {

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

-			$trunk=null;

-		if($logintype !=1)

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

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

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

+			$trunk = null;

+		if ($logintype != 1)

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

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

 		$form['Batch Update'] = array(

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

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

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

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

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

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

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

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

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

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

 		   $trunk,

 		);

 

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

 			 

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

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

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

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

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

 			 

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

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

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

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

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

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

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

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

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

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

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

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

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

 				));

 		return $grid_field_arr;

 	}

 	function get_reseller_origination_rate_search_form() {

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

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

 	

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

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

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

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

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

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

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

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

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

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

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

 Batch Delete

 ******/

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

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

 

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

 /******** 

 ASTPP  3.0 

 Batch delete

 *********/

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

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

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

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

 

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

 	function build_termination_rate_for_admin() {

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

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

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

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

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

 		

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

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

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

 /**

 ASTPP  3.0

 For Termination Rate edit on Code

 **/

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 		   /*

             ASTPP  3.0 

             creation field show in grid

             */

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

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

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

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

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

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

 			 /*

             ASTPP  3.0

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

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

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

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

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

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

 				));

 		return $grid_field_arr;

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

 	function build_origination_rate_list_for_admin() {

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

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

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

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

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

 		

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

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

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

 /**

 ASTPP  3.0 

 For Origination rate edit on code

 **/

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

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

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

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

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

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

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

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

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

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

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

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

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

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

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

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

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

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

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

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

 			/*

             ASTPP  3.0  creation field show in grid

             */

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

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

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

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

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

 

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

 			/*

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

             */

             

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

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

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

 				));

 		return $grid_field_arr;

@@ -362,19 +362,19 @@ 
 	/****************************************************************************************/

 

 	function build_grid_buttons() {

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

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

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

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

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

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

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

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

 			));

 		return $buttons_json;

 	}

 

 	function build_grid_buttons_origination_rate() {

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

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

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

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

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

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

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

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

             

 			));

 		return $buttons_json;

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

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

 		$grid_field_arr = json_encode(array(

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

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

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

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

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

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

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

 		$grid_field_arr = json_encode(array(

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

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

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

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

 				));

 		return $grid_field_arr;

 	}

-	function build_pattern_list_for_customer($accountid,$accounttype) {

+	function build_pattern_list_for_customer($accountid, $accounttype) {

 

 		$grid_field_arr = json_encode(array(

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

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

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

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

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

@@ -416,7 +416,7 @@ 
 	}

 

 	function set_pattern_grid_buttons($accountid) {

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

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

 		return $buttons_json;

 	}

 

@@ -434,7 +434,7 @@ 
 

 

 function build_grid_buttons_rates() {

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

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

 		return $buttons_json;

 	}

 

Braces +9 added lines, -6 removed lines

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

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

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

-if (!defined('BASEPATH'))

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

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

 class rates_form {

 	function __construct($library_name = '') {

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

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

 		$trunk=null;

-		if($logintype !=1)

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

+		if($logintype !=1) {
+			  $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"));
+		}
 		$form['forms'] = array(base_url() . 'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));

 		$form['Rate Information'] = array(

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

@@ -165,8 +167,9 @@ 
 	function origination_rate_batch_update_form() {

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

 			$trunk=null;

-		if($logintype !=1)

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

+		if($logintype !=1) {
+			  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type');
+		}
 		$form['forms'] = array("rates/origination_rate_batch_update/",array('id' => "origination_rate_batch_update"));        

 		$form['Batch Update'] = array(

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

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

Spacing +9 added lines, -9 removed lines

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

Braces +1 added lines, -1 removed lines

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

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

Spacing +12 added lines, -12 removed lines

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

Braces +1 added lines, -1 removed lines

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

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

Spacing +20 added lines, -20 removed lines

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

Braces +1 added lines, -1 removed lines

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

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

Indentation +426 added lines, -426 removed lines

@@ -24,468 +24,468 @@
 
 class Signup extends MX_Controller {
 
-    function signup() {
-        parent::__construct();
-        $this->load->model('signup_model');
-        $this->load->helper('captcha');
-        $this->load->helper('template_inheritance');
-        //$this->load->library('form_validation');
-        $this->load->library('astpp/common');
-        $this->load->library('astpp/email_lib');
-        $this->load->model('db_model');
-        $this->load->model('common_model');
-        $this->load->library('session');
-        $this->load->library('encrypt');
-        $this->load->model('Astpp_common');
-
-        error_reporting(-1);
-        ini_set('display_errors', 'On');
-
-        $data['row'] = $this->signup_model->get_rate();
-    }
-
-    function index($key = "") {
-
-        if (Common_model::$global_config['system_config']['enable_signup'] == 1)
+	function signup() {
+		parent::__construct();
+		$this->load->model('signup_model');
+		$this->load->helper('captcha');
+		$this->load->helper('template_inheritance');
+		//$this->load->library('form_validation');
+		$this->load->library('astpp/common');
+		$this->load->library('astpp/email_lib');
+		$this->load->model('db_model');
+		$this->load->model('common_model');
+		$this->load->library('session');
+		$this->load->library('encrypt');
+		$this->load->model('Astpp_common');
+
+		error_reporting(-1);
+		ini_set('display_errors', 'On');
+
+		$data['row'] = $this->signup_model->get_rate();
+	}
+
+	function index($key = "") {
+
+		if (Common_model::$global_config['system_config']['enable_signup'] == 1)
 		{
-    		redirect(base_url());
+			redirect(base_url());
 		}
 
-        $userCaptcha = $this->input->post('userCaptcha');
-        $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-        $accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
-        $data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
-        $data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
-        $data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
-
-        $vals = array(
-            'word' => $random_number,
-            'img_path' => getcwd().'/assets/captcha/',
-            'img_url' => base_url().'assets/captcha/',
-            //'font_path' => './fonts/impact.ttf',
-            'img_width' => '243',
-            'img_height' => '50',
-            'expiration' => '3600'
-        );
-
-        if (isset($key) && $key != '') {
-            $data['key_unique'] = $key;
-        } else {
-            $data['key_unique'] = "admin";
-        }
-        $unique = $data['key_unique'];
-
-        if ($unique != "admin") {
-            $unique = $this->common->decode_params(trim($unique));
-            $decoded_str = $this->common->decode($unique);
-            $unique = $decoded_str;
-            $query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
-            if ($query->num_rows() == 0) {
-                redirect(base_url()."signup/signup_inactive");
-            }
-            if ($query->num_rows() > 0) {
-                $query = $query->result_array();
-                $query = $query[0];
-
-                if ($query['status'] != 0) {
-                    redirect(base_url()."signup/signup_inactive");
-                }
-            }
-        }
-        $data['captcha'] = create_captcha($vals);
-        $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-        $this->load->view('view_signup', $data);
-    }
-
-    public function check_captcha($str) {
-        $word = $this->session->userdata('captchaWord');
-        if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
-            return true;
-        } else {
-            $this->form_validation->set_message('check_captcha', 'Please enter correct words!');
-            return false;
-        }
-    }
-
-    function terms_check() {
-        if (isset($_POST['agreeCheck'])) {
-                    return true;
-        }
-        $this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
-        return false;
-    }
-
-     function signup_save($id = "") {
-        if (empty($_POST)) {
-            redirect(base_url()."signup/");
-        } else {
-            $post_values = $this->input->post();
-            $userCaptcha = $this->input->post('userCaptcha');
-            $cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
-
-            if ($userCaptcha != $this->session->userdata('captchaWord') || ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
-                if ( ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
-                }
-                if ($userCaptcha != $this->session->userdata('captchaWord')) {
-                    $data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
-                }
-                if ($cnt_result > 0) {
-                    $data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
-                }
-                $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-                $vals = array(
-                    'word' => $random_number,
-                    'img_path' => getcwd().'/assets/captcha/',
-                    'img_url' => base_url().'assets/captcha/',
-                    //'font_path' => './fonts/impact.ttf',
-                    'img_width' => '243',
-                    'img_height' => '50',
-                    'expiration' => '3600'
-                );
-                //echo "<pre>"; print_r($_POST); exit;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
-                    $data['key_unique'] = $_POST['key_unique'];
-                }
+		$userCaptcha = $this->input->post('userCaptcha');
+		$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+		$accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
+		$data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
+		$data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
+		$data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
+
+		$vals = array(
+			'word' => $random_number,
+			'img_path' => getcwd().'/assets/captcha/',
+			'img_url' => base_url().'assets/captcha/',
+			//'font_path' => './fonts/impact.ttf',
+			'img_width' => '243',
+			'img_height' => '50',
+			'expiration' => '3600'
+		);
+
+		if (isset($key) && $key != '') {
+			$data['key_unique'] = $key;
+		} else {
+			$data['key_unique'] = "admin";
+		}
+		$unique = $data['key_unique'];
+
+		if ($unique != "admin") {
+			$unique = $this->common->decode_params(trim($unique));
+			$decoded_str = $this->common->decode($unique);
+			$unique = $decoded_str;
+			$query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
+			if ($query->num_rows() == 0) {
+				redirect(base_url()."signup/signup_inactive");
+			}
+			if ($query->num_rows() > 0) {
+				$query = $query->result_array();
+				$query = $query[0];
+
+				if ($query['status'] != 0) {
+					redirect(base_url()."signup/signup_inactive");
+				}
+			}
+		}
+		$data['captcha'] = create_captcha($vals);
+		$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+		$this->load->view('view_signup', $data);
+	}
+
+	public function check_captcha($str) {
+		$word = $this->session->userdata('captchaWord');
+		if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
+			return true;
+		} else {
+			$this->form_validation->set_message('check_captcha', 'Please enter correct words!');
+			return false;
+		}
+	}
+
+	function terms_check() {
+		if (isset($_POST['agreeCheck'])) {
+					return true;
+		}
+		$this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
+		return false;
+	}
+
+	 function signup_save($id = "") {
+		if (empty($_POST)) {
+			redirect(base_url()."signup/");
+		} else {
+			$post_values = $this->input->post();
+			$userCaptcha = $this->input->post('userCaptcha');
+			$cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
+
+			if ($userCaptcha != $this->session->userdata('captchaWord') || ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
+				if ( ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
+				}
+				if ($userCaptcha != $this->session->userdata('captchaWord')) {
+					$data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
+				}
+				if ($cnt_result > 0) {
+					$data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
+				}
+				$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+				$vals = array(
+					'word' => $random_number,
+					'img_path' => getcwd().'/assets/captcha/',
+					'img_url' => base_url().'assets/captcha/',
+					//'font_path' => './fonts/impact.ttf',
+					'img_width' => '243',
+					'img_height' => '50',
+					'expiration' => '3600'
+				);
+				//echo "<pre>"; print_r($_POST); exit;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
+					$data['key_unique'] = $_POST['key_unique'];
+				}
 
 				$accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
 				$data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
 				$data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
 				$data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
 
-                $data['timezone_id'] = ( ! $data['timezone_id']) ? 1 : $data['timezone_id'];
-                $data['currency_id'] = ( ! $data['currency_id']) ? 1 : $data['currency_id'];
-                $data['country_id'] = ( ! $data['country_id']) ? 1 : $data['country_id'];
+				$data['timezone_id'] = ( ! $data['timezone_id']) ? 1 : $data['timezone_id'];
+				$data['currency_id'] = ( ! $data['currency_id']) ? 1 : $data['currency_id'];
+				$data['country_id'] = ( ! $data['country_id']) ? 1 : $data['country_id'];
 
-                $data['value'] = $post_values;
-                $data['captcha'] = create_captcha($vals);
+				$data['value'] = $post_values;
+				$data['captcha'] = create_captcha($vals);
 
-                $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-                $data['key_unique'] = $_POST['key_unique'];
-                $this->load->view('view_signup', $data);
-            } else {
-                //AVTLATP		
-                $user_data = $this->input->post();
+				$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+				$data['key_unique'] = $_POST['key_unique'];
+				$this->load->view('view_signup', $data);
+			} else {
+				//AVTLATP		
+				$user_data = $this->input->post();
                
-                if ( ! isset($_POST['key_unique']) || ! isset($_POST['email'])) {
-                    redirect(base_url()."signup/");
-                }
-                $reseller_id = 0;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
-                    $_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
-                    $decoded_str = $this->common->decode($_POST['key_unique']);
-                    $_POST['key_unique'] = $decoded_str;
-                    $user_data['key_unique'] = $_POST['key_unique'];
-                    $reseller_id = $user_data['key_unique'];
-                }
-                //echo "<pre>"; print_r($_POST); exit;
-                //AVTLATP
-                //Data want to insert or update
-                $user_data['status'] = "1";
-                $user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
-
-                $user_data['password'] = $this->common->encode($this->common->generate_password());
-                $user_data['pin'] = $this->common->generate_password();
-                $user_data['reseller_id'] = $reseller_id;
-                $user_data['posttoexternal'] = "0";
-
-                unset($user_data['userCaptcha']);
-                unset($user_data['action']);
-
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-
-                /* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
+				if ( ! isset($_POST['key_unique']) || ! isset($_POST['email'])) {
+					redirect(base_url()."signup/");
+				}
+				$reseller_id = 0;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
+					$_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
+					$decoded_str = $this->common->decode($_POST['key_unique']);
+					$_POST['key_unique'] = $decoded_str;
+					$user_data['key_unique'] = $_POST['key_unique'];
+					$reseller_id = $user_data['key_unique'];
+				}
+				//echo "<pre>"; print_r($_POST); exit;
+				//AVTLATP
+				//Data want to insert or update
+				$user_data['status'] = "1";
+				$user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
+
+				$user_data['password'] = $this->common->encode($this->common->generate_password());
+				$user_data['pin'] = $this->common->generate_password();
+				$user_data['reseller_id'] = $reseller_id;
+				$user_data['posttoexternal'] = "0";
+
+				unset($user_data['userCaptcha']);
+				unset($user_data['action']);
+
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+
+				/* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
                   $query = $query->result_array(); */
 
-                $company_website = $system_config["company_website"];
-                $company_name = $system_config["company_name"];
+				$company_website = $system_config["company_website"];
+				$company_name = $system_config["company_name"];
 
-                //echo $company_name; exit;
-                $selection_rategroup_signup = $system_config["default_signup_rategroup"];
+				//echo $company_name; exit;
+				$selection_rategroup_signup = $system_config["default_signup_rategroup"];
 
-                if ($reseller_id != 0) {
-                    $result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
-                    $result_arr = $result->result_array();
-                    $selection_rategroup_signup = $result_arr[0]['id'];
-                    $user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0) ? $selection_rategroup_signup : 0;
-                } else {
-                    $pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
-                    /* if($pricelis_id != "")
+				if ($reseller_id != 0) {
+					$result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
+					$result_arr = $result->result_array();
+					$selection_rategroup_signup = $result_arr[0]['id'];
+					$user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0) ? $selection_rategroup_signup : 0;
+				} else {
+					$pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
+					/* if($pricelis_id != "")
                       $user_data['pricelist_id'] = $pricelis_id;
                       else
                       $user_data['pricelist_id'] = 0; */
-                    $user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
-                }
-                $last_id = '0';
-                //Insert or Update record
-                $signup_sipdevice_flag = $system_config['create_sipdevice'];
-                $last_id = $this->signup_model->add_user($user_data);
-                if ($last_id == "") {
-                    redirect(base_url()."signup/signup_inactive");
-                }
-                if ($signup_sipdevice_flag == '0') {
-                    $query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
-                    $sip_id = $query->result_array();
-                    if ($reseller_id > 0) {
+					$user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
+				}
+				$last_id = '0';
+				//Insert or Update record
+				$signup_sipdevice_flag = $system_config['create_sipdevice'];
+				$last_id = $this->signup_model->add_user($user_data);
+				if ($last_id == "") {
+					redirect(base_url()."signup/signup_inactive");
+				}
+				if ($signup_sipdevice_flag == '0') {
+					$query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
+					$sip_id = $query->result_array();
+					if ($reseller_id > 0) {
 						$reseller_id = $reseller_id;
 					} else {
 						$reseller_id = '0';
 					}
-                    $free_switch_array = array('fs_username' => $user_data['number'],
-                        'fs_password' => $user_data['password'],
-                        'context' => 'default',
-                        'effective_caller_id_name' => $user_data['number'],
-                        'effective_caller_id_number' => $user_data['number'],
-                        'sip_profile_id' => $sip_id[0]['id'],
-                        'reseller_id' => $reseller_id,
-                        'pricelist_id' => $user_data['pricelist_id'],
-                        'accountcode' => $last_id,
-                        'status' => $user_data['status'],
-                        'voicemail_enabled'=>true,
-                        'voicemail_password'=>'',
-                        'voicemail_mail_to'=>'',
-                        'voicemail_attach_file'=>true,
-                        'vm_keep_local_after_email'=>true,
-                        'vm_send_all_message'=>true,
-                        );
-                    $user_custom_array = array_merge($user_data, $free_switch_array);
-                    $user_custom_array['id'] = $last_id;
-                    $user_custom_array['email'] = $user_data['email'];
+					$free_switch_array = array('fs_username' => $user_data['number'],
+						'fs_password' => $user_data['password'],
+						'context' => 'default',
+						'effective_caller_id_name' => $user_data['number'],
+						'effective_caller_id_number' => $user_data['number'],
+						'sip_profile_id' => $sip_id[0]['id'],
+						'reseller_id' => $reseller_id,
+						'pricelist_id' => $user_data['pricelist_id'],
+						'accountcode' => $last_id,
+						'status' => $user_data['status'],
+						'voicemail_enabled'=>true,
+						'voicemail_password'=>'',
+						'voicemail_mail_to'=>'',
+						'voicemail_attach_file'=>true,
+						'vm_keep_local_after_email'=>true,
+						'vm_send_all_message'=>true,
+						);
+					$user_custom_array = array_merge($user_data, $free_switch_array);
+					$user_custom_array['id'] = $last_id;
+					$user_custom_array['email'] = $user_data['email'];
                    
-                    $this->load->model('freeswitch/freeswitch_model');
-                    $this->freeswitch_model->add_freeswith($user_custom_array);
-                }
-             // echo "<pre>"; print_r ($user_data); exit;
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url().'signup/signup_confirm?email='.urlencode($user_data['email'])."&key=".urlencode($activation);
-                $user_data['confirm'] = $message;
-
-                $this->send_mail($last_id, 'email_signup_confirmation', $user_data);
-                redirect(base_url()."signup/signup_success");
-            }
-        }
-    }
-
-    function signup_confirm() {
-        if ( ! empty($_GET)) {
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-            $accno = $this->encrypt->decode($_GET['key']);
-            $email = $_GET['email'];
-            $success = $this->signup_model->check_user($accno, $email, $balance);
-            $query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
-            $data = $query->result_array();
-            $user_data = $data[0];
-            $user_data['accountid'] = $user_data['id'];
-            $user_data['success'] = $success;
-            $user_data['balance'] = $balance;
-            $user_data['confirm'] = base_url();
-            $this->active($user_data, $success);
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function signup_success() {
-        $this->load->view('view_signup_success');
-    }
-
-    function signup_inactive() {
-        $this->load->view('view_signup_inactive');
-    }
-
-    function active($user_data, $success) {
-        $data['user_data'] = $user_data;
-        $data['user_data']['success'] = $success;
-
-        if ($user_data['success']) {
+					$this->load->model('freeswitch/freeswitch_model');
+					$this->freeswitch_model->add_freeswith($user_custom_array);
+				}
+			 // echo "<pre>"; print_r ($user_data); exit;
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url().'signup/signup_confirm?email='.urlencode($user_data['email'])."&key=".urlencode($activation);
+				$user_data['confirm'] = $message;
+
+				$this->send_mail($last_id, 'email_signup_confirmation', $user_data);
+				redirect(base_url()."signup/signup_success");
+			}
+		}
+	}
+
+	function signup_confirm() {
+		if ( ! empty($_GET)) {
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+			$accno = $this->encrypt->decode($_GET['key']);
+			$email = $_GET['email'];
+			$success = $this->signup_model->check_user($accno, $email, $balance);
+			$query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
+			$data = $query->result_array();
+			$user_data = $data[0];
+			$user_data['accountid'] = $user_data['id'];
+			$user_data['success'] = $success;
+			$user_data['balance'] = $balance;
+			$user_data['confirm'] = base_url();
+			$this->active($user_data, $success);
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function signup_success() {
+		$this->load->view('view_signup_success');
+	}
+
+	function signup_inactive() {
+		$this->load->view('view_signup_inactive');
+	}
+
+	function active($user_data, $success) {
+		$data['user_data'] = $user_data;
+		$data['user_data']['success'] = $success;
+
+		if ($user_data['success']) {
 			$user_data['password'] = $this->common->decode($user_data['password']);
-            $this->send_mail($user_data['id'], 'email_add_user', $user_data);
-        }
-        $this->load->view('view_signup_active', $data);
-    }
-
-    function forgotpassword() {
-        $this->load->view('view_forgotpassword');
-    }
-
-    function confirmpassword() {
-        $email = $_POST['email'];       
-        unset($_POST['action']);        
-        $where = array('email' => $email);
-        $this->db->where($where);
-        $this->db->or_where('number', $email);
-        $cnt_result = $this->db_model->countQuery("*", 'accounts', "");
-        if ( ! empty($email)) {
-            $names = array('0', '1', '3');
-            $this->db->where_in('type', $names);
-            $where_arr = array("email" => $email);
-            $this->db->where($where_arr);
+			$this->send_mail($user_data['id'], 'email_add_user', $user_data);
+		}
+		$this->load->view('view_signup_active', $data);
+	}
+
+	function forgotpassword() {
+		$this->load->view('view_forgotpassword');
+	}
+
+	function confirmpassword() {
+		$email = $_POST['email'];       
+		unset($_POST['action']);        
+		$where = array('email' => $email);
+		$this->db->where($where);
+		$this->db->or_where('number', $email);
+		$cnt_result = $this->db_model->countQuery("*", 'accounts', "");
+		if ( ! empty($email)) {
+			$names = array('0', '1', '3');
+			$this->db->where_in('type', $names);
+			$where_arr = array("email" => $email);
+			$this->db->where($where_arr);
 			$this->db->or_where('number', $email);
-            $acountdata = $this->db_model->getSelect("*", "accounts", "");
-            if ($acountdata->num_rows() > 0) {
-                $user_data = $acountdata->result_array();
-                $user_data = $user_data[0];
-                if ($user_data['status'] > 0) {
-                    $data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-                    exit;
-                }
-            }            
-            if ($acountdata->num_rows() == 0 && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                if ( ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                } else {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                }
-            } else if ($acountdata->num_rows() == 0) {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-            } else {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
+			$acountdata = $this->db_model->getSelect("*", "accounts", "");
+			if ($acountdata->num_rows() > 0) {
+				$user_data = $acountdata->result_array();
+				$user_data = $user_data[0];
+				if ($user_data['status'] > 0) {
+					$data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
+					$this->load->view('view_forgotpassword', $data);
+					exit;
+				}
+			}            
+			if ($acountdata->num_rows() == 0 && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+				if ( ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				} else {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				}
+			} else if ($acountdata->num_rows() == 0) {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+					$this->load->view('view_forgotpassword', $data);
+			} else {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
                 
-                $email = $this->encrypt->encode($user_data['email']);
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url().'confirm_pass?email='.urlencode($email)."&key=".urlencode($activation);
-                $user_data['confirm'] = $message;
-                $where = array("email" => $user_data['email']);
-                $data = array("pass_link_status" => 1);
-                $this->db->where($where);
-                $this->db->update('accounts', $data);
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-                $this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
-                $this->load->view('view_forgot_success');
-            }
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function confirm_pass() {
-        $confirm_pass = $_GET;
-        $accno = '';
-        $balance = '';
-        $email1 = $this->encrypt->decode($confirm_pass['email']);
-        $success = $this->signup_model->check_user($accno, $email1, $balance);
-        if ( ! empty($confirm_pass)) {
-            $where_arr = array("email" => $email1, "status" => 0);
-            $acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-                $updateArr = array("pass_link_status" => 0);
-                $this->db->where(array("email" => $email1));
-                $this->db->update("accounts", $updateArr);
-                if ($user_data['pass_link_status'] == '0') {
-                    $user_data['success'] = $success;
-                    $data['user_data'] = $user_data;
-                    $this->active($user_data, $success);
-                } else {
-                    $data['email'] = $_GET['email'];
-                    $this->load->view('view_confirmpassword', $data);
-                }
-            }
-        }
-    }
-
-    function confirmpass() {
-        $passwordconf = $_POST;
-        $email1 = $this->encrypt->decode($passwordconf['email']);
-        if ( ! empty($passwordconf)) {
-            $acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
-            //echo $this->db->last_query();exit;
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-            }
-            $user_data['password'] = $this->common->encode($passwordconf['password']);
-            $updateArr = array("password" => $user_data['password']);
-            $where_arr = array("email" => $email1, "status" => 0);
-            $this->db->where($where_arr);
-            $this->db->update("accounts", $updateArr);
-            //$activation = $this->encrypt->encode($user_data['number']);
-            $message = base_url();
-            $user_data['confirm'] = $message;
-            $user_data['password'] = $passwordconf['password'];
-
-
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-
-            $this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
-
-            $this->successpassword();
-        }
-    }
-
-    /**
-     * @param string $temp_name
-     */
-    function send_mail($account_id, $temp_name, $user_data) {
+				$email = $this->encrypt->encode($user_data['email']);
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url().'confirm_pass?email='.urlencode($email)."&key=".urlencode($activation);
+				$user_data['confirm'] = $message;
+				$where = array("email" => $user_data['email']);
+				$data = array("pass_link_status" => 1);
+				$this->db->where($where);
+				$this->db->update('accounts', $data);
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+				$this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
+				$this->load->view('view_forgot_success');
+			}
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function confirm_pass() {
+		$confirm_pass = $_GET;
+		$accno = '';
+		$balance = '';
+		$email1 = $this->encrypt->decode($confirm_pass['email']);
+		$success = $this->signup_model->check_user($accno, $email1, $balance);
+		if ( ! empty($confirm_pass)) {
+			$where_arr = array("email" => $email1, "status" => 0);
+			$acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+				$updateArr = array("pass_link_status" => 0);
+				$this->db->where(array("email" => $email1));
+				$this->db->update("accounts", $updateArr);
+				if ($user_data['pass_link_status'] == '0') {
+					$user_data['success'] = $success;
+					$data['user_data'] = $user_data;
+					$this->active($user_data, $success);
+				} else {
+					$data['email'] = $_GET['email'];
+					$this->load->view('view_confirmpassword', $data);
+				}
+			}
+		}
+	}
+
+	function confirmpass() {
+		$passwordconf = $_POST;
+		$email1 = $this->encrypt->decode($passwordconf['email']);
+		if ( ! empty($passwordconf)) {
+			$acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
+			//echo $this->db->last_query();exit;
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+			}
+			$user_data['password'] = $this->common->encode($passwordconf['password']);
+			$updateArr = array("password" => $user_data['password']);
+			$where_arr = array("email" => $email1, "status" => 0);
+			$this->db->where($where_arr);
+			$this->db->update("accounts", $updateArr);
+			//$activation = $this->encrypt->encode($user_data['number']);
+			$message = base_url();
+			$user_data['confirm'] = $message;
+			$user_data['password'] = $passwordconf['password'];
+
+
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+
+			$this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
+
+			$this->successpassword();
+		}
+	}
+
+	/**
+	 * @param string $temp_name
+	 */
+	function send_mail($account_id, $temp_name, $user_data) {
 		
 		
-        $system_config = common_model::$global_config['system_config'];
-        //$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);
+		$system_config = common_model::$global_config['system_config'];
+		//$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);
         
         
      
         
-        $where = array('name' => $temp_name);
-        $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        $reseller_id = ($user_data['reseller_id'] > 0) ? $user_data['reseller_id'] : 1;
-        $where = "accountid IN ('".$reseller_id."','1')";
-        $this->db->where($where);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
-        $company_email = $invoiceconf['emailaddress'];
-        $company_website = $invoiceconf["website"];
-        $company_name = $invoiceconf["company_name"];
+		$where = array('name' => $temp_name);
+		$EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
+		$reseller_id = ($user_data['reseller_id'] > 0) ? $user_data['reseller_id'] : 1;
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->where($where);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
+		$company_email = $invoiceconf['emailaddress'];
+		$company_website = $invoiceconf["website"];
+		$company_name = $invoiceconf["company_name"];
         
-        $TemplateData = array();
+		$TemplateData = array();
         
         
-        foreach ($EmailTemplate->result_array() as $value) {
-            $TemplateData = $value;
-            $TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
-        }
-        $email_array = array('accountid' => $account_id,
-            'subject' => $TemplateData['subject'],
-            'body' => $TemplateData['template'],
-            'from' => $invoiceconf['emailaddress'],
-            'to' => $user_data['email'],
-            'status' => "1",
-            //'attachment'=> $Filenm,
-            'template' => '');
-        //echo "<pre>"; print_r($TemplateData); exit;
-        $this->db->insert("mail_details", $email_array);
-        return true;
-    }
-
-    function successpassword() {
-        $this->load->view('view_successpassword');
-    }
+		foreach ($EmailTemplate->result_array() as $value) {
+			$TemplateData = $value;
+			$TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['subject']);
+			$TemplateData['template'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
+		}
+		$email_array = array('accountid' => $account_id,
+			'subject' => $TemplateData['subject'],
+			'body' => $TemplateData['template'],
+			'from' => $invoiceconf['emailaddress'],
+			'to' => $user_data['email'],
+			'status' => "1",
+			//'attachment'=> $Filenm,
+			'template' => '');
+		//echo "<pre>"; print_r($TemplateData); exit;
+		$this->db->insert("mail_details", $email_array);
+		return true;
+	}
+
+	function successpassword() {
+		$this->load->view('view_successpassword');
+	}
 
 }
 ?>

web_interface/astpp/application/modules/signup/views/view_forgotpassword.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
             <div class="row">
                 <div class="col-md-4 col-md-offset-4">&nbsp;
 					<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-						<?php }else{
+						<?php } else {
 						 echo "&nbsp;";
 						} ?>
                     </span>

Braces +11 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 					<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-						<?php }else{
+						<?php } else{
 						 echo "&nbsp;";
 						} ?>
                     </span>
@@ -78,10 +78,18 @@ 
 										<div class="input-group col-md-12 margin-t-15 padding-r-32 padding-l-32">
 												<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
 
-												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) echo  $value['email']; else ''; ?>" style="height:40px;">
+												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) {
+	echo  $value['email'];
+} else {
+	'';
+}
+?>" style="height:40px;">
 										</div> 
 
-												<?php if (isset($error['email'])) echo $error['email']; ?>              
+												<?php if (isset($error['email'])) {
+	echo $error['email'];
+}
+?>              
 											<div style="width: 97.67%; float: left;text-align: left; margin: 2% 22%;">
 													<span id="e_name" style="color:red;"> </span>
 											</div>

web_interface/astpp/application/modules/signup/views/view_confirmpassword.php

Braces +20 added lines, -4 removed lines

@@ -77,16 +77,32 @@
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="password" required value="<?php if (isset($value['password'])) echo  $value['password']; else ''; ?>" id="password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) echo $error['password']; ?></div>
+<input type="text" name="password" required value="<?php if (isset($value['password'])) {
+	echo  $value['password'];
+} else {
+	'';
+}
+?>" id="password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) {
+	echo $error['password'];
+}
+?></div>
 </div>
 </div>
 
 <div class="col-md-12 margin-t-10 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Confirm Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) echo  $value['confirm_password']; else ''; ?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) echo $error['confirm_password']; ?></div>
+<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) {
+	echo  $value['confirm_password'];
+} else {
+	'';
+}
+?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) {
+	echo $error['confirm_password'];
+}
+?></div>
 </div>
 </div>
 

web_interface/astpp/application/modules/signup/views/view_signup_active.php

Spacing +2 added lines, -2 removed lines

@@ -35,9 +35,9 @@
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else{
                          echo "&nbsp;";
                     } ?>
                     </span></div> <br/>

web_interface/astpp/application/modules/signup/views/view_signup.php

Spacing +2 added lines, -2 removed lines

@@ -95,9 +95,9 @@
             <div class="row">

                 <div class="col-md-4 col-md-offset-4">&nbsp;

 					<span class="login_error">

-                        <?php if (isset($astpp_notification)){ ?>

+                        <?php if (isset($astpp_notification)) { ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-						<?php }else{

+						<?php } else {

 						 echo "&nbsp;";

 						} ?>

                     </span>

Braces +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 					<span class="login_error">

                         <?php if (isset($astpp_notification)){ ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-						<?php }else{

+						<?php } else{

 						 echo "&nbsp;";

 						} ?>

                     </span>