Completed
Push — v3.0 ( e28df5...5be1a9 )
by Samir
13:00
created
astpp/application/modules/opensips/libraries/opensips_form.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
25
-	exit('No direct script access allowed');
24
+if (!defined('BASEPATH')) {
25
+	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 class Opensips_form {
28 29
 
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/email/controllers/email.php 1 patch
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 		$this->load->model('email_model');
36 36
 		$this->load->library('csvreader');
37 37
 	$this->load->library('astpp/email_lib');
38
-		if ($this->session->userdata('user_login') == FALSE)
39
-			redirect(base_url() . '/astpp/login');
38
+		if ($this->session->userdata('user_login') == FALSE) {
39
+					redirect(base_url() . '/astpp/login');
40
+		}
40 41
 	}
41 42
 
42 43
 	function email_edit($edit_id = '') {
@@ -246,8 +247,9 @@  discard block
 block discarded – undo
246 247
 	}
247 248
 	function email_mass() {
248 249
 		$account_data = $this->session->userdata("accountinfo");
249
-		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
250
-			redirect(base_url() . '/astpp/dashboard/');
250
+		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3) {
251
+					redirect(base_url() . '/astpp/dashboard/');
252
+		}
251 253
 	$data['username'] = $this->session->userdata('user_name');	
252 254
 		$data['page_title'] = 'Email Mass';
253 255
 		$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
@@ -291,8 +293,7 @@  discard block
 block discarded – undo
291 293
 				   $path =$dir_path.$actual_file_name;
292 294
 				   if (move_uploaded_file($uploadedFile1,$path)) {
293 295
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
294
-				   }
295
-				   else{
296
+				   } else{
296 297
 					$this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
297 298
 				   }
298 299
 			   }
@@ -315,8 +316,7 @@  discard block
 block discarded – undo
