iNextrix / ASTPP

web_interface/astpp/application/modules/did/libraries/did_form.php

Spacing +255 added lines, -255 removed lines

@@ -21,18 +21,18 @@ 
 // 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 did_form {
 	function __construct() {
-		$this->CI = & get_instance ();
+		$this->CI = & get_instance();
 	}
 	function get_dids_form_fields($id = false, $parent_id = '0', $account_id = '0', $country_id = false) {
 		if ($id != 0) {
 			if ($parent_id > 0) {
-				$account_dropdown = array (
+				$account_dropdown = array(
 						'Reseller',
-						array (
+						array(
 								'name' => 'parent_id',
 								'disabled' => 'disabled',
 								'class' => 'accountid',
@@ -48,7 +48,7 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "1",
 								"deleted" => "0",
@@ -57,9 +57,9 @@ 
 				);
 			} else {
 				if ($account_id > 0) {
-					$account_dropdown = array (
+					$account_dropdown = array(
 							'Account ',
-							array (
+							array(
 									'name' => 'accountid',
 									'disabled' => 'disabled',
 									'class' => 'accountid',
@@ -75,7 +75,7 @@ 
 							'accounts',
 							'build_concat_dropdown',
 							'where_arr',
-							array (
+							array(
 									"reseller_id" => "0",
 									"type" => "0,3",
 									"deleted" => "0",
@@ -83,12 +83,12 @@ 
 							) 
 					);
 				} else {
-					$account_dropdown = array (
+					$account_dropdown = array(
 							'Account',
 							'accountid',
 							'SELECT',
 							'',
-							array (
+							array(
 									"name" => "accountid",
 									"rules" => "did_account_checking" 
 							),
@@ -99,7 +99,7 @@ 
 							'accounts',
 							'build_concat_dropdown',
 							'where_arr',
-							array (
+							array(
 									"reseller_id" => "0",
 									"type" => "0,3",
 									"deleted" => "0",
@@ -109,12 +109,12 @@ 
 				}
 			}
 		} else {
-			$account_dropdown = array (
+			$account_dropdown = array(
 					'Account',
 					'accountid',
 					'SELECT',
 					'',
-					array (
+					array(
 							"name" => "accountid",
 							"rules" => "did_account_checking" 
 					),
@@ -125,7 +125,7 @@ 
 					'accounts',
 					'build_concat_dropdown',
 					'where_arr',
-					array (
+					array(
 							"reseller_id" => "0",
 							"type" => "0,3",
 							"deleted" => "0",
@@ -133,17 +133,17 @@ 
 					) 
 			);
 		}
-		if (! $country_id) {
+		if ( ! $country_id) {
 			
-			$country = array (
+			$country = array(
 					'Country',
-					array (
+					array(
 							'name' => 'country_id',
 							'class' => 'country_id' 
 					),
 					'SELECT',
 					'',
-					array (
+					array(
 							"name" => "country_id",
 							"rules" => "required" 
 					),
@@ -157,16 +157,16 @@ 
 					'' 
 			);
 		} else {
-			$country = array (
+			$country = array(
 					'Country',
-					array (
+					array(
 							'name' => 'country_id',
 							'class' => 'country_id',
 							'vlaue' => $country_id 
 					),
 					'SELECT',
 					'',
-					array (
+					array(
 							"name" => "country_id",
 							"rules" => "required",
 							'selected' => 'selected' 
@@ -182,20 +182,20 @@ 
 			);
 		}
 		
-		$val = $id > 0 ? 'dids.number.' . $id : 'dids.number';
-		$form ['forms'] = array (
-				base_url () . '/did/did_save/',
-				array (
+		$val = $id > 0 ? 'dids.number.'.$id : 'dids.number';
+		$form ['forms'] = array(
+				base_url().'/did/did_save/',
+				array(
 						'id' => 'did_form',
 						'method' => 'POST',
 						'name' => 'did_form' 
 				) 
 		);
-		$form ['DID Information'] = array (
-				array (
+		$form ['DID Information'] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -203,24 +203,24 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'DID' ),
+				array(
+						gettext('DID'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'number',
 								'size' => '20',
 								'class' => "text field medium" 
 						),
-						'trim|required|is_numeric|xss_clean|integer|is_unique[' . $val . ']',
+						'trim|required|is_numeric|xss_clean|integer|is_unique['.$val.']',
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
 				$country,
 				
-				array (
-						gettext ( 'City' ),
+				array(
+						gettext('City'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'city',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -229,10 +229,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Province' ),
+				array(
+						gettext('Province'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'province',
 								'size' => '15',
 								'class' => "text field medium" 
@@ -241,8 +241,8 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Provider' ),
+				array(
+						gettext('Provider'),
 						'provider_id',
 						'SELECT',
 						'',
@@ -254,7 +254,7 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"type" => "3",
 								"deleted" => "0",
 								"status" => "0" 
@@ -262,12 +262,12 @@ 
 				) 
 		);
 		
-		$form ['Billing Information'] = array (
+		$form ['Billing Information'] = array(
 				$account_dropdown,
-				array (
-						gettext ( 'Connection Cost' ),
+				array(
+						gettext('Connection Cost'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'connectcost',
 								'size' => '15',
 								'class' => "text field medium" 
@@ -276,10 +276,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Included Seconds' ),
+				array(
+						gettext('Included Seconds'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'includedseconds',
 								'size' => '50',
 								'class' => "text field medium" 
@@ -288,10 +288,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Per Minute Cost' ),
+				array(
+						gettext('Per Minute Cost'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'cost',
 								'size' => '15',
 								'class' => "text field medium" 
@@ -300,10 +300,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Initial Increment' ),
+				array(
+						gettext('Initial Increment'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'init_inc',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -312,10 +312,10 @@ 
 						'tOOL TIP',
 						'Please Enter Initial Increment' 
 				),
-				array (
-						gettext ( 'Increment' ),
+				array(
+						gettext('Increment'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'inc',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -324,10 +324,10 @@ 
 						'tOOL TIP',
 						'Please Enter Increment' 
 				),
-				array (
-						gettext ( 'Setup Fee' ),
+				array(
+						gettext('Setup Fee'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'setup',
 								'size' => '15',
 								'class' => 'text field medium' 
@@ -336,10 +336,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Monthly<br>Fee' ),
+				array(
+						gettext('Monthly<br>Fee'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'monthlycost',
 								'size' => '15',
 								'class' => "text field medium" 
@@ -349,10 +349,10 @@ 
 						'Please Enter Password' 
 				),
 				// Added call leg_timeout parameter to timeout the calls.
-				array (
+				array(
 						'Call Timeout (Sec.)',
 						'INPUT',
-						array (
+						array(
 								'name' => 'leg_timeout',
 								'size' => '4',
 								'class' => "text field medium" 
@@ -363,9 +363,9 @@ 
 				) 
 		);
 		
-		$form ['DID Setting'] = array (
-				array (
-						gettext ( 'Call Type' ),
+		$form ['DID Setting'] = array(
+				array(
+						gettext('Call Type'),
 						'call_type',
 						'SELECT',
 						'',
@@ -378,10 +378,10 @@ 
 						'set_call_type',
 						'' 
 				),
-				array (
-						gettext ( 'Destination' ),
+				array(
+						gettext('Destination'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'extensions',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -390,10 +390,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Concurrent Calls' ),
+				array(
+						gettext('Concurrent Calls'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'maxchannels',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -402,8 +402,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -418,18 +418,18 @@ 
 		)
 		;
 		
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot' 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
 				'content' => 'Close',
-				gettext ( 'value' ) => 'cancel',
+				gettext('value') => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
@@ -441,17 +441,17 @@ 
 	 * ************************************************************************
 	 */
 	function get_search_did_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "did_search" 
 				) 
 		);
-		$form ['Search'] = array (
-				array (
-						gettext ( 'DID' ),
+		$form ['Search'] = array(
+				array(
+						gettext('DID'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'number[number]',
 								'',
 								'size' => '20',
@@ -467,8 +467,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Country' ),
+				array(
+						gettext('Country'),
 						'country_id',
 						'SELECT',
 						'',
@@ -482,8 +482,8 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountid',
 						'SELECT',
 						'',
@@ -495,16 +495,16 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "0",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Initial Increment' ),
+				array(
+						gettext('Initial Increment'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'init_inc[init_inc]',
 								'',
 								'size' => '20',
@@ -520,8 +520,8 @@ 
 						'search_int_type',
 						'' 
 				),
-				array (
-						gettext ( 'Call Type' ),
+				array(
+						gettext('Call Type'),
 						'call_type',
 						'SELECT',
 						'',
@@ -535,10 +535,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Destination' ),
+				array(
+						gettext('Destination'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'extensions[extensions]',
 								'',
 								'size' => '20',
@@ -554,8 +554,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -570,7 +570,7 @@ 
 						'' 
 				),
 				
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -579,7 +579,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -590,18 +590,18 @@ 
 				) 
 		);
 		
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "did_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -610,17 +610,17 @@ 
 		return $form;
 	}
 	function get_search_did_form_for_reseller() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "did_search" 
 				) 
 		);
-		$form ['Search'] = array (
-				array (
-						gettext ( 'DID' ),
+		$form ['Search'] = array(
+				array(
+						gettext('DID'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'note[note]',
 								'',
 								'size' => '20',
@@ -636,8 +636,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountid',
 						'SELECT',
 						'',
@@ -649,14 +649,14 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "0",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Call Type' ),
+				array(
+						gettext('Call Type'),
 						'call_type',
 						'SELECT',
 						'',
@@ -670,10 +670,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Destination' ),
+				array(
+						gettext('Destination'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'extensions[extensions]',
 								'',
 								'size' => '20',
@@ -689,8 +689,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -704,7 +704,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -713,7 +713,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -724,18 +724,18 @@ 
 				) 
 		);
 		
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "did_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -748,13 +748,13 @@ 
 	 * ASTPP 3.0 grid size is change.
 	 */
 	function build_did_list_for_admin() {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$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 = $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 (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -771,8 +771,8 @@ 
 				 * For DID edit on DID number
 				 * *
 				 */
-				array (
-						gettext ( "DID" ),
+				array(
+						gettext("DID"),
 						"80",
 						"number",
 						"",
@@ -782,8 +782,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Country" ),
+				array(
+						gettext("Country"),
 						"60",
 						"country_id",
 						"country",
@@ -793,16 +793,16 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Account" ),
+				array(
+						gettext("Account"),
 						"95",
 						"accountid",
 						"first_name,last_name,number",
 						"accounts",
 						"get_field_name_coma_new" 
 				),
-				array (
-						gettext ( "Per Minute <br>Cost($currency)" ),
+				array(
+						gettext("Per Minute <br>Cost($currency)"),
 						"85",
 						"cost",
 						"cost",
@@ -812,8 +812,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Initial <br>Increment" ),
+				array(
+						gettext("Initial <br>Increment"),
 						"80",
 						"init_inc",
 						"",
@@ -823,8 +823,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Increment" ),
+				array(
+						gettext("Increment"),
 						"90",
 						"inc",
 						"",
@@ -834,8 +834,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Setup <br>Fee($currency)" ),
+				array(
+						gettext("Setup <br>Fee($currency)"),
 						"70",
 						"setup",
 						"setup",
@@ -845,8 +845,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Monthly<br>Fee($currency)" ),
+				array(
+						gettext("Monthly<br>Fee($currency)"),
 						"90",
 						"monthlycost",
 						"monthlycost",
@@ -856,8 +856,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Call Type" ),
+				array(
+						gettext("Call Type"),
 						"90",
 						"call_type",
 						"call_type",
@@ -867,8 +867,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Destination" ),
+				array(
+						gettext("Destination"),
 						"80",
 						"extensions",
 						"",
@@ -878,8 +878,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"90",
 						"status",
 						"status",
@@ -889,8 +889,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified <br/>Date" ),
+				array(
+						gettext("Modified <br/>Date"),
 						"90",
 						"last_modified_date",
 						"last_modified_date",
@@ -900,8 +900,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Is Purchased?" ),
+				array(
+						gettext("Is Purchased?"),
 						"110",
 						"number",
 						"number",
@@ -911,25 +911,25 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"100",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "did/did_edit/",
 										"mode" => "popup",
 										"layout" => "medium" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "did/did_remove/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
@@ -940,13 +940,13 @@ 
 	 * change in grid size
 	 */
 	function build_did_list_for_reseller_login() {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$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 = $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 (
-						gettext ( "DID" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("DID"),
 						"90",
 						"number",
 						"",
@@ -957,8 +957,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Account" ),
+				array(
+						gettext("Account"),
 						"100",
 						"accountid",
 						"first_name,last_name,number",
@@ -968,8 +968,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Per Minute<br>Cost($currency)" ),
+				array(
+						gettext("Per Minute<br>Cost($currency)"),
 						"80",
 						"cost",
 						"cost",
@@ -979,8 +979,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Initial <br>Increment" ),
+				array(
+						gettext("Initial <br>Increment"),
 						"100",
 						"init_inc",
 						"",
@@ -990,8 +990,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Increment" ),
+				array(
+						gettext("Increment"),
 						"95",
 						"inc",
 						"",
@@ -1001,8 +1001,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Setup <br> Fee($currency)" ),
+				array(
+						gettext("Setup <br> Fee($currency)"),
 						"90",
 						"setup",
 						"setup",
@@ -1012,8 +1012,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Monthly<br> fee($currency)" ),
+				array(
+						gettext("Monthly<br> fee($currency)"),
 						"90",
 						"monthlycost",
 						"monthlycost",
@@ -1023,8 +1023,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Call Type" ),
+				array(
+						gettext("Call Type"),
 						"80",
 						"call_type",
 						"call_type",
@@ -1034,8 +1034,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Destination" ),
+				array(
+						gettext("Destination"),
 						"95",
 						"extensions",
 						"",
@@ -1045,8 +1045,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"90",
 						"status",
 						"status",
@@ -1056,8 +1056,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"130",
 						"last_modified_date",
 						"last_modified_date",
@@ -1067,8 +1067,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Is purchased?" ),
+				array(
+						gettext("Is purchased?"),
 						"100",
 						"number",
 						"number",
@@ -1078,33 +1078,33 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"90",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "did/did_reseller_edit/edit/",
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "did/did_reseller_edit/delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
 	 * *********************************************************************
 	 */
 	function build_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
@@ -1112,15 +1112,15 @@ 
 						"popup",
 						"medium" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/did/did_delete_multiple/" 
 				),
-				array (
-						gettext ( "Import" ),
+				array(
+						gettext("Import"),
 						"btn btn-line-blue",
 						"fa fa-upload fa-lg",
 						"button_action",
@@ -1128,25 +1128,25 @@ 
 						'',
 						"small" 
 				),
-				array (
-						gettext ( "Export" ),
+				array(
+						gettext("Export"),
 						"btn btn-xing",
 						"fa fa-download fa-lg",
 						"button_action",
 						"/did/did_export_data_xls",
 						'single' 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function build_did_list_for_customer($accountid, $accounttype) {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$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 = $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 (
-						gettext ( "DID" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("DID"),
 						"110",
 						"number",
 						"",
@@ -1156,8 +1156,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Country" ),
+				array(
+						gettext("Country"),
 						"110",
 						"country_id",
 						"country",
@@ -1167,8 +1167,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Per Minute Cost($currency)" ),
+				array(
+						gettext("Per Minute Cost($currency)"),
 						"150",
 						"cost",
 						"cost",
@@ -1178,8 +1178,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Initial Increment" ),
+				array(
+						gettext("Initial Increment"),
 						"140",
 						"init_inc",
 						"",
@@ -1189,8 +1189,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Increment" ),
+				array(
+						gettext("Increment"),
 						"120",
 						"inc",
 						"",
@@ -1200,8 +1200,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Setup Fee($currency)" ),
+				array(
+						gettext("Setup Fee($currency)"),
 						"140",
 						"setup",
 						"setup",
@@ -1211,8 +1211,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Monthly Fee($currency)" ),
+				array(
+						gettext("Monthly Fee($currency)"),
 						"140",
 						"monthlycost",
 						"monthlycost",
@@ -1222,26 +1222,26 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"110",
 						"",
 						"",
 						"",
-						array (
-								"DELETE" => array (
-										"url" => "accounts/" . $accounttype . "_dids_action/delete/$accountid/$accounttype/",
+						array(
+								"DELETE" => array(
+										"url" => "accounts/".$accounttype."_dids_action/delete/$accountid/$accounttype/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function build_did_list_for_reseller($accountid, $accounttype) {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"DID Number",
 						"120",
 						"number",
@@ -1249,84 +1249,84 @@ 
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Increment" ),
+				array(
+						gettext("Increment"),
 						"120",
 						"inc",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Is purchased?" ),
+				array(
+						gettext("Is purchased?"),
 						"120",
 						"number",
 						"number",
 						"number",
 						"check_did_avl_reseller" 
 				),
-				array (
-						gettext ( "Per Minute Cost" ),
+				array(
+						gettext("Per Minute Cost"),
 						"120",
 						"cost",
 						"cost",
 						"cost",
 						"convert_to_currency" 
 				),
-				array (
-						gettext ( "Included<br> Seconds" ),
+				array(
+						gettext("Included<br> Seconds"),
 						"100",
 						"includedseconds",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Setup <br> Fee" ),
+				array(
+						gettext("Setup <br> Fee"),
 						"109",
 						"setup",
 						"setup",
 						"setup",
 						"convert_to_currency" 
 				),
-				array (
-						gettext ( "Monthly<br> Fee" ),
+				array(
+						gettext("Monthly<br> Fee"),
 						"140",
 						"monthlycost",
 						"monthlycost",
 						"monthlycost",
 						"convert_to_currency" 
 				),
-				array (
-						gettext ( "Connection Cost" ),
+				array(
+						gettext("Connection Cost"),
 						"149",
 						"connectcost",
 						"connectcost",
 						"connectcost",
 						"convert_to_currency" 
 				),
-				array (
-						gettext ( "Disconnection <br> Fee" ),
+				array(
+						gettext("Disconnection <br> Fee"),
 						"140",
 						"disconnectionfee",
 						"disconnectionfee",
 						"disconnectionfee",
 						"convert_to_currency" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"100",
 						"",
 						"",
 						"",
-						array (
-								"DELETE" => array (
+						array(
+								"DELETE" => array(
 										"url" => "/accounts/reseller_did_action/delete/$accountid/$accounttype/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -21,8 +21,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' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 class did_form {
 	function __construct() {
 		$this->CI = & get_instance ();

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

Spacing +153 added lines, -153 removed lines

@@ -22,243 +22,243 @@ 
 // ##############################################################################
 class Login extends MX_Controller {
 	function Login() {
-		parent::__construct ();
-		$this->load->helper ( 'form' );
-		$this->load->library ( 'astpp/permission' );
-		$this->load->library ( 'encrypt' );
-		$this->load->model ( 'Auth_model' );
-		$this->load->model ( 'db_model' );
+		parent::__construct();
+		$this->load->helper('form');
+		$this->load->library('astpp/permission');
+		$this->load->library('encrypt');
+		$this->load->model('Auth_model');
+		$this->load->model('db_model');
 	}
 	function set_lang_global($post = false) {
-		if (! is_array ( $post )) {
-			$str = trim ( $post );
+		if ( ! is_array($post)) {
+			$str = trim($post);
 			$new_arr [$str] = $str;
 			$post = $new_arr;
 		}
-		if (isset ( $post ['fr_FR'] )) {
+		if (isset ($post ['fr_FR'])) {
 			$language = $post ['fr_FR'];
-			$this->session->set_userdata ( 'user_language', $language );
+			$this->session->set_userdata('user_language', $language);
 		}
-		if (isset ( $post ['es_ES'] )) {
+		if (isset ($post ['es_ES'])) {
 			$language = $post ['es_ES'];
-			$this->session->set_userdata ( 'user_language', $language );
+			$this->session->set_userdata('user_language', $language);
 		}
-		if (isset ( $post ['en_EN'] )) {
+		if (isset ($post ['en_EN'])) {
 			$language = $post ['en_EN'];
-			$this->session->unset_userdata ( 'user_language', $language );
+			$this->session->unset_userdata('user_language', $language);
 		}
-		$this->locale->set_lang ();
+		$this->locale->set_lang();
 		return true;
 	}
 	function index() {
-		if ($this->session->userdata ( 'user_login' ) == FALSE) {
-			if (! empty ( $_POST ) && trim ( $_POST ['username'] ) != '' && trim ( $_POST ['password'] ) != '') {
-				$_POST ['password'] = $this->common->encode ( $_POST ['password'] );
-				$user_valid = $this->Auth_model->verify_login ( $_POST ['username'], $_POST ['password'] );
+		if ($this->session->userdata('user_login') == FALSE) {
+			if ( ! empty ($_POST) && trim($_POST ['username']) != '' && trim($_POST ['password']) != '') {
+				$_POST ['password'] = $this->common->encode($_POST ['password']);
+				$user_valid = $this->Auth_model->verify_login($_POST ['username'], $_POST ['password']);
 				
 				if ($user_valid == 1) {
-					$this->session->set_userdata ( 'user_login', TRUE );
-					$where = "number = '" . $this->db->escape_str ( $_POST ['username'] ) . "' OR email = '" . $this->db->escape_str ( $_POST ['username'] ) . "'";
-					$result = $this->db_model->getSelect ( "*", "accounts", $where );
-					$result = $result->result_array ();
+					$this->session->set_userdata('user_login', TRUE);
+					$where = "number = '".$this->db->escape_str($_POST ['username'])."' OR email = '".$this->db->escape_str($_POST ['username'])."'";
+					$result = $this->db_model->getSelect("*", "accounts", $where);
+					$result = $result->result_array();
 					$result = $result [0];
 					$logintype = $result ['type'] == - 1 ? 2 : $result ['type'];
-					$this->session->set_userdata ( 'logintype', $logintype );
-					$this->session->set_userdata ( 'userlevel_logintype', $result ['type'] );
-					$this->session->set_userdata ( 'username', $_POST ['username'] );
-					$this->session->set_userdata ( 'accountinfo', $result );
+					$this->session->set_userdata('logintype', $logintype);
+					$this->session->set_userdata('userlevel_logintype', $result ['type']);
+					$this->session->set_userdata('username', $_POST ['username']);
+					$this->session->set_userdata('accountinfo', $result);
 					/*
 					 *
 					 * Purpose : Display logo based on domain name
 					 *
 					 */
-					$this->db->select ( "*" );
+					$this->db->select("*");
 					if ($result ['type'] == '2' || $result ['type'] == '-1') {
-						$this->db->where ( array (
+						$this->db->where(array(
 								"accountid" => "1"
-						) );
+						));
 					} else if ($result ['type'] == '0') {
 						if ($result ['reseller_id'] == 0) {
-							$this->db->where ( array (
+							$this->db->where(array(
 									"accountid" => "1" 
-							) );
+							));
 						} else {
-							$this->db->where ( array (
+							$this->db->where(array(
 									"accountid" => $result ["reseller_id"] 
-							) );
+							));
 						}
 					} else if ($result ['type'] == '1') {
 						if ($result ['reseller_id'] == 0) {
-							$result_invoice = $this->common->get_field_name ( 'id', 'invoice_conf', array (
+							$result_invoice = $this->common->get_field_name('id', 'invoice_conf', array(
 									"accountid" => $result ['id'] 
-							) );
+							));
 							
 							if ($result_invoice) {
-								$this->db->where ( array (
+								$this->db->where(array(
 										"accountid" => $result ["id"] 
-								) );
+								));
 							} else {
-								$this->db->where ( array (
+								$this->db->where(array(
 										"accountid" => "1" 
-								) );
+								));
 							}
 						} else {
-							$result_invoice = $this->common->get_field_name ( 'id', 'invoice_conf', array (
+							$result_invoice = $this->common->get_field_name('id', 'invoice_conf', array(
 									"accountid" => $result ['reseller_id'] 
-							) );
+							));
 							if ($result_invoice) {
-								$this->db->where ( array (
+								$this->db->where(array(
 										"accountid" => $result ["reseller_id"] 
-								) );
+								));
 							} else {
-								$this->db->where ( array (
+								$this->db->where(array(
 										"accountid" => "1" 
-								) );
+								));
 							}
 						}
 					} else {
-						$this->db->where ( array (
+						$this->db->where(array(
 								"accountid" => "1" 
-						) );
+						));
 					}
-					$res = $this->db->get ( "invoice_conf" );
-					$logo_arr = $res->result ();
-					$data ['user_logo'] = (isset ( $logo_arr [0]->logo ) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid . "_" . $logo_arr [0]->logo : "logo.png";
-					$data ['user_header'] = (isset ( $logo_arr [0]->website_title ) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
-					$data ['user_footer'] = (isset ( $logo_arr [0]->website_footer ) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
-					$data ['user_favicon'] = (isset ( $logo_arr [0]->favicon ) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid . "_" .$logo_arr [0]->favicon : "favicon.ico";
-					$this->session->set_userdata ( 'user_logo', $data ['user_logo'] );
-					$this->session->set_userdata ( 'user_header', $data ['user_header'] );
-					$this->session->set_userdata ( 'user_footer', $data ['user_footer'] );
-					$this->session->set_userdata ( 'user_favicon', $data ['user_favicon'] );
+					$res = $this->db->get("invoice_conf");
+					$logo_arr = $res->result();
+					$data ['user_logo'] = (isset ($logo_arr [0]->logo) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->logo : "logo.png";
+					$data ['user_header'] = (isset ($logo_arr [0]->website_title) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+					$data ['user_footer'] = (isset ($logo_arr [0]->website_footer) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
+					$data ['user_favicon'] = (isset ($logo_arr [0]->favicon) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->favicon : "favicon.ico";
+					$this->session->set_userdata('user_logo', $data ['user_logo']);
+					$this->session->set_userdata('user_header', $data ['user_header']);
+					$this->session->set_userdata('user_footer', $data ['user_footer']);
+					$this->session->set_userdata('user_favicon', $data ['user_favicon']);
 					// echo $data['user_header'];exit;
 					/**
 					 * ************************************************************************************
 					 */
 					if ($result ['type'] == 0 || $result ['type'] == 1) {
-						$menu_list = $this->permission->get_module_access ( $result ['type'] );
-						$this->session->set_userdata ( 'mode_cur', 'user' );
+						$menu_list = $this->permission->get_module_access($result ['type']);
+						$this->session->set_userdata('mode_cur', 'user');
 						if ($result ['type'] == 1) {
-							redirect ( base_url () . 'dashboard/' );
+							redirect(base_url().'dashboard/');
 						} else {
-							redirect ( base_url () . 'user/user/' );
+							redirect(base_url().'user/user/');
 						}
 					} else {
-						$menu_list = $this->permission->get_module_access ( $result ['type'] );
-						$this->session->set_userdata ( 'mode_cur', 'admin' );
-						redirect ( base_url () . 'dashboard/' );
+						$menu_list = $this->permission->get_module_access($result ['type']);
+						$this->session->set_userdata('mode_cur', 'admin');
+						redirect(base_url().'dashboard/');
 					}
 				} else {
 					$data ['astpp_notification'] = "Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active";
 				}
 			} else {
-				if (! empty ( $_POST ) && ($_POST ['password'] == '' || $_POST ['username'] == '')) {
+				if ( ! empty ($_POST) && ($_POST ['password'] == '' || $_POST ['username'] == '')) {
 					$data ['astpp_notification'] = "Please enter Username/email and Password.";
 				}
 			}
 			/*
 			 * Purpose : Display logo based on domain name
 			 */
-			$this->db->select ( "*" );
-			$this->db->where ( array (
+			$this->db->select("*");
+			$this->db->where(array(
 					"domain" => $_SERVER ["HTTP_HOST"] 
-			) );
-			$res = $this->db->get ( "invoice_conf" );
-			$logo_arr = $res->result ();
-			$data ['user_logo'] = (isset ( $logo_arr [0]->logo ) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid . "_" . $logo_arr [0]->logo : "logo.png";
-			$data ['website_header'] = (isset ( $logo_arr [0]->website_title ) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
-			$data ['website_footer'] = (isset ( $logo_arr [0]->website_footer ) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
-			$data ['user_favicon'] = (isset ( $logo_arr [0]->favicon ) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid . "_" .$logo_arr [0]->favicon : "favicon.ico";
-			$this->session->set_userdata ( 'user_logo', $data ['user_logo'] );
-			$this->session->set_userdata ( 'user_header', $data ['website_header'] );
-			$this->session->set_userdata ( 'user_footer', $data ['website_footer'] );
-			$this->session->set_userdata ( 'user_favicon', $data ['user_favicon'] );
+			));
+			$res = $this->db->get("invoice_conf");
+			$logo_arr = $res->result();
+			$data ['user_logo'] = (isset ($logo_arr [0]->logo) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->logo : "logo.png";
+			$data ['website_header'] = (isset ($logo_arr [0]->website_title) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+			$data ['website_footer'] = (isset ($logo_arr [0]->website_footer) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
+			$data ['user_favicon'] = (isset ($logo_arr [0]->favicon) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->favicon : "favicon.ico";
+			$this->session->set_userdata('user_logo', $data ['user_logo']);
+			$this->session->set_userdata('user_header', $data ['website_header']);
+			$this->session->set_userdata('user_footer', $data ['website_footer']);
+			$this->session->set_userdata('user_favicon', $data ['user_favicon']);
 			
 			// echo $data['user_logo'];exit;
 			/**
 			 * ************************************************************************************
 			 */
-			$this->session->set_userdata ( 'user_login', FALSE );
+			$this->session->set_userdata('user_login', FALSE);
 			$data ['app_name'] = 'ASTPP - Open Source Billing Solution';
-			$this->load->view ( 'view_login', $data );
+			$this->load->view('view_login', $data);
 		} else {
 			/*
 			 *
 			 * Purpose : Display logo based on domain name
 			 *
 			 */
-			$this->db->select ( "*" );
-			$this->db->where ( array (
+			$this->db->select("*");
+			$this->db->where(array(
 					"domain" => $_SERVER ["HTTP_HOST"] 
-			) );
-			$res = $this->db->get ( "invoice_conf" );
-			$logo_arr = $res->result ();
+			));
+			$res = $this->db->get("invoice_conf");
+			$logo_arr = $res->result();
 			// print_r( $logo_arr );exit;
 			
-			$data ['user_logo'] = (isset ( $logo_arr [0]->logo ) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid . "_" . $logo_arr [0]->logo : "logo.png";
-			$data ['user_header'] = (isset ( $logo_arr [0]->website_title ) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
-			$data ['user_footer'] = (isset ( $logo_arr [0]->website_footer ) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
-			$data ['user_favicon'] = (isset ( $logo_arr [0]->favicon ) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid . "_" .$logo_arr [0]->favicon : "favicon.ico";
+			$data ['user_logo'] = (isset ($logo_arr [0]->logo) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->logo : "logo.png";
+			$data ['user_header'] = (isset ($logo_arr [0]->website_title) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+			$data ['user_footer'] = (isset ($logo_arr [0]->website_footer) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
+			$data ['user_favicon'] = (isset ($logo_arr [0]->favicon) && $logo_arr [0]->favicon != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->favicon : "favicon.ico";
 			
-			$this->session->set_userdata ( 'user_logo', $data ['user_logo'] );
-			$this->session->set_userdata ( 'user_header', $data ['user_header'] );
-			$this->session->set_userdata ( 'user_footer', $data ['user_footer'] );
-			$this->session->set_userdata ( 'user_favicon', $data ['user_favicon'] );
+			$this->session->set_userdata('user_logo', $data ['user_logo']);
+			$this->session->set_userdata('user_header', $data ['user_header']);
+			$this->session->set_userdata('user_footer', $data ['user_footer']);
+			$this->session->set_userdata('user_favicon', $data ['user_favicon']);
 			// echo $data['user_logo'];exit;
 			/**
 			 * ************************************************************************************
 			 */
-			if ($this->session->userdata ( 'logintype' ) == '2') {
-				redirect ( base_url () . 'dashboard/' );
+			if ($this->session->userdata('logintype') == '2') {
+				redirect(base_url().'dashboard/');
 			} else {
-				redirect ( base_url () . 'user/user/' );
+				redirect(base_url().'user/user/');
 			}
 		}
 	}
 	function logout() {
-		$this->session->sess_destroy ();
-		redirect ( base_url () );
+		$this->session->sess_destroy();
+		redirect(base_url());
 	}
 	function paypal_response() {
-		if (count ( $_POST ) > 0) {
+		if (count($_POST) > 0) {
 			$response_arr = $_POST;
 			
-			$logger = ( array ) $this->db->get_where ( "system", array (
+			$logger = (array)$this->db->get_where("system", array(
 					"name" => "log_path",
 					"group_title" => "global" 
-			) )->first_row ();
+			))->first_row();
 			$logger_path = $logger ['value'];
-			$fp = fopen ( $logger_path . "astpp_payment.log", "a+" );
-			$date = date ( "Y-m-d H:i:s" );
-			fwrite ( $fp, "====================" . $date . "===============================\n" );
-			foreach ( $response_arr as $key => $value ) {
-				fwrite ( $fp, $key . ":::>" . $value . "\n" );
+			$fp = fopen($logger_path."astpp_payment.log", "a+");
+			$date = date("Y-m-d H:i:s");
+			fwrite($fp, "====================".$date."===============================\n");
+			foreach ($response_arr as $key => $value) {
+				fwrite($fp, $key.":::>".$value."\n");
 			}
-			$payment_check = $this->db_model->countQuery ( "txn_id", "payments", array (
+			$payment_check = $this->db_model->countQuery("txn_id", "payments", array(
 					"txn_id" => $response_arr ['txn_id'] 
-			) );
+			));
 			if (($response_arr ["payment_status"] == "Pending" || $response_arr ["payment_status"] == "Complete" || $response_arr ["payment_status"] == "Completed") && $payment_check == 0) {
 				
-				$paypal_tax = ( array ) $this->db->get_where ( "system", array (
+				$paypal_tax = (array)$this->db->get_where("system", array(
 						"name" => "paypal_tax",
 						"group_title" => "paypal" 
-				) )->first_row ();
+				))->first_row();
 				$paypal_tax = $paypal_tax ['value'];
 				$balance_amt = $actual_amount = $response_arr ["custom"];
-				$paypal_fee = ( array ) $this->db->get_where ( "system", array (
+				$paypal_fee = (array)$this->db->get_where("system", array(
 						"name" => "paypal_fee",
 						"group_title" => "paypal" 
-				) )->first_row ();
+				))->first_row();
 				$paypal_fee = $paypal_fee ['value'];
 				$paypalfee = ($paypal_fee == 0) ? '0' : $response_arr ["mc_gross"];
-				$account_data = ( array ) $this->db->get_where ( "accounts", array (
+				$account_data = (array)$this->db->get_where("accounts", array(
 						"id" => $response_arr ["item_number"] 
-				) )->first_row ();
-				$currency = ( array ) $this->db->get_where ( 'currency', array (
+				))->first_row();
+				$currency = (array)$this->db->get_where('currency', array(
 						"id" => $account_data ["currency_id"] 
-				) )->first_row ();
-				$date = date ( 'Y-m-d H:i:s' );
-				$payment_trans_array = array (
+				))->first_row();
+				$date = date('Y-m-d H:i:s');
+				$payment_trans_array = array(
 						"accountid" => $response_arr ["item_number"],
 						"amount" => $response_arr ["payment_gross"],
 						"tax" => "1",
@@ -267,54 +267,54 @@ 
 						"paypal_fee" => $paypalfee,
 						"user_currency" => $currency ["currency"],
 						"currency_rate" => $currency ["currencyrate"],
-						"transaction_details" => json_encode ( $response_arr ),
+						"transaction_details" => json_encode($response_arr),
 						"date" => $date 
 				);
-				$paymentid = $this->db->insert ( 'payment_transaction', $payment_trans_array );
+				$paymentid = $this->db->insert('payment_transaction', $payment_trans_array);
 				$parent_id = $account_data ['reseller_id'] > 0 ? $account_data ['reseller_id'] : '-1';
-				$payment_arr = array (
+				$payment_arr = array(
 						"accountid" => $response_arr ["item_number"],
 						"payment_mode" => "1",
 						"credit" => $balance_amt,
 						"type" => "PAYPAL",
 						"payment_by" => $parent_id,
-						"notes" => "Payment Made by Paypal on date:-" . $date,
+						"notes" => "Payment Made by Paypal on date:-".$date,
 						"paypalid" => $paymentid,
 						"txn_id" => $response_arr ["txn_id"],
-						'payment_date' => gmdate ( 'Y-m-d H:i:s', strtotime ( $response_arr ['payment_date'] ) ) 
+						'payment_date' => gmdate('Y-m-d H:i:s', strtotime($response_arr ['payment_date'])) 
 				);
-				$this->db->insert ( 'payments', $payment_arr );
-				$this->db->select ( 'invoiceid' );
-				$this->db->order_by ( 'id', 'desc' );
-				$this->db->limit ( 1 );
-				$last_invoice_result = ( array ) $this->db->get ( 'invoices' )->first_row ();
-				$last_invoice_ID = isset ( $last_invoice_result ['invoiceid'] ) && $last_invoice_result ['invoiceid'] > 0 ? $last_invoice_result ['invoiceid'] : 1;
+				$this->db->insert('payments', $payment_arr);
+				$this->db->select('invoiceid');
+				$this->db->order_by('id', 'desc');
+				$this->db->limit(1);
+				$last_invoice_result = (array)$this->db->get('invoices')->first_row();
+				$last_invoice_ID = isset ($last_invoice_result ['invoiceid']) && $last_invoice_result ['invoiceid'] > 0 ? $last_invoice_result ['invoiceid'] : 1;
 				$reseller_id = $account_data ['reseller_id'] > 0 ? $account_data ['reseller_id'] : 0;
-				$where = "accountid IN ('" . $reseller_id . "','1')";
-				$this->db->where ( $where );
-				$this->db->select ( '*' );
-				$this->db->order_by ( 'accountid', 'desc' );
-				$this->db->limit ( 1 );
-				$invoiceconf = $this->db->get ( 'invoice_conf' );
-				$invoiceconf = ( array ) $invoiceconf->first_row ();
+				$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();
 				$invoice_prefix = $invoiceconf ['invoice_prefix'];
 				
-				$due_date = gmdate ( "Y-m-d H:i:s", strtotime ( gmdate ( "Y-m-d H:i:s" ) . " +" . $invoiceconf ['interval'] . " days" ) );
-				$invoice_id = $this->generate_receipt ( $account_data ['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date );
-				$details_insert = array (
+				$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf ['interval']." days"));
+				$invoice_id = $this->generate_receipt($account_data ['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+				$details_insert = array(
 						'created_date' => $date,
 						'credit' => $balance_amt,
 						'debit' => '-',
 						'accountid' => $account_data ["id"],
 						'reseller_id' => $account_data ['reseller_id'],
 						'invoiceid' => $invoice_id,
-						'description' => "Payment Made by Paypal on date:-" . $date,
+						'description' => "Payment Made by Paypal on date:-".$date,
 						'item_type' => 'PAYMENT',
 						'before_balance' => $account_data ['balance'],
 						'after_balance' => $account_data ['balance'] + $balance_amt 
 				);
-				$this->db->insert ( "invoice_details", $details_insert );
-				$this->db_model->update_balance ( $balance_amt, $account_data ["id"], "credit" );
+				$this->db->insert("invoice_details", $details_insert);
+				$this->db_model->update_balance($balance_amt, $account_data ["id"], "credit");
 				/*
 				 * if($parent_id > 0){
 				 * $reseller_ids=$this->common->get_parent_info($parent_id,0);
@@ -368,10 +368,10 @@ 
 				 * }
 				 * }
 				 */
-				redirect ( base_url () . 'user/user/' );
+				redirect(base_url().'user/user/');
 			}
 		}
-		redirect ( base_url () . 'user/user/' );
+		redirect(base_url().'user/user/');
 	}
 	
 	/**
@@ -380,14 +380,14 @@ 
 	 * @param string $due_date        	
 	 */
 	function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
-		$invoice_data = array (
+		$invoice_data = array(
 				"accountid" => $accountid,
 				"invoice_prefix" => $invoice_prefix,
-				"invoiceid" => '0000' . $last_invoice_ID,
+				"invoiceid" => '0000'.$last_invoice_ID,
 				"reseller_id" => $accountinfo ['reseller_id'],
-				"invoice_date" => gmdate ( "Y-m-d H:i:s" ),
-				"from_date" => gmdate ( "Y-m-d H:i:s" ),
-				"to_date" => gmdate ( "Y-m-d H:i:s" ),
+				"invoice_date" => gmdate("Y-m-d H:i:s"),
+				"from_date" => gmdate("Y-m-d H:i:s"),
+				"to_date" => gmdate("Y-m-d H:i:s"),
 				"due_date" => $due_date,
 				"status" => 1,
 				"balance" => $accountinfo ['balance'],
@@ -395,13 +395,13 @@ 
 				"type" => 'R',
 				"confirm" => '1' 
 		);
-		$this->db->insert ( "invoices", $invoice_data );
-		$invoiceid = $this->db->insert_id ();
+		$this->db->insert("invoices", $invoice_data);
+		$invoiceid = $this->db->insert_id();
 		return $invoiceid;
 	}
 	function get_language_text() {
 		// echo '<pre>'; print_r($_POST); exit;
-		echo gettext ( $_POST ['display'] );
+		echo gettext($_POST ['display']);
 	}
 }
 

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

Spacing +76 added lines, -76 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
                                             OR  effective_caller_id_name like '%$instant_search%'
                                             OR  effective_caller_id_number like '%$instant_search%'
                                                 )" : null;
-		if (! empty ( $like_str ))
-			$this->opensips_db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->opensips_db->where ( $like_str );
+		}
 		$this->opensips_db->where ( $where );
 		if ($flag) {
 			$this->opensips_db->limit ( $limit, $start );

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

Spacing +174 added lines, -174 removed lines

@@ -22,223 +22,223 @@ 
 // ##############################################################################
 class Opensips extends MX_Controller {
 	function Opensips() {
-		parent::__construct ();
+		parent::__construct();
 		
-		$this->load->helper ( 'template_inheritance' );
-		$this->load->library ( 'session' );
-		$this->load->library ( "opensips_form" );
-		$this->load->library ( 'astpp/form' );
-		$this->load->model ( 'opensips_model' );
+		$this->load->helper('template_inheritance');
+		$this->load->library('session');
+		$this->load->library("opensips_form");
+		$this->load->library('astpp/form');
+		$this->load->model('opensips_model');
 		$db_config = Common_model::$global_config ['system_config'];
-		$opensipdsn = "mysql://" . $db_config ['opensips_dbuser'] . ":" . $db_config ['opensips_dbpass'] . "@" . $db_config ['opensips_dbhost'] . "/" . $db_config ['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-		$this->opensips_db = $this->load->database ( $opensipdsn, true );
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		$opensipdsn = "mysql://".$db_config ['opensips_dbuser'].":".$db_config ['opensips_dbpass']."@".$db_config ['opensips_dbhost']."/".$db_config ['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+		$this->opensips_db = $this->load->database($opensipdsn, true);
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
 	}
 	function opensips_add() {
 		// echo 'dd';
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Add  Opensips' );
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields (), '' );
-		$this->load->view ( 'view_opensips_add_edit', $data );
+		$data ['page_title'] = gettext('Add  Opensips');
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields(), '');
+		$this->load->view('view_opensips_add_edit', $data);
 	}
 	function opensips_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit Opensips' );
-		$this->opensips_db->where ( 'id', $edit_id );
-		$account = $this->opensips_db->get ( "subscriber" );
-		foreach ( $account->result_array () as $key => $value ) {
+		$data ['page_title'] = gettext('Edit Opensips');
+		$this->opensips_db->where('id', $edit_id);
+		$account = $this->opensips_db->get("subscriber");
+		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
 		
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields ( $edit_id ), $edit_data );
-		$this->load->view ( 'view_opensips_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields($edit_id), $edit_data);
+		$this->load->view('view_opensips_add_edit', $data);
 	}
 	function customer_opensips_edit($accountid, $edit_id) {
-		$data ['page_title'] = gettext ( 'Edit Opensips' );
-		$where = array (
+		$data ['page_title'] = gettext('Edit Opensips');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$this->opensips_db->where ( $where );
-		$account = $this->opensips_db->get ( "subscriber" );
-		foreach ( $account->result_array () as $key => $value ) {
+		$this->opensips_db->where($where);
+		$account = $this->opensips_db->get("subscriber");
+		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields_for_customer ( $accountid ), $edit_data );
-		$this->load->view ( 'view_opensips_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields_for_customer($accountid), $edit_data);
+		$this->load->view('view_opensips_add_edit', $data);
 	}
 	function customer_opensips_add($accountid = '') {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create Opensips' );
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields_for_customer ( $accountid ), '' );
+		$data ['page_title'] = gettext('Create Opensips');
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields_for_customer($accountid), '');
 		
-		$this->load->view ( 'view_opensips_add_edit', $data );
+		$this->load->view('view_opensips_add_edit', $data);
 	}
 	function opensips_save() {
-		$add_array = $this->input->post ();
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields ( $add_array ['id'] ), $add_array );
+		$add_array = $this->input->post();
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields($add_array ['id']), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$auth_flag = $this->validate_device_data ( $add_array );
+				$auth_flag = $this->validate_device_data($add_array);
 				if ($auth_flag == "TRUE") {
-					$this->opensips_model->edit_opensipsdevices ( $add_array, $add_array ['id'] );
-					echo json_encode ( array (
+					$this->opensips_model->edit_opensipsdevices($add_array, $add_array ['id']);
+					echo json_encode(array(
 							"SUCCESS" => " OpenSips updated successfully!" 
-					) );
+					));
 					exit ();
 				} else {
-					echo json_encode ( $auth_flag );
+					echo json_encode($auth_flag);
 					exit ();
 				}
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Add Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$auth_flag = $this->validate_device_data ( $add_array );
+				$auth_flag = $this->validate_device_data($add_array);
 				if ($auth_flag == "TRUE") {
-					$this->opensips_model->add_opensipsdevices ( $add_array );
-					echo json_encode ( array (
+					$this->opensips_model->add_opensipsdevices($add_array);
+					echo json_encode(array(
 							"SUCCESS" => "OpenSips added successfully!" 
-					) );
+					));
 					exit ();
 				} else {
-					echo json_encode ( $auth_flag );
+					echo json_encode($auth_flag);
 					exit ();
 				}
 			}
 		}
 	}
 	function validate_device_data($data) {
-		if (isset ( $data ["username"] ) && $data ["username"] != "") {
+		if (isset ($data ["username"]) && $data ["username"] != "") {
 			$db_config = Common_model::$global_config ['system_config'];
-			$opensipdsn = "mysql://" . $db_config ['opensips_dbuser'] . ":" . $db_config ['opensips_dbpass'] . "@" . $db_config ['opensips_dbhost'] . "/" . $db_config ['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-			$this->opensips_db = $this->load->database ( $opensipdsn, true );
-			$where = array (
+			$opensipdsn = "mysql://".$db_config ['opensips_dbuser'].":".$db_config ['opensips_dbpass']."@".$db_config ['opensips_dbhost']."/".$db_config ['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+			$this->opensips_db = $this->load->database($opensipdsn, true);
+			$where = array(
 					"username" => $data ["username"] 
 			);
 			if ($data ['id'] != "") {
-				$this->opensips_db->where ( "id <>", $data ['id'] );
+				$this->opensips_db->where("id <>", $data ['id']);
 			}
-			$this->opensips_db->where ( $where );
-			$auth_flag = $this->opensips_db->get ( "subscriber" );
-			$auth_flag = $auth_flag->num_rows ();
+			$this->opensips_db->where($where);
+			$auth_flag = $this->opensips_db->get("subscriber");
+			$auth_flag = $auth_flag->num_rows();
 			if ($auth_flag == 0) {
 				return "TRUE";
 			} else {
-				return array (
+				return array(
 						"username_error" => "Duplicate Email Address Found Email Must Be Unique." 
 				);
 			}
 		} else {
-			return array (
+			return array(
 					"username_error" => "User name is required field." 
 			);
 		}
 		return "0";
 	}
 	function user_opensips_save($user_flg = false) {
-		$array_add = $this->input->post ();
+		$array_add = $this->input->post();
 		//
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields_for_customer ( $array_add ["accountcode"] ), $array_add );
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields_for_customer($array_add ["accountcode"]), $array_add);
 		if ($array_add ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->edit_opensipsdevices ( $array_add, $array_add ['id'] );
-				echo json_encode ( array (
+				$this->opensips_model->edit_opensipsdevices($array_add, $array_add ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "Opensips Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Add Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->add_opensipsdevices ( $array_add );
-				echo json_encode ( array (
+				$this->opensips_model->add_opensipsdevices($array_add);
+				echo json_encode(array(
 						"SUCCESS" => "Opensips Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function customer_opensips_save($user_flg = false) {
-		$add_array = $this->input->post ();
+		$add_array = $this->input->post();
 		// print_r($array_add);exit;
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_opensips_form_fields_for_customer ( $add_array ["accountcode"] ), $add_array );
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_opensips_form_fields_for_customer($add_array ["accountcode"]), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->edit_opensipsdevices ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->opensips_model->edit_opensipsdevices($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "OpenSips Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Add Opensips' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add Opensips');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->add_opensipsdevices ( $add_array );
-				echo json_encode ( array (
+				$this->opensips_model->add_opensipsdevices($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "OpenSips Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function customer_opensips_json($accountid, $accounttype) {
-		$json_data = array ();
-		$count_all = $this->opensips_model->getopensipsdevice_customer_list ( false, $accountid, $accounttype );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->opensips_model->getopensipsdevice_customer_list(false, $accountid, $accounttype);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
 		
-		$query = $this->opensips_model->getopensipsdevice_customer_list ( true, $accountid, $accounttype, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->opensips_form->opensips_customer_build_opensips_list ( $accountid ) );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->opensips_model->getopensipsdevice_customer_list(true, $accountid, $accounttype, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->opensips_form->opensips_customer_build_opensips_list($accountid));
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function opensips_add_customer($add_data) {
-		$this->opensips_model->add_opensipsdevices ( $add_array );
+		$this->opensips_model->add_opensipsdevices($add_array);
 	}
 	function opensips_remove($id) {
-		$this->opensips_model->remove_opensips ( $id );
-		$this->session->set_flashdata ( 'astpp_notification', 'OpenSips Removed Successfully!' );
-		redirect ( base_url () . 'opensips/opensips_list/' );
+		$this->opensips_model->remove_opensips($id);
+		$this->session->set_flashdata('astpp_notification', 'OpenSips Removed Successfully!');
+		redirect(base_url().'opensips/opensips_list/');
 	}
 	function opensips_list() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Opensips Devices List' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Opensips Devices List');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->opensips_form->build_opensips_list ();
-		$data ["grid_buttons"] = $this->opensips_form->build_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->opensips_form->get_search_opensips_form () );
-		$this->load->view ( 'view_opensips_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->opensips_form->build_opensips_list();
+		$data ["grid_buttons"] = $this->opensips_form->build_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->opensips_form->get_search_opensips_form());
+		$this->load->view('view_opensips_list', $data);
 	}
 	
 	/**
@@ -246,105 +246,105 @@ 
 	 * Listing of Accounts table data through php function json_encode
 	 */
 	function opensips_list_json() {
-		$json_data = array ();
-		$count_all = $this->opensips_model->getopensipsdevice_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->opensips_model->getopensipsdevice_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->opensips_model->getopensipsdevice_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->opensips_form->build_opensips_list () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
-		$result = $this->opensips_db->get ( "subscriber" );
-		if ($result->num_rows () <= 0) {
+		$query = $this->opensips_model->getopensipsdevice_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->opensips_form->build_opensips_list());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
+		$result = $this->opensips_db->get("subscriber");
+		if ($result->num_rows() <= 0) {
 			$json_data ['page'] = 0;
 			$json_data ['total'] = 0;
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function opensips_list_search() {
 		// alert('hgjgh');
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
+		$ajax_search = $this->input->post('ajax_search', 0);
 		// alert();
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'opensipsdevice_list_search', $action );
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('opensipsdevice_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'opensips/opensips_list/' );
+			redirect(base_url().'opensips/opensips_list/');
 		}
 	}
 	function opensips_list_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', '' );
-		$this->session->set_userdata ( 'opensipsdevice_list_search', '' );
+		$this->session->set_userdata('advance_search', '');
+		$this->session->set_userdata('opensipsdevice_list_search', '');
 	}
 	
 	// dispather List add edit delete
 	function dispatcher_add() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Dispatcher' );
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_dispatcher_form_fields (), '' );
+		$data ['page_title'] = gettext('Dispatcher');
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_dispatcher_form_fields(), '');
 		
-		$this->load->view ( 'view_dispatcher_add_edit', $data );
+		$this->load->view('view_dispatcher_add_edit', $data);
 	}
 	function dispatcher_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Dispatcher' );
-		$this->opensips_db->where ( 'id', $edit_id );
-		$account = $this->opensips_db->get ( "dispatcher" );
-		foreach ( $account->result_array () as $key => $value ) {
+		$data ['page_title'] = gettext('Dispatcher');
+		$this->opensips_db->where('id', $edit_id);
+		$account = $this->opensips_db->get("dispatcher");
+		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
 		
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_dispatcher_form_fields (), $edit_data );
-		$this->load->view ( 'view_dispatcher_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_dispatcher_form_fields(), $edit_data);
+		$this->load->view('view_dispatcher_add_edit', $data);
 	}
 	function dispatcher_save() {
-		$add_array = $this->input->post ();
-		$data ['form'] = $this->form->build_form ( $this->opensips_form->get_dispatcher_form_fields (), $add_array );
+		$add_array = $this->input->post();
+		$data ['form'] = $this->form->build_form($this->opensips_form->get_dispatcher_form_fields(), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Dispatcher' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Dispatcher');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->edit_opensipsdispatcher ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->opensips_model->edit_opensipsdispatcher($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "Dispatcher Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Add Dispatcher' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add Dispatcher');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->opensips_model->add_opensipsdispatcher ( $add_array );
-				echo json_encode ( array (
+				$this->opensips_model->add_opensipsdispatcher($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "Dispatcher Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function dispatcher_remove($id) {
-		$this->opensips_model->remove_dispatcher ( $id );
-		$this->session->set_flashdata ( 'astpp_notification', 'Dispatcher Removed Successfully!' );
-		redirect ( base_url () . 'opensips/dispatcher_list/' );
+		$this->opensips_model->remove_dispatcher($id);
+		$this->session->set_flashdata('astpp_notification', 'Dispatcher Removed Successfully!');
+		redirect(base_url().'opensips/dispatcher_list/');
 	}
 	function dispatcher_list() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Opensips Dispatcher List' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Opensips Dispatcher List');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->opensips_form->build_opensipsdispatcher_list ();
-		$data ["grid_buttons"] = $this->opensips_form->build_grid_dispatcherbuttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->opensips_form->get_search_dispatcher_form () );
-		$this->load->view ( 'view_dispatcher_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->opensips_form->build_opensipsdispatcher_list();
+		$data ["grid_buttons"] = $this->opensips_form->build_grid_dispatcherbuttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->opensips_form->get_search_dispatcher_form());
+		$this->load->view('view_dispatcher_list', $data);
 	}
 	
 	/**
@@ -352,14 +352,14 @@ 
 	 * Listing of Accounts table data through php function json_encode
 	 */
 	function dispatcher_list_json() {
-		$json_data = array ();
-		$count_all = $this->opensips_model->getopensipsdispatcher_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->opensips_model->getopensipsdispatcher_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
 		
-		$query = $this->opensips_model->getopensipsdispatcher_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->opensips_form->build_opensipsdispatcher_list () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->opensips_model->getopensipsdispatcher_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->opensips_form->build_opensipsdispatcher_list());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		/*
 		 * $result = $this->opensips_db->get("subscriber");
 		 * if($result->num_rows() <= 0){
@@ -367,23 +367,23 @@ 
 		 * $json_data['total'] = 0;
 		 * }
 		 */
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function dispatcher_list_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			unset ( $_POST ['action'] );
-			unset ( $_POST ['advance_search'] );
-			$this->session->set_userdata ( 'opensipsdispatcher_list_search', $this->input->post () );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset ($_POST ['action']);
+			unset ($_POST ['advance_search']);
+			$this->session->set_userdata('opensipsdispatcher_list_search', $this->input->post());
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'opensips/dispatcher_list/' );
+			redirect(base_url().'opensips/dispatcher_list/');
 		}
 	}
 	function dispatcher_list_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'opensipsdispatcher_list_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('opensipsdispatcher_list_search', "");
 	}
 }
 

Braces +3 added lines, -2 removed lines

@@ -32,8 +32,9 @@
 		$db_config = Common_model::$global_config ['system_config'];
 		$opensipdsn = "mysql://" . $db_config ['opensips_dbuser'] . ":" . $db_config ['opensips_dbpass'] . "@" . $db_config ['opensips_dbhost'] . "/" . $db_config ['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database ( $opensipdsn, true );
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata ( 'user_login' ) == FALSE) {
+					redirect ( base_url () . '/astpp/login' );
+		}
 	}
 	function opensips_add() {
 		// echo 'dd';

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

Spacing +196 added lines, -196 removed lines

@@ -20,33 +20,33 @@ 
 // 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 Opensips_form {
 	function __construct() {
-		$this->CI = & get_instance ();
+		$this->CI = & get_instance();
 	}
 	function get_opensips_form_fields($id = false) {
-		$accountinfo = $this->CI->session->userdata ( "accountinfo" );
+		$accountinfo = $this->CI->session->userdata("accountinfo");
 		
-		$uname_user = $this->CI->common->find_uniq_rendno ( '10', '', '' );
-		$password = $this->CI->common->generate_password ();
-		$val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';
+		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');
+		$password = $this->CI->common->generate_password();
+		$val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';
 		
 		// echo '<pre>'; print_r($val); exit;
-		$loginid = $this->CI->session->userdata ( 'logintype' ) == 2 ? 0 : $accountinfo ['id'];
-		$form ['forms'] = array (
-				base_url () . 'opensips/opensips_save/',
-				array (
+		$loginid = $this->CI->session->userdata('logintype') == 2 ? 0 : $accountinfo ['id'];
+		$form ['forms'] = array(
+				base_url().'opensips/opensips_save/',
+				array(
 						"id" => "opensips_form",
 						"name" => "opensips_form" 
 				) 
 		);
-		$form ['Opensips Device'] = array (
-				array (
+		$form ['Opensips Device'] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -54,10 +54,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username',
 								'size' => '30',
 								'value' => $uname_user,
@@ -69,10 +69,10 @@ 
 						'Please Enter account number',
 						'<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'password',
 								'size' => '30',
 								'value' => $password,
@@ -84,8 +84,8 @@ 
 						'Please Enter Password',
 						'<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountcode',
 						'SELECT',
 						'',
@@ -97,16 +97,16 @@ 
 						'accounts',
 						'build_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => $loginid,
 								"type" => "GLOBAL",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Domain' ),
+				array(
+						gettext('Domain'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'domain',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -115,10 +115,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Caller Name' ),
+				array(
+						gettext('Caller Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_name',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -127,10 +127,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Caller Number' ),
+				array(
+						gettext('Caller Number'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_number',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -139,8 +139,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -153,17 +153,17 @@ 
 						'set_status' 
 				) 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'type' => 'button',
 				'id' => 'submit',
 				'class' => 'btn btn-line-parrot' 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
@@ -173,18 +173,18 @@ 
 		return $form;
 	}
 	function get_dispatcher_form_fields() {
-		$form ['forms'] = array (
-				base_url () . 'opensips/dispatcher_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'opensips/dispatcher_save/',
+				array(
 						"id" => "opensips_dispatcher_form",
 						"name" => "opensips_dispatcher_form" 
 				) 
 		);
-		$form ['Dispatcher Information'] = array (
-				array (
+		$form ['Dispatcher Information'] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -192,10 +192,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Setid' ),
+				array(
+						gettext('Setid'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'setid',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -204,10 +204,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Destination' ),
+				array(
+						gettext('Destination'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'destination',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -216,10 +216,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Weight' ),
+				array(
+						gettext('Weight'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'weight',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -228,10 +228,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Attrs' ),
+				array(
+						gettext('Attrs'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'attrs',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -240,10 +240,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Description' ),
+				array(
+						gettext('Description'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'description',
 								'size' => '100',
 								'class' => "text field medium" 
@@ -253,17 +253,17 @@ 
 						'' 
 				) 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'type' => 'button',
 				'id' => 'submit',
 				'class' => 'btn btn-line-parrot' 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
@@ -272,17 +272,17 @@ 
 		return $form;
 	}
 	function get_search_dispatcher_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "dispatcher_search" 
 				) 
 		);
-		$form ['Search'] = array (
-				array (
-						gettext ( 'Description' ),
+		$form ['Search'] = array(
+				array(
+						gettext('Description'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'description[description]',
 								'',
 								'size' => '20',
@@ -298,7 +298,7 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -307,7 +307,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -318,19 +318,19 @@ 
 				) 
 		);
 		
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "opensipsdispatcher_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
 				'content' => 'Clear',
-				'value' => gettext ( 'cancel' ),
+				'value' => gettext('cancel'),
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
 		);
@@ -338,17 +338,17 @@ 
 		return $form;
 	}
 	function get_search_opensips_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "opensips_list_search" 
 				) 
 		);
-		$form ['Search'] = array (
-				array (
-						gettext ( 'Username' ),
+		$form ['Search'] = array(
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username[username]',
 								'',
 								'size' => '20',
@@ -364,7 +364,7 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -373,7 +373,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -384,19 +384,19 @@ 
 				) 
 		);
 		
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "opensipsdevice_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
 				'content' => 'Clear',
-				'value' => gettext ( 'cancel' ),
+				'value' => gettext('cancel'),
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
 		);
@@ -405,9 +405,9 @@ 
 	}
 	function build_opensips_list() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Username" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Username"),
 						"150",
 						"username",
 						"",
@@ -417,8 +417,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"150",
 						"password",
 						"",
@@ -428,8 +428,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Account" ),
+				array(
+						gettext("Account"),
 						"150",
 						"accountcode",
 						"",
@@ -439,8 +439,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Domain" ),
+				array(
+						gettext("Domain"),
 						"317",
 						"domain",
 						"",
@@ -450,8 +450,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Name" ),
+				array(
+						gettext("Caller Name"),
 						"200",
 						"effective_caller_id_name",
 						"",
@@ -461,8 +461,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Number" ),
+				array(
+						gettext("Caller Number"),
 						"200",
 						"effective_caller_id_number",
 						"",
@@ -472,31 +472,31 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"100",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/opensips/opensips_edit/",
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/opensips/opensips_remove/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function build_opensipsdispatcher_list() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Set Id" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Set Id"),
 						"160",
 						"setid",
 						"",
@@ -506,8 +506,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Destination" ),
+				array(
+						gettext("Destination"),
 						"160",
 						"destination",
 						"",
@@ -517,8 +517,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Weight" ),
+				array(
+						gettext("Weight"),
 						"190",
 						"weight",
 						"",
@@ -528,8 +528,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Attrs" ),
+				array(
+						gettext("Attrs"),
 						"180",
 						"attrs",
 						"",
@@ -539,8 +539,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Description" ),
+				array(
+						gettext("Description"),
 						"190",
 						"description",
 						"",
@@ -550,29 +550,29 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"170",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/opensips/dispatcher_edit/",
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/opensips/dispatcher_remove/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function build_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
+		$buttons_json = json_encode(array(
+				array(
 						"Create",
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
@@ -586,8 +586,8 @@ 
 		return $buttons_json;
 	}
 	function build_grid_dispatcherbuttons() {
-		$buttons_json = json_encode ( array (
-				array (
+		$buttons_json = json_encode(array(
+				array(
 						"Create",
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
@@ -601,23 +601,23 @@ 
 		return $buttons_json;
 	}
 	function get_opensips_form_fields_for_customer($accountid, $id = false) {
-		$val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';
-		$uname_user = $this->CI->common->find_uniq_rendno ( '10', '', '' );
-		$password = $this->CI->common->generate_password ();
-		$accountinfo = $this->CI->session->userdata ( 'accountinfo' );
-		$link = ($accountinfo ['type'] == 1 || $accountinfo ['type'] == 3) ? base_url () . 'opensips/user_opensips_save/true/' : base_url () . 'opensips/customer_opensips_save/true/';
-		$form ['forms'] = array (
+		$val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';
+		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');
+		$password = $this->CI->common->generate_password();
+		$accountinfo = $this->CI->session->userdata('accountinfo');
+		$link = ($accountinfo ['type'] == 1 || $accountinfo ['type'] == 3) ? base_url ().'opensips/user_opensips_save/true/' : base_url().'opensips/customer_opensips_save/true/';
+		$form ['forms'] = array(
 				$link,
-				array (
+				array(
 						"id" => "opensips_form",
 						"name" => "opensips_form" 
 				) 
 		);
-		$form ['Opensips Device'] = array (
-				array (
+		$form ['Opensips Device'] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -625,24 +625,24 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'accountcode',
-								'value' => $this->CI->common->get_field_name ( 'number', 'accounts', array (
+								'value' => $this->CI->common->get_field_name('number', 'accounts', array(
 										'id' => $accountid 
-								) ) 
+								)) 
 						),
 						'',
 						'',
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username',
 								'size' => '20',
 								'id' => 'username',
@@ -654,10 +654,10 @@ 
 						'Please Enter account number',
 						'<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'PASSWORD',
-						array (
+						array(
 								'name' => 'password',
 								'size' => '20',
 								'id' => 'password1',
@@ -669,10 +669,10 @@ 
 						'Please Enter Password',
 						'<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Domain' ),
+				array(
+						gettext('Domain'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'domain',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -681,10 +681,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Caller Name' ),
+				array(
+						gettext('Caller Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_name',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -693,10 +693,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Caller Number' ),
+				array(
+						gettext('Caller Number'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_number',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -705,8 +705,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -719,18 +719,18 @@ 
 						'set_status' 
 				) 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'type' => 'button',
 				'id' => 'submit',
 				'class' => 'btn btn-line-parrot' 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
 				'content' => 'Close',
-				gettext ( 'value' ) => 'cancel',
+				gettext('value') => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
@@ -739,54 +739,54 @@ 
 	}
 	function user_opensips() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Username" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Username"),
 						"130",
 						"username",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"130",
 						"password",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Domain" ),
+				array(
+						gettext("Domain"),
 						"130",
 						"domain",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"120",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => 'user/user_opensips_action/edit/',
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => 'user/user_opensips_action/delete/',
 										"mode" => "popup" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function opensips_customer_build_grid_buttons($accountid) {
-		$buttons_json = json_encode ( array (
-				array (
+		$buttons_json = json_encode(array(
+				array(
 						"Add Devices",
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
@@ -802,33 +802,33 @@ 
 	function opensips_customer_build_opensips_list($accountid) {
 		// echo $accountid;
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Username" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Username"),
 						"200",
 						"username",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"200",
 						"password",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Domain" ),
+				array(
+						gettext("Domain"),
 						"200",
 						"domain",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Caller Name" ),
+				array(
+						gettext("Caller Name"),
 						"150",
 						"effective_caller_id_name",
 						"",
@@ -838,8 +838,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Number" ),
+				array(
+						gettext("Caller Number"),
 						"150",
 						"effective_caller_id_number",
 						"",
@@ -849,24 +849,24 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"100",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
-										"url" => 'accounts/customer_opensips_action/edit/' . $accountid . '/',
+						array(
+								"EDIT" => array(
+										"url" => 'accounts/customer_opensips_action/edit/'.$accountid.'/',
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
-										"url" => 'accounts/customer_opensips_action/delete/' . $accountid . "/",
+								"DELETE" => array(
+										"url" => 'accounts/customer_opensips_action/delete/'.$accountid."/",
 										"mode" => "popup" 
 								) 
 						) 
 				) 
-		) );
+		));
 		
 		return $grid_field_arr;
 	}

Braces +2 added lines, -1 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' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 class Opensips_form {
 	function __construct() {
 		$this->CI = & get_instance ();

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

Spacing +39 added lines, -39 removed lines

@@ -23,74 +23,74 @@
 // ##############################################################################
 class Signup_model extends CI_Model {
 	function Signup_model() {
-		parent::__construct ();
+		parent::__construct();
 		
-		$this->load->model ( 'Astpp_common' );
-		$this->load->helper ( 'form' );
-		$this->load->model ( 'common_model' );
-		$this->load->library ( 'session' );
+		$this->load->model('Astpp_common');
+		$this->load->helper('form');
+		$this->load->model('common_model');
+		$this->load->library('session');
 	}
 	function get_rate() {
-		$data = array ();
-		$this->load->database ();
+		$data = array();
+		$this->load->database();
 		
-		$this->db->select ( "id,name" );
-		$this->db->from ( 'pricelists' );
-		$this->db->where ( "status", "0" );
-		$query = $this->db->get ();
-		return $query->row ();
+		$this->db->select("id,name");
+		$this->db->from('pricelists');
+		$this->db->where("status", "0");
+		$query = $this->db->get();
+		return $query->row();
 	}
 	function add_user($data) {
 		$data ['reseller_id'] = $data ['key_unique'];
-		unset ( $data ['agreeCheck'] );
-		unset ( $data ['key_unique'] );
-		$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 );
-		return $this->db->insert_id ();
+		unset ($data ['agreeCheck']);
+		unset ($data ['key_unique']);
+		$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);
+		return $this->db->insert_id();
 	}
 	function check_user($accno, $email, $balance) {
-		$info = array (
+		$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 = $acc_res->result_array ();
+		$this->db->where($info);
+		$this->db->select('*');
+		$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'] );
-			$this->db->select ( "*" );
-			$charge_res = $this->db->get ( 'charges' );
+			$this->db->where('pricelist_id', $acc_res ['pricelist_id']);
+			$this->db->select("*");
+			$charge_res = $this->db->get('charges');
 			
-			if ($charge_res->num_rows () > 0) {
-				$charge_res = $charge_res->result_array ();
+			if ($charge_res->num_rows() > 0) {
+				$charge_res = $charge_res->result_array();
 				$charge_res = $charge_res [0];
-				$charge_acc_arr = array (
+				$charge_acc_arr = array(
 						"charge_id" => $charge_res ['id'],
 						"accountid" => $acc_res ['id'],
 						"status" => 0,
-						"assign_date" => date ( 'Y-m-d H:i:s' ) 
+						"assign_date" => date('Y-m-d H:i:s') 
 				);
 			} else {
-				$charge_res = $charge_res->result_array ();
+				$charge_res = $charge_res->result_array();
 				// echo "<pre>"; print_r($charge_res); exit;
-				$charge_acc_arr = array (
+				$charge_acc_arr = array(
 						"charge_id" => 'id',
 						"accountid" => $acc_res ['id'],
-						"assign_date" => date ( 'Y-m-d H:i:s' ) 
+						"assign_date" => date('Y-m-d H:i:s') 
 				);
 			}
-			$result = $this->db->insert ( "charge_to_account", $charge_acc_arr );
-			$update = array (
+			$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 (
+			$this->db->where($info);
+			$result = $this->db->update('accounts', $update);
+			$sip_device_update = array(
 					'username' => $accno,
 					"status" => 1 
 			);

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

Spacing +210 added lines, -210 removed lines

@@ -23,49 +23,49 @@ 
 // ##############################################################################
 class Signup extends MX_Controller {
 	function signup() {
-		parent::__construct ();
-		$this->load->model ( 'signup_model' );
-		$this->load->helper ( 'captcha' );
-		$this->load->helper ( 'template_inheritance' );
+		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' );
+		$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' );
+		error_reporting( -1 );
+		ini_set('display_errors', 'On');
 		
-		$data ['row'] = $this->signup_model->get_rate ();
+		$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'];
+		$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 (
+		$vals = array(
 				'word' => $random_number,
-				'img_path' => getcwd () . '/assets/captcha/',
-				'img_url' => base_url () . 'assets/captcha/',
+				'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 != '') {
+		if (isset ($key) && $key != '') {
 			$data ['key_unique'] = $key;
 		} else {
 			$data ['key_unique'] = "admin";
@@ -73,122 +73,122 @@ 
 		$unique = $data ['key_unique'];
 		
 		if ($unique != "admin") {
-			$unique = $this->common->decode_params ( trim ( $unique ) );
-			$decoded_str = $this->common->decode ( $unique );
+			$unique = $this->common->decode_params(trim($unique));
+			$decoded_str = $this->common->decode($unique);
 			$unique = $decoded_str;
-			$query = $this->db_model->getSelect ( "*", 'accounts', array (
+			$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) {
+				redirect(base_url()."signup/signup_inactive");
 			}
-			if ($query->num_rows () > 0) {
-				$query = $query->result_array ();
+			if ($query->num_rows() > 0) {
+				$query = $query->result_array();
 				$query = $query [0];
 				
 				if ($query ['status'] != 0) {
-					redirect ( base_url () . "signup/signup_inactive" );
+					redirect(base_url()."signup/signup_inactive");
 				}
 			}
 		}
-		$data ['captcha'] = create_captcha ( $vals );
-		$this->session->set_userdata ( 'captchaWord', $data ['captcha'] ['word'] );
-		$this->db->select ( "*" );
-		$this->db->where ( array (
+		$data ['captcha'] = create_captcha($vals);
+		$this->session->set_userdata('captchaWord', $data ['captcha'] ['word']);
+		$this->db->select("*");
+		$this->db->where(array(
 				"domain" => $_SERVER ["HTTP_HOST"] 
-		) );
-		$res = $this->db->get ( "invoice_conf" );
-		$logo_arr = $res->result ();
+		));
+		$res = $this->db->get("invoice_conf");
+		$logo_arr = $res->result();
 		// ~ echo "<pre>"; print_r($_SERVER); exit;
-		$data ['user_logo'] = (isset ( $logo_arr [0]->logo ) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid . "_" . $logo_arr [0]->logo : "logo.png";
-		$data ['website_header'] = (isset ( $logo_arr [0]->website_title ) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
-		$data ['website_footer'] = (isset ( $logo_arr [0]->website_footer ) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
-		$this->session->set_userdata ( 'user_logo', $data ['user_logo'] );
-		$this->session->set_userdata ( 'user_header', $data ['website_header'] );
-		$this->session->set_userdata ( 'user_footer', $data ['website_footer'] );
-		$this->load->view ( 'view_signup', $data );
+		$data ['user_logo'] = (isset ($logo_arr [0]->logo) && $logo_arr [0]->logo != "") ? $logo_arr [0]->accountid."_".$logo_arr [0]->logo : "logo.png";
+		$data ['website_header'] = (isset ($logo_arr [0]->website_title) && $logo_arr [0]->website_title != "") ? $logo_arr [0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+		$data ['website_footer'] = (isset ($logo_arr [0]->website_footer) && $logo_arr [0]->website_footer != "") ? $logo_arr [0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
+		$this->session->set_userdata('user_logo', $data ['user_logo']);
+		$this->session->set_userdata('user_header', $data ['website_header']);
+		$this->session->set_userdata('user_footer', $data ['website_footer']);
+		$this->load->view('view_signup', $data);
 	}
 	public function check_captcha($str) {
-		$word = $this->session->userdata ( 'captchaWord' );
-		if (strcmp ( strtoupper ( $str ), strtoupper ( $word ) ) == 0) {
+		$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!' );
+			$this->form_validation->set_message('check_captcha', 'Please enter correct words!');
 			return false;
 		}
 	}
 	function terms_check() {
-		if (isset ( $_POST ['agreeCheck'] )) {
+		if (isset ($_POST ['agreeCheck'])) {
 			return true;
 		}
-		$this->form_validation->set_message ( 'terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!' );
+		$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/" );
+		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 (
+			$post_values = $this->input->post();
+			$userCaptcha = $this->input->post('userCaptcha');
+			$cnt_result = $this->db_model->countQuery("*", 'accounts', array(
 					'email' => $post_values ['email'],
 					'deleted' => 0 
-			) );
+			));
 			
-			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 )) {
+			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' )) {
+				if ($userCaptcha != $this->session->userdata('captchaWord')) {
 					$data ['error'] ['userCaptcha'] = "<div id='capcha_error' style='color: red;'>Please enter valid Captcha code</div>";
 				}
 				if ($cnt_result > 0) {
 					$data ['error'] ['email'] = "<div id= 'email_error' style='color: red;'>Email Address already exists</div>";
 				}
-				$random_number = substr ( number_format ( time () * rand (), 0, '', '' ), 0, 6 );
-				$vals = array (
+				$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/',
+						'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") {
+				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'];
+				$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 ['captcha'] = create_captcha($vals);
 				
-				$this->session->set_userdata ( 'captchaWord', $data ['captcha'] ['word'] );
+				$this->session->set_userdata('captchaWord', $data ['captcha'] ['word']);
 				$data ['key_unique'] = $_POST ['key_unique'];
-				$this->load->view ( 'view_signup', $data );
+				$this->load->view('view_signup', $data);
 			} else {
 				// AVTLATP
-				$user_data = $this->input->post ();
+				$user_data = $this->input->post();
 				
-				if (! isset ( $_POST ['key_unique'] ) || ! isset ( $_POST ['email'] )) {
-					redirect ( base_url () . "signup/" );
+				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'] );
+				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'];
@@ -197,15 +197,15 @@ 
 				// 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 ['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 ['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'] );
+				unset ($user_data ['userCaptcha']);
+				unset ($user_data ['action']);
 				
 				$system_config = common_model::$global_config ['system_config'];
 				$balance = $system_config ["balance"];
@@ -222,16 +222,16 @@ 
 				$selection_rategroup_signup = $system_config ["default_signup_rategroup"];
 				
 				if ($reseller_id != 0) {
-					$result = $this->db_model->getSelect ( "*", "pricelists", array (
+					$result = $this->db_model->getSelect("*", "pricelists", array(
 							"reseller_id" => $reseller_id 
-					), "ASC" );
-					$result_arr = $result->result_array ();
+					), "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;
+					$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 (
+					$pricelist_id = $this->common->get_field_name('id', 'pricelists', array(
 							'name' => $selection_rategroup_signup 
-					) );
+					));
 					/*
 					 * if($pricelis_id != "")
 					 * $user_data['pricelist_id'] = $pricelis_id;
@@ -244,21 +244,21 @@ 
 				// Insert or Update record
 				$signup_sipdevice_flag = $system_config ['create_sipdevice'];
 				$user_data ['is_recording'] = 1;
-				$last_id = $this->signup_model->add_user ( $user_data );
+				$last_id = $this->signup_model->add_user($user_data);
 				if ($last_id == "") {
-					redirect ( base_url () . "signup/signup_inactive" );
+					redirect(base_url()."signup/signup_inactive");
 				}
 				if ($signup_sipdevice_flag == '0') {
-					$query = $this->db_model->select ( "*", "sip_profiles", array (
+					$query = $this->db_model->select("*", "sip_profiles", array(
 							'name' => "default" 
-					), "id", "ASC", '1', '0' );
-					$sip_id = $query->result_array ();
+					), "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 (
+					$free_switch_array = array(
 							'fs_username' => $user_data ['number'],
 							'fs_password' => $user_data ['password'],
 							'context' => 'default',
@@ -276,204 +276,204 @@ 
 							'vm_keep_local_after_email' => true,
 							'vm_send_all_message' => true 
 					);
-					$user_custom_array = array_merge ( $user_data, $free_switch_array );
+					$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 );
+					$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 );
+				$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" );
+				$this->send_mail($last_id, 'email_signup_confirmation', $user_data);
+				redirect(base_url()."signup/signup_success");
 			}
 		}
 	}
 	function signup_confirm() {
-		if (! empty ( $_GET )) {
+		if ( ! empty ($_GET)) {
 			
 			$system_config = common_model::$global_config ['system_config'];
 			$balance = $system_config ["balance"];
-			$accno = $this->encrypt->decode ( $_GET ['key'] );
+			$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 (
+			$success = $this->signup_model->check_user($accno, $email, $balance);
+			$query = $this->db_model->getSelect("*", "accounts", array(
 					'number' => $accno 
-			) );
-			$data = $query->result_array ();
+			));
+			$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 );
+			$user_data ['confirm'] = base_url();
+			$this->active($user_data, $success);
 		} else {
-			redirect ( base_url () );
+			redirect(base_url());
 		}
 	}
 	function signup_success() {
-		$this->load->view ( 'view_signup_success' );
+		$this->load->view('view_signup_success');
 	}
 	function signup_inactive() {
-		$this->load->view ( 'view_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 );
+			$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 );
+		$this->load->view('view_signup_active', $data);
 	}
 	function forgotpassword() {
-		$this->load->view ( 'view_forgotpassword' );
+		$this->load->view('view_forgotpassword');
 	}
 	function confirmpassword() {
 		$email = $_POST ['email'];
-		unset ( $_POST ['action'] );
-		$where = array (
+		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 (
+		$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 (
+			$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 ();
+			$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 ['deleted'] == 1) {
 					$data ['error'] ['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>Your account has been deleted. Please contact administrator for more information</div>";
-					$this->load->view ( 'view_forgotpassword', $data );
+					$this->load->view('view_forgotpassword', $data);
 					exit ();
 				}
 				if ($user_data ['status'] > 0) {
 					$data ['error'] ['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>Your account is inactive. Please contact administrator for more information</div>";
-					$this->load->view ( 'view_forgotpassword', $data );
+					$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 )) {
+			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 );
+					$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 );
+					$this->load->view('view_forgotpassword', $data);
 				}
-			} else if ($acountdata->num_rows () == 0) {
+			} 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 );
+				$this->load->view('view_forgotpassword', $data);
 			} else {
-				$acountdata = $acountdata->result_array ();
+				$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 );
+				$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 (
+				$where = array(
 						"email" => $user_data ['email'] 
 				);
-				$data = array (
+				$data = array(
 						"pass_link_status" => 1 
 				);
-				$this->db->where ( $where );
-				$this->db->update ( 'accounts', $data );
+				$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' );
+				$this->send_mail($user_data ['id'], 'email_forgot_confirmation', $user_data);
+				$this->load->view('view_forgot_success');
 			}
 		} else {
-			redirect ( base_url () );
+			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 (
+		$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 ();
+			$acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
 				$user_data = $acountdata [0];
-				$updateArr = array (
+				$updateArr = array(
 						"pass_link_status" => 0 
 				);
-				$this->db->where ( array (
+				$this->db->where(array(
 						"email" => $email1 
-				) );
-				$this->db->update ( "accounts", $updateArr );
+				));
+				$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 );
+					$this->active($user_data, $success);
 				} else {
 					$data ['email'] = $_GET ['email'];
-					$this->load->view ( 'view_confirmpassword', $data );
+					$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 (
+		$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 ();
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
 				$user_data = $acountdata [0];
 			}
-			$user_data ['password'] = $this->common->encode ( $passwordconf ['password'] );
-			$updateArr = array (
+			$user_data ['password'] = $this->common->encode($passwordconf ['password']);
+			$updateArr = array(
 					"password" => $user_data ['password'] 
 			);
-			$where_arr = array (
+			$where_arr = array(
 					"email" => $email1,
 					"status" => 0 
 			);
-			$this->db->where ( $where_arr );
-			$this->db->update ( "accounts", $updateArr );
+			$this->db->where($where_arr);
+			$this->db->update("accounts", $updateArr);
 			// $activation = $this->encrypt->encode($user_data['number']);
-			$message = base_url ();
+			$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->send_mail($user_data ['id'], 'email_forgot_user', $user_data);
 			
-			$this->successpassword ();
+			$this->successpassword();
 		}
 	}
 	
@@ -488,39 +488,39 @@ 
 		// $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S $screen_filename php cron.php BroadcastEmail";
 		// exec($command);
 		
-		$where = array (
+		$where = array(
 				'name' => $temp_name 
 		);
-		$EmailTemplate = $this->db_model->getSelect ( "*", "default_templates", $where );
+		$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 ();
+		$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 ) {
+		foreach ($EmailTemplate->result_array() as $value) {
 			$TemplateData = $value;
-			$message = str_replace ( "<p>", "", $TemplateData ['template'] );
-			$message = str_replace ( "</p>", "", $TemplateData ['template'] );
+			$message = str_replace("<p>", "", $TemplateData ['template']);
+			$message = str_replace("</p>", "", $TemplateData ['template']);
 			
-			$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'] );
+			$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 (
+		$email_array = array(
 				'accountid' => $account_id,
 				'subject' => $TemplateData ['subject'],
 				'body' => $TemplateData ['template'],
@@ -531,11 +531,11 @@ 
 				'template' => '' 
 		);
 		// echo "<pre>"; print_r($TemplateData); exit;
-		$this->db->insert ( "mail_details", $email_array );
+		$this->db->insert("mail_details", $email_array);
 		return true;
 	}
 	function successpassword() {
-		$this->load->view ( 'view_successpassword' );
+		$this->load->view('view_successpassword');
 	}
 }
 ?>

web_interface/astpp/application/modules/ipmap/models/ipmap_model.php

Spacing +33 added lines, -33 removed lines

@@ -23,41 +23,41 @@ 
 // ##############################################################################
 class IPMAP_model extends CI_Model {
 	function IPMAP_model() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	function ipmap_list($flag, $start = 0, $limit = 0) {
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
-		if ($this->session->userdata ( 'logintype' ) == 1 || $this->session->userdata ( 'logintype' ) == 5) {
-			$qry = $this->db_model->getselect ( 'id', 'accounts', array (
+		$accountinfo = $this->session->userdata('accountinfo');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$qry = $this->db_model->getselect('id', 'accounts', array(
 					'reseller_id' => $accountinfo ['id'] 
-			) );
-			$result = $qry->result_array ();
-			foreach ( $result as $value1 ) {
+			));
+			$result = $qry->result_array();
+			foreach ($result as $value1) {
 				$value [] = $value1 ['id'];
 			}
-			if (! empty ( $value )) {
-				$this->db->where_in ( 'accountid', $value );
+			if ( ! empty ($value)) {
+				$this->db->where_in('accountid', $value);
 			} else {
-				$this->db->where_in ( 'accountid', '0' );
+				$this->db->where_in('accountid', '0');
 			}
 		} else {
 			
-			$qry = $this->db_model->getselect ( 'id', 'accounts', array (
+			$qry = $this->db_model->getselect('id', 'accounts', array(
 					'reseller_id' => 0 
-			) );
-			$result = $qry->result_array ();
+			));
+			$result = $qry->result_array();
 			
-			foreach ( $result as $value1 ) {
+			foreach ($result as $value1) {
 				$value [] = $value1 ['id'];
 			}
 			// $this->db->where_in('accountid', $value);
-			if (! empty ( $value )) {
-				$this->db->where_in ( 'accountid', $value );
+			if ( ! empty ($value)) {
+				$this->db->where_in('accountid', $value);
 			} else {
-				$this->db->where_in ( 'accountid', '0' );
+				$this->db->where_in('accountid', '0');
 			}
 		}
-		$this->db_model->build_search ( 'ipmap_list_search' );
+		$this->db_model->build_search('ipmap_list_search');
 		/**
 		 * *****
 		 * ASTPP 3.0
@@ -65,7 +65,7 @@ 
 		 * *****
 		 */
 		if ($accountinfo ['type'] == '0') {
-			$where = array (
+			$where = array(
 					'accountid' => $accountinfo ['id'] 
 			);
 		} else {
@@ -81,7 +81,7 @@ 
 			 * in customer login show ipmap (ACL) module
 			 * *****
 			 */
-			$query = $this->db_model->select ( "*", "ip_map", $where, "id", "ASC", $limit, $start );
+			$query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $limit, $start);
 		/**
 		 * ****************************************************************************************
 		 */
@@ -92,7 +92,7 @@ 
 			 * in customer login show ipmap (ACL) module
 			 * *****
 			 */
-			$query = $this->db_model->countQuery ( "*", "ip_map", $where );
+			$query = $this->db_model->countQuery("*", "ip_map", $where);
 		/**
 		 * **********************************************************************************************************
 		 */
@@ -107,15 +107,15 @@ 
 		 * in customer login show ipmap (ACL) module
 		 * *****
 		 */
-		$account_data = $this->session->userdata ( "accountinfo" );
+		$account_data = $this->session->userdata("accountinfo");
 		if ($account_data ['type'] == '0') {
 			$add_array ['accountid'] = $account_data ['id'];
 		}
 		/**
 		 * ****************************************************************
 		 */
-		$data = array (
-				'created_date' => gmdate ( 'Y-m-d H:i:s' ),
+		$data = array(
+				'created_date' => gmdate('Y-m-d H:i:s'),
 				'name' => $add_array ['name'],
 				'ip' => $add_array ['ip'],
 				'prefix' => $add_array ['prefix'],
@@ -123,8 +123,8 @@ 
 				'status' => $add_array ['status'],
 				'context' => 'default' 
 		);
-		$this->db->insert ( "ip_map", $data );
-		return $this->db->insert_id ();
+		$this->db->insert("ip_map", $data);
+		return $this->db->insert_id();
 	}
 	function edit_ipmap($add_array, $id) {
 		/**
@@ -133,15 +133,15 @@ 
 		 * in customer login show ipmap (ACL) module
 		 * *****
 		 */
-		$account_data = $this->session->userdata ( "accountinfo" );
+		$account_data = $this->session->userdata("accountinfo");
 		if ($account_data ['type'] == '0') {
 			$add_array ['accountid'] = $account_data ['id'];
 		}
 		/**
 		 * *********************************************************************************************
 		 */
-		$data = array (
-				'last_modified_date' => gmdate ( 'Y-m-d H:i:s' ),
+		$data = array(
+				'last_modified_date' => gmdate('Y-m-d H:i:s'),
 				'name' => $add_array ['name'],
 				'ip' => $add_array ['ip'],
 				'prefix' => $add_array ['prefix'],
@@ -149,12 +149,12 @@ 
 				'status' => $add_array ['status'],
 				'context' => 'default' 
 		);
-		$this->db->where ( "id", $id );
-		return $this->db->update ( "ip_map", $data );
+		$this->db->where("id", $id);
+		return $this->db->update("ip_map", $data);
 	}
 	function remove_ipmap($id) {
-		$this->db->where ( "id", $id );
-		$this->db->delete ( "ip_map" );
+		$this->db->where("id", $id);
+		$this->db->delete("ip_map");
 		return true;
 	}
 }

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

Spacing +105 added lines, -105 removed lines

@@ -23,30 +23,30 @@ 
 // ##############################################################################
 class IPMAP extends MX_Controller {
 	function IPMAP() {
-		parent::__construct ();
-		$this->load->helper ( 'template_inheritance' );
-		$this->load->library ( 'session' );
-		$this->load->library ( "ipmap_form" );
-		$this->load->library ( 'astpp/form' );
-		$this->load->model ( 'ipmap_model' );
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		parent::__construct();
+		$this->load->helper('template_inheritance');
+		$this->load->library('session');
+		$this->load->library("ipmap_form");
+		$this->load->library('astpp/form');
+		$this->load->model('ipmap_model');
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
 	}
 	function ipmap_add() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Add IP Map' );
-		$data ['form'] = $this->form->build_form ( $this->ipmap_form->get_ipmap_form_fields (), '' );
-		$this->load->view ( 'ipmap_add_edit', $data );
+		$data ['page_title'] = gettext('Add IP Map');
+		$data ['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), '');
+		$this->load->view('ipmap_add_edit', $data);
 	}
 	function ipmap_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit IP Map' );
-		$where = array (
+		$data ['page_title'] = gettext('Edit IP Map');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$account = $this->db_model->getSelect ( "*", "ip_map", $where );
+		$account = $this->db_model->getSelect("*", "ip_map", $where);
 		// echo $this->db->last_query(); exit;
-		foreach ( $account->result_array () as $key => $value ) {
+		foreach ($account->result_array() as $key => $value) {
 			/**
 			 * *******************
 			 * ASTPP 3.0
@@ -58,100 +58,100 @@ 
 		/**
 		 * **********************************************************************************************
 		 */
-		$data ['form'] = $this->form->build_form ( $this->ipmap_form->get_ipmap_form_fields (), $edit_data );
-		$this->load->view ( 'ipmap_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), $edit_data);
+		$this->load->view('ipmap_add_edit', $data);
 	}
 	function ipmap_save() {
-		$add_array = $this->input->post ();
+		$add_array = $this->input->post();
 		$ip = $add_array ['ip'];
-		if (strpos ( $ip, '/' ) !== false) {
+		if (strpos($ip, '/') !== false) {
 			$add_array ['ip'] = $add_array ['ip'];
 		} else {
-			$add_array ['ip'] = $add_array ['ip'] . '/32';
+			$add_array ['ip'] = $add_array ['ip'].'/32';
 		}
-		$data ['form'] = $this->form->build_form ( $this->ipmap_form->get_ipmap_form_fields (), $add_array );
+		$data ['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Add IP Map' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add IP Map');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			}
-			$this->db->select ( 'prefix,ip' );
-			$this->db->where ( [ 
+			$this->db->select('prefix,ip');
+			$this->db->where([ 
 					'prefix' => $add_array ['prefix'],
 					'ip' => $add_array ['ip'],
 					'id <>' => $add_array ['id'] 
-			] );
-			$ip_prefix = ( array ) $this->db->get ( 'ip_map' )->first_row ();
-			if (! empty ( $ip_prefix )) {
-				echo json_encode ( array (
+			]);
+			$ip_prefix = (array)$this->db->get('ip_map')->first_row();
+			if ( ! empty ($ip_prefix)) {
+				echo json_encode(array(
 						"prefix_error" => "The Prefix field must contain a unique value.
 ",
 						"ip_error" => "The IP field must contain a unique value." 
-				) );
+				));
 				exit ();
 			} else {
-				$ip_free = $this->ipmap_model->edit_ipmap ( $add_array, $add_array ['id'] );
+				$ip_free = $this->ipmap_model->edit_ipmap($add_array, $add_array ['id']);
 				if ($ip_free) {
-					$this->load->library ( 'freeswitch_lib' );
-					$this->load->module ( 'freeswitch/freeswitch' );
+					$this->load->library('freeswitch_lib');
+					$this->load->module('freeswitch/freeswitch');
 					$command = "api reloadacl";
-					$response = $this->freeswitch_model->reload_freeswitch ( $command );
-					$this->session->set_userdata ( 'astpp_notification', $response );
+					$response = $this->freeswitch_model->reload_freeswitch($command);
+					$this->session->set_userdata('astpp_notification', $response);
 				}
-				echo json_encode ( array (
+				echo json_encode(array(
 						"SUCCESS" => " IP Map updated successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
 			
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			}
-			$this->db->select ( 'prefix,ip' );
-			$this->db->where ( [ 
+			$this->db->select('prefix,ip');
+			$this->db->where([ 
 					'prefix' => $add_array ['prefix'],
 					'ip' => $add_array ['ip'] 
-			] );
-			$ip_prefix = ( array ) $this->db->get ( 'ip_map' )->first_row ();
+			]);
+			$ip_prefix = (array)$this->db->get('ip_map')->first_row();
 			
-			if (! empty ( $ip_prefix )) {
-				echo json_encode ( array (
+			if ( ! empty ($ip_prefix)) {
+				echo json_encode(array(
 						"prefix_error" => "The Prefix field must contain a unique value.
 ",
 						"ip_error" => "The IP field must contain a unique value." 
-				) );
+				));
 				exit ();
 			} else {
-				$ip_free = $this->ipmap_model->add_ipmap ( $add_array );
+				$ip_free = $this->ipmap_model->add_ipmap($add_array);
 				if ($ip_free) {
-					$this->load->library ( 'freeswitch_lib' );
-					$this->load->module ( 'freeswitch/freeswitch' );
+					$this->load->library('freeswitch_lib');
+					$this->load->module('freeswitch/freeswitch');
 					$command = "api reloadacl";
-					$response = $this->freeswitch_model->reload_freeswitch ( $command );
-					$this->session->set_userdata ( 'astpp_notification', $response );
+					$response = $this->freeswitch_model->reload_freeswitch($command);
+					$this->session->set_userdata('astpp_notification', $response);
 				}
-				echo json_encode ( array (
+				echo json_encode(array(
 						"SUCCESS" => " IP Map added successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function ipmap_delete($id) {
-		$ip_free = $this->ipmap_model->remove_ipmap ( $id );
+		$ip_free = $this->ipmap_model->remove_ipmap($id);
 		if ($ip_free) {
-			$this->load->library ( 'freeswitch_lib' );
-			$this->load->module ( 'freeswitch/freeswitch' );
+			$this->load->library('freeswitch_lib');
+			$this->load->module('freeswitch/freeswitch');
 			$command = "api reloadacl";
-			$response = $this->freeswitch_model->reload_freeswitch ( $command );
-			$this->session->set_userdata ( 'astpp_notification', $response );
+			$response = $this->freeswitch_model->reload_freeswitch($command);
+			$this->session->set_userdata('astpp_notification', $response);
 		}
-		$this->session->set_flashdata ( 'astpp_notification', 'IP Map removed successfully!' );
+		$this->session->set_flashdata('astpp_notification', 'IP Map removed successfully!');
 		/**
 		 * *******************
 		 * ASTPP 3.0
@@ -160,40 +160,40 @@ 
 		 */
 		$accountdata = $this->session->userdata ['accountinfo'];
 		if ($accountdata ['type'] == '0') {
-			redirect ( base_url () . 'user/user_ipmap_detail/' );
+			redirect(base_url().'user/user_ipmap_detail/');
 		} else {
-			redirect ( base_url () . 'ipmap/ipmap_detail/' );
+			redirect(base_url().'ipmap/ipmap_detail/');
 		}
 	/**
 	 * ******************************************************************
 	 */
 	}
 	function ipmap_detail_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'ipmap_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('ipmap_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'ipmap/ipmap_list/' );
+			redirect(base_url().'ipmap/ipmap_list/');
 		}
 	}
 	function ipmap_detail_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'ipmap_list_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('ipmap_list_search', "");
 	}
 	function ipmap_detail() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'IP Map(ACL)' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('IP Map(ACL)');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->ipmap_form->build_ipmap_list_for_admin ();
-		$data ["grid_buttons"] = $this->ipmap_form->build_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->ipmap_form->get_ipmap_search_form () );
-		$this->load->view ( 'ipmap_view', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->ipmap_form->build_ipmap_list_for_admin();
+		$data ["grid_buttons"] = $this->ipmap_form->build_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->ipmap_form->get_ipmap_search_form());
+		$this->load->view('ipmap_view', $data);
 	}
 	
 	/**
@@ -203,44 +203,44 @@ 
 	 * ***************************************
 	 */
 	function ipmap_detail_json() {
-		$json_data = array ();
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$count_all = $this->ipmap_model->ipmap_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$account_data = $this->session->userdata("accountinfo");
+		$count_all = $this->ipmap_model->ipmap_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->ipmap_model->ipmap_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$query = $query->result_array ();
-		foreach ( $query as $key => $value ) {
-			$ipmap_checkbox = '<input type="checkbox" name="chkAll" id="' . $value ['id'] . '" class="ace chkRefNos" onclick="clickchkbox(' . $value ['id'] . ')" value=' . $value ['id'] . '><lable class="lbl"></lable>';
+		$query = $this->ipmap_model->ipmap_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$query = $query->result_array();
+		foreach ($query as $key => $value) {
+			$ipmap_checkbox = '<input type="checkbox" name="chkAll" id="'.$value ['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value ['id'].')" value='.$value ['id'].'><lable class="lbl"></lable>';
 			if ($account_data ['type'] == '0') {
-				$ret_url = '<a href="' . base_url () . 'user/user_ipmap_edit/' . $value ['id'] . '" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="' . base_url () . 'user/user_ipmap_delete/' . $value ['id'] . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+				$ret_url = '<a href="'.base_url().'user/user_ipmap_edit/'.$value ['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'.base_url().'user/user_ipmap_delete/'.$value ['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
 				$account_name = '';
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$ipmap_checkbox,
 								$value ['name'],
 								$value ['ip'],
 								$value ['prefix'],
-								$this->common->get_status ( 'status', 'ip_map', $value ),
-								$this->common->convert_GMT_to ( '', '', $value ['created_date'] ),
-								$this->common->convert_GMT_to ( '', '', $value ['last_modified_date'] ),
+								$this->common->get_status('status', 'ip_map', $value),
+								$this->common->convert_GMT_to('', '', $value ['created_date']),
+								$this->common->convert_GMT_to('', '', $value ['last_modified_date']),
 								$ret_url 
 						)
 						 
 				);
 			} else {
-				$ret_url = '<a href="' . base_url () . 'ipmap/ipmap_edit/' . $value ['id'] . '" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="' . base_url () . 'ipmap/ipmap_delete/' . $value ['id'] . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
-				$account_name = $this->common->build_concat_string ( "first_name,last_name,number", "accounts", $value ['accountid'] );
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+				$ret_url = '<a href="'.base_url().'ipmap/ipmap_edit/'.$value ['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'.base_url().'ipmap/ipmap_delete/'.$value ['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+				$account_name = $this->common->build_concat_string("first_name,last_name,number", "accounts", $value ['accountid']);
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$ipmap_checkbox,
 								$account_name,
 								$value ['name'],
 								$value ['ip'],
 								$value ['prefix'],
-								$this->common->get_status ( 'status', 'ip_map', $value ),
-								$this->common->convert_GMT_to ( '', '', $value ['created_date'] ),
-								$this->common->convert_GMT_to ( '', '', $value ['last_modified_date'] ),
+								$this->common->get_status('status', 'ip_map', $value),
+								$this->common->convert_GMT_to('', '', $value ['created_date']),
+								$this->common->convert_GMT_to('', '', $value ['last_modified_date']),
 								$ret_url 
 						)
 						 
@@ -248,16 +248,16 @@ 
 			}
 		}
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	/**
 	 * **********************************************************
 	 */
 	function ipmap_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		echo $this->db->delete ( "ip_map" );
+		$this->db->where($where);
+		echo $this->db->delete("ip_map");
 	}
 }
 

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 		$this->load->library ( "ipmap_form" );
 		$this->load->library ( 'astpp/form' );
 		$this->load->model ( 'ipmap_model' );
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata ( 'user_login' ) == FALSE) {
+					redirect ( base_url () . '/astpp/login' );
+		}
 	}
 	function ipmap_add() {
 		$data ['username'] = $this->session->userdata ( 'user_name' );