315 316
 		if($add_array['temp'] == ''){
316 317
 	 	$subject = '';
317 318
 		$body ='';	
318
-			 }
319
-		else{
319
+			 } else{
320 320
 				$where = array('id' => $add_array['temp']);
321 321
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
322 322
 		$account_data =$account->result_array();
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/email/libraries/email_form.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
23 23
 ###############################################################################
24 24
 
25
-if (!defined('BASEPATH'))
26
-	exit('No direct script access allowed');
25
+if (!defined('BASEPATH')) {
26
+	exit('No direct script access allowed');
27
+}
27 28
 
28 29
 class Email_form {
29 30
 	function __construct($library_name = '') {
@@ -153,7 +154,7 @@  discard block
 block discarded – undo
153 154
 			$account_data = $this->CI->session->userdata("accountinfo");
154 155
 			$loginid = $account_data['id'];
155 156
 
156
-		}else{
157
+		} else{
157 158
 			$loginid = "0";
158 159
 		}
159 160
 		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/trunk/controllers/trunk.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@
 block discarded – undo
32 32
 		$this->load->library('astpp/form');
33 33
 		$this->load->model('trunk_model');
34 34
 
35
-		if ($this->session->userdata('user_login') == FALSE)
36
-			redirect(base_url() . '/astpp/login');
35
+		if ($this->session->userdata('user_login') == FALSE) {
36
+					redirect(base_url() . '/astpp/login');
37
+		}
37 38
 	}
38 39
 
39 40
 	function trunk_list() {
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/trunk/libraries/trunk_form.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,8 +20,9 @@
 block discarded – undo
20 20
 # You should have received a copy of the GNU Affero General Public License
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23
-if (!defined('BASEPATH'))
24
-	exit('No direct script access allowed');
23
+if (!defined('BASEPATH')) {
24
+	exit('No direct script access allowed');
25
+}
25 26
 
26 27
 class trunk_form {
27 28
 
Please login to merge, or discard this patch.
astpp/application/modules/freeswitch/controllers/freeswitch.php 1 patch
Braces   +15 added lines, -18 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 		$this->load->library('freeswitch_lib');
36 36
 		$this->load->model('freeswitch_model');
37 37
 
38
-		if ($this->session->userdata('user_login') == FALSE)
39
-			redirect(base_url() . '/astpp/login');
38
+		if ($this->session->userdata('user_login') == FALSE) {
39
+					redirect(base_url() . '/astpp/login');
40
+		}
40 41
 	}
41 42
 
42 43
 	function fssipdevices_add($type = "") {
@@ -61,7 +62,7 @@  discard block
 block discarded – undo
61 62
 		if($account_data['type'] == '-1'  || $account_data['type'] == '1')
62 63
 		{
63 64
 			$this->load->view('view_freeswitch_add_edit', $data);
64
-		}else{
65
+		} else{
65 66
 			$this->load->view('view_freeswitch_customer_add_edit', $data);
66 67
 		}
67 68
 	}
@@ -75,7 +76,7 @@  discard block
 block discarded – undo
75 76
 		{
76 77
 			$data['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields($edit_id), $account);
77 78
 			$this->load->view('view_freeswitch_add_edit', $data);
78
-		}else{
79
+		} else{
79 80
 		 $data['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields($edit_id), $account);
80 81
 		$this->load->view('view_freeswitch_customer_add_edit', $data);
81 82
 		}
@@ -91,7 +92,7 @@  discard block
 block discarded – undo
91 92
 		{
92 93
 		$data['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid,$edit_id), $account);
93 94
 		$this->load->view('view_freeswitch_add_edit', $data);
94
-		}else{
95
+		} else{
95 96
         
96 97
 		$data['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid,$edit_id), $account);
97 98
 		$this->load->view('view_freeswitch_customer_add_edit', $data);
@@ -214,7 +215,7 @@  discard block
 block discarded – undo
214 215
 				echo json_encode(array("SUCCESS"=> "SIP Device Updated Successfully!"));
215 216
 				exit;
216 217
 			}
217
-		}else{
218
+		} else{
218 219
 			$data['page_title'] = 'Create Freeswitch SIP Devices';
219 220
 			if ($this->form_validation->run() == FALSE) {
220 221
 				$data['validation_errors'] = validation_errors();
@@ -489,7 +490,7 @@  discard block
 block discarded – undo
489 490
   			$gateway_data["status"] = isset($query_value["status"])?$query_value["status"]:"";
490 491
 				if ($gateway_key != "gateway_data") {
491 492
 					$gateway_data[$gateway_key] = $gatewau_val;
492
-				}else if($gateway_key == "status") {
493
+				} else if($gateway_key == "status") {
493 494
 					$gateway_data[$gateway_key] = $gatewau_val;
494 495
 				} 
495 496
 				 /**
@@ -512,7 +513,7 @@  discard block
 block discarded – undo
512 513
 		 **/
513 514
 		if(!empty($gateway_data['dialplan_variable']) && $gateway_data['dialplan_variable'] != ''){
514 515
 		 $gateway_result['dialplan_variable']  = $gateway_data['dialplan_variable'];
515
-		 }else{
516
+		 } else{
516 517
 		 $gateway_result['dialplan_variable'] = '';
517 518
 		 }
518 519
 		 /**********************************************************************************************/
@@ -545,7 +546,7 @@  discard block
 block discarded – undo
545 546
 				/*********************************************************************/
546 547
 				else if($key == "status") {
547 548
 					$insert_arr[$key] = $gateway_data["status"];
548
-				}  else {
549
+				} else {
549 550
 					if ($key != "id") {
550 551
 						$gateway_arr[$key] = $gateway_value;
551 552
 					}
@@ -707,16 +708,13 @@  discard block
 block discarded – undo
707 708
 		if($button_name == "start")
708 709
 		{ 
709 710
 		   $cmd = "api sofia profile " . trim($query[0]['name']) ." start"; 
710
-		}
711
-		elseif($button_name == "stop")
711
+		} elseif($button_name == "stop")
712 712
 		{
713 713
 			$cmd= "api sofia profile stop";
714
-		}
715
-		elseif($button_name == "reload")
714
+		} elseif($button_name == "reload")
716 715
 		{
717 716
 			$cmd = "api reloadxml";
718
-		}
719
-		elseif($button_name == "rescan")
717
+		} elseif($button_name == "rescan")
720 718
 		{
721 719
 			$cmd = "api sofia profile " . trim($query[0]['name']) . " rescan";
722 720
 		}
@@ -769,8 +767,7 @@  discard block
 block discarded – undo
769 767
 		  /**====================================================================*/
770 768
 		  $insert = $this->db->insert("sip_profiles", $sipprofile_data);
771 769
 
772
-		}
773
-		else {
770
+		} else {
774 771
 					$this->session->set_flashdata('astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!');
775 772
 			redirect(base_url() . 'freeswitch/fssipprofile_add/');
776 773
 		}
@@ -850,7 +847,7 @@  discard block
 block discarded – undo
850 847
 		  $update = $this->db->update("sip_profiles", $insert_arr, array('id' => $edit_id));
851 848
 		   if($sipprofile_data['type_settings']=="add_setting"){
852 849
 			$this->session->set_flashdata('astpp_errormsg',$data['sip_name']. " SIP Setting Added Successfully!");
853
-				  }else{
850
+				  } else{
854 851
 			$this->session->set_flashdata('astpp_errormsg',$data['sip_name']. " SIP Setting Updated Successfully!");
855 852
 		    
856 853
 				  }
Please login to merge, or discard this patch.
astpp/application/modules/freeswitch/libraries/freeswitch_form.php 1 patch
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@  discard block
 block discarded – undo
22 22
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
23 23
 ###############################################################################
24 24
 
25
-if (!defined('BASEPATH'))
26
-	exit('No direct script access allowed');
25
+if (!defined('BASEPATH')) {
26
+	exit('No direct script access allowed');
27
+}
27 28
 
28 29
 class Freeswitch_form {
29 30
 
@@ -35,8 +36,7 @@  discard block
 block discarded – undo
35 36
 	$log_type = $this->CI->session->userdata("logintype");
36 37
 	if($log_type == 0  || $log_type == 3 || $log_type == 1){
37 38
 		  $sip_pro=null;
38
-	}
39
-	else{
39
+	} else{
40 40
 		  $sip_pro=array('SIP Profile', 'sip_profile_id', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');
41 41
 
42 42
 	}  
@@ -512,13 +512,13 @@  discard block
 block discarded – undo
512 512
 		} else {
513 513
 			 if($accountid){
514 514
 				$account_Arr=null;
515
-		 }else{
515
+		 } else{
516 516
 				$account_Arr=array('Account', 'accountcode', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0"));
517 517
 		 }       
518 518
 			if ($this->CI->session->userdata("logintype") == '1') {
519 519
 		$sip_pro =null;
520 520
 				$link = base_url() . 'freeswitch/customer_fssipdevices_save/true';
521
-			}else{
521
+			} else{
522 522
 		$sip_pro =array('SIP Profile', 'sip_profile_id', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');
523 523
 				$link = base_url() . 'freeswitch/fssipdevices_save/true';
524 524
 			}
Please login to merge, or discard this patch.
astpp/application/modules/freeswitch/views/view_fssipprofile_edit.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,7 +119,8 @@  discard block
 block discarded – undo
119 119
 			<div style="width:550px;"><label style="text-align:right;" class="col-md-3">Status </label>
120 120
 			<select name="sipstatus" class="col-md-5 form-control selectpicker" data-live-search='true'>
121 121
 			    
122
-			    <option value="0" <?if ($status == 0)echo 'selected=selected;'?>>Active</option>
122
+			    <option value="0" <?if ($status == 0) {
123
+	echo 'selected=selected;'?>>Active</option>
123 124
 			    <option value="1" <?if ($status == 1)echo 'selected=selected;'?>>Inactive</option>
124 125
 			  </select>
125 126
                        </div>
@@ -148,6 +149,7 @@  discard block
 block discarded – undo
148 149
             	<div class="portlet-content"  id="search_bar" style="cursor:pointer; display:none">
149 150
                     	<?php echo $form_search;
150 151
 }
152
+}
151 153
 ?>
152 154
     	        </div>
153 155
             </div>
@@ -194,7 +196,7 @@  discard block
 block discarded – undo
194 196
 			  if($params_name!='')
195 197
 			  {
196 198
 				$type="edit_setting";
197
-			  }else{
199
+			  } else{
198 200
 				$type="add_setting";
199 201
 			  }
200 202
 			?>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/accounts/models/accounts_model.php 1 patch
Braces   +36 added lines, -30 removed lines patch added patch discarded remove patch
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
         }*/
54 54
 		if(isset($accountinfo['local_call'])){
55 55
 	  $accountinfo['local_call']=0;
56
-		}else{
56
+		} else{
57 57
 	  $accountinfo['local_call']=1;
58 58
 		}
59 59
 		if ($accountinfo['type'] == 1){
60 60
 		$invoice_config = $accountinfo['invoice_config_flag'];
61
-		}else{
61
+		} else{
62 62
 		$invoice_config = "";		
63 63
 		}
64 64
 		unset($accountinfo['invoice_config_flag']);
@@ -300,17 +300,17 @@  discard block
 block discarded – undo
300 300
 		);
301 301
 		if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
302 302
 		$is_recording=1;
303
-		}else{
303
+		} else{
304 304
 		$is_recording=0;
305 305
 		}
306 306
 		if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
307 307
 		$allow_ip_management=1;
308
-		}else{
308
+		} else{
309 309
 		$allow_ip_management=0;
310 310
 		}
311 311
 		if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
312 312
 		$local_call=1;
313
-		}else{
313
+		} else{
314 314
 		$local_call=0;
315 315
 		}
316 316
 		if ($sip_flag) {
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
479 479
 		  if($accountdata['reseller_id'] == $current_id){
480 480
 			$this->common->mail_to_users('voip_account_refilled', $accountdata);
481
-		  }else{
481
+		  } else{
482 482
 			$this->common->mail_to_users('voip_child_account_refilled', $accountdata);
483 483
 		  }
484 484
 		}
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 		}
507 507
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
508 508
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
509
-		}else{
509
+		} else{
510 510
 			$this->db->order_by('number','desc');
511 511
 		}
512 512
 		$result = $this->db->get('accounts');
@@ -535,12 +535,13 @@  discard block
 block discarded – undo
535 535
 			$this->db->where($type);
536 536
 		}
537 537
 		if ($flag) {
538
-			if (!$export)
539
-				$this->db->limit($limit, $start);
538
+			if (!$export) {
539
+							$this->db->limit($limit, $start);
540
+			}
540 541
 		}
541 542
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
542 543
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
543
-		}else{
544
+		} else{
544 545
 			$this->db->order_by('number','desc');
545 546
 		}
546 547
 		$result = $this->db->get('accounts');
@@ -614,10 +615,11 @@  discard block
 block discarded – undo
614 615
 
615 616
 	function get_account_number($accountid) {
616 617
 		$query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
617
-		if ($query->num_rows() > 0)
618
-			return $query->row_array();
619
-		else
620
-			return false;
618
+		if ($query->num_rows() > 0) {
619
+					return $query->row_array();
620
+		} else {
621
+					return false;
622
+		}
621 623
 	}
622 624
 
623 625
 	function add_callerid($data) {
@@ -662,10 +664,11 @@  discard block
 block discarded – undo
662 664
 	function get_accounttax_by_id($account_id) {
663 665
 		$this->db->where("accountid", trim($account_id));
664 666
 		$query = $this->db->get("taxes_to_accounts");
665
-		if ($query->num_rows() > 0)
666
-			return $query->result_array();
667
-		else
668
-			return false;
667
+		if ($query->num_rows() > 0) {
668
+					return $query->result_array();
669
+		} else {
670
+					return false;
671
+		}
669 672
 	}
670 673
 
671 674
 	/**
@@ -678,29 +681,32 @@  discard block
 block discarded – undo
678 681
 		$this->db->where("number", $acc_num);
679 682
 		$query = $this->db->get("accounts");
680 683
 
681
-		if ($query->num_rows() > 0)
682
-			return $query->row_array();
683
-		else
684
-			return false;
684
+		if ($query->num_rows() > 0) {
685
+					return $query->row_array();
686
+		} else {
687
+					return false;
688
+		}
685 689
 	}
686 690
 
687 691
 	function get_account_by_number($id) {
688 692
 		$this->db->where("id", $id);
689 693
 		$query = $this->db->get("accounts");
690 694
 
691
-		if ($query->num_rows() > 0)
692
-			return $query->row_array();
693
-		else
694
-			return false;
695
+		if ($query->num_rows() > 0) {
696
+					return $query->row_array();
697
+		} else {
698
+					return false;
699
+		}
695 700
 	}
696 701
 
697 702
 	function get_currency_by_id($currency_id) {
698 703
 
699 704
 		$query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
700
-		if ($query->num_rows() > 0)
701
-			return $query->row_array();
702
-		else
703
-			return false;
705
+		if ($query->num_rows() > 0) {
706
+					return $query->row_array();
707
+		} else {
708
+					return false;
709
+		}
704 710
 	}
705 711
 
706 712
 
Please login to merge, or discard this patch.