iNextrix / ASTPP

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

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -71,18 +71,18 @@ 
 
 
 					<?php
-					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+					if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 					$logo = $this->session->userdata['user_logo'];
-					}else{
+					} else {
 					$logo = 'logo.png';
 					}
 
 					if ($this->session->userdata('userlevel_logintype') != '0') {?>
 					<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-					<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+					<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 					<? } else {?> 
 					<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-					<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+					<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 					<? }?>	
 					</a>
       

Braces +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -73,7 +73,7 @@ 
 					<?php
 					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 					$logo = $this->session->userdata['user_logo'];
-					}else{
+					} else{
 					$logo = 'logo.png';
 					}
 

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">   
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">   
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -69,18 +69,18 @@ 
              <div class="w-box dark sign-in-wr box_shadow margin-b-10">
 		    	<div class="col-md-12 no-padding">
 			  <?php
-					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+					if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 						$logo = $this->session->userdata['user_logo'];
-					}else{
+					} else {
 						$logo = 'logo.png';
 					}
 
 					if ($this->session->userdata('userlevel_logintype') != '0') {?>
 						<a class="col-md-9" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 					<? } else {?> 
 							<a class="col-md-9" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 					<? }?>	
 			
 				</a>

Braces +22 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -71,7 +71,7 @@ 
 			  <?php
 					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 						$logo = $this->session->userdata['user_logo'];
-					}else{
+					} else{
 						$logo = 'logo.png';
 					}
 
@@ -103,16 +103,32 @@ 
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="password" required value="<?php if (isset($value['password'])) echo  $value['password']; else ''; ?>" id="password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) echo $error['password']; ?></div>
+<input type="text" name="password" required value="<?php if (isset($value['password'])) {
+	echo  $value['password'];
+} else {
+	'';
+}
+?>" id="password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) {
+	echo $error['password'];
+}
+?></div>
 </div>
 </div>
 
 <div class="col-md-12 margin-t-10 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Confirm Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) echo  $value['confirm_password']; else ''; ?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) echo $error['confirm_password']; ?></div>
+<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) {
+	echo  $value['confirm_password'];
+} else {
+	'';
+}
+?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) {
+	echo $error['confirm_password'];
+}
+?></div>
 </div>
 </div>
 

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -70,18 +70,18 @@ 
              <div class="w-box dark sign-in-wr box_shadow margin-b-10">
 		    	<div class="col-md-12 no-padding">
 					  <?php
-						if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+						if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 						$logo = $this->session->userdata['user_logo'];
-						}else{
+						} else {
 						$logo = 'logo.png';
 						}
 
 						if ($this->session->userdata('userlevel_logintype') != '0') {?>
 						<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-						<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+						<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 						<? } else {?> 
 						<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-						<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+						<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 						<? }?>	
 						</a>
 

Braces +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -72,7 +72,7 @@ 
 					  <?php
 						if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 						$logo = $this->session->userdata['user_logo'];
-						}else{
+						} else{
 						$logo = 'logo.png';
 						}
 

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -53,9 +53,9 @@ 
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -76,18 +76,18 @@ 
                           <div class="">
                           <div class="col-md-9">
                            	<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 							$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? } else {?> 
 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>	
                             	</a>
                            </div>

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -55,7 +55,7 @@ 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else{
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -78,7 +78,7 @@ 
                            	<?php
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else{
 							$logo = 'logo.png';
 							}
 

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    

 <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

-        $this->db->select('*');

-        $this->db->order_by('accountid', 'desc');

-        $this->db->limit(1);

-        $invoiceconf = $this->db->get('invoice_conf');

-        $invoiceconf = (array)$invoiceconf->first_row();

+		$this->db->where('domain',$_SERVER['HTTP_HOST']);

+		$this->db->select('*');

+		$this->db->order_by('accountid', 'desc');

+		$this->db->limit(1);

+		$invoiceconf = $this->db->get('invoice_conf');

+		$invoiceconf = (array)$invoiceconf->first_row();

 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    

 <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

+        $this->db->where('domain', $_SERVER['HTTP_HOST']);

         $this->db->select('*');

         $this->db->order_by('accountid', 'desc');

         $this->db->limit(1);

         $invoiceconf = $this->db->get('invoice_conf');

         $invoiceconf = (array)$invoiceconf->first_row();

-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

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

 					<span class="login_error">

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

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

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

-						<?php }else{

+						<?php } else {

 						 echo "&nbsp;";

 						} ?>

                     </span>

@@ -132,18 +132,18 @@ 
 											<!-- Header Start-->

 												<div class="col-md-12">

 													 <?php

-														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

+														if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {

 															$logo = $this->session->userdata['user_logo'];

-														}else{

+														} else {

 															$logo = 'logo.png';

 														}

 														

 													if ($this->session->userdata('userlevel_logintype') != '0') {?>

 															<a class="col-md-10" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">

-																<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+																<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 														<? } else {?> 

 																<a class="col-md-10" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">

-																<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+																<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 														<? }?>

 															</a>

 												<div class="col-md-2">

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else{ 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

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

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

-						<?php }else{

+						<?php } else{

 						 echo "&nbsp;";

 						} ?>

                     </span>

@@ -134,7 +134,7 @@ 
 													 <?php

 														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

 															$logo = $this->session->userdata['user_logo'];

-														}else{

+														} else{

 															$logo = 'logo.png';

 														}

 														

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

-        $this->db->select('*');

-        $this->db->order_by('accountid', 'desc');

-        $this->db->limit(1);

-        $invoiceconf = $this->db->get('invoice_conf');

-        $invoiceconf = (array)$invoiceconf->first_row();

+		$this->db->where('domain',$_SERVER['HTTP_HOST']);

+		$this->db->select('*');

+		$this->db->order_by('accountid', 'desc');

+		$this->db->limit(1);

+		$invoiceconf = $this->db->get('invoice_conf');

+		$invoiceconf = (array)$invoiceconf->first_row();

 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

+        $this->db->where('domain', $_SERVER['HTTP_HOST']);

         $this->db->select('*');

         $this->db->order_by('accountid', 'desc');

         $this->db->limit(1);

         $invoiceconf = $this->db->get('invoice_conf');

         $invoiceconf = (array)$invoiceconf->first_row();

-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

 

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

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

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

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

-                    <?php }else{

+                    <?php } else {

 						 echo "&nbsp;";

 					} 

 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

@@ -75,18 +75,18 @@ 
                           

                             	

                             	<?php

-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {

 							$logo = $this->session->userdata['user_logo'];

-							}else{

+							} else {

 							$logo = 'logo.png';

 							}

 

 							if ($this->session->userdata('userlevel_logintype') != '0') {?>

 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">

-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 							<? } else {?> 

 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">

-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 							<? }?>	

                             	</a>

                             	<div class="col-md-12 no-padding"></div>

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else{ 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

@@ -55,7 +55,7 @@ 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">

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

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

-                    <?php }else{

+                    <?php } else{

 						 echo "&nbsp;";

 					} 

 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

@@ -77,7 +77,7 @@ 
                             	<?php

 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

 							$logo = $this->session->userdata['user_logo'];

-							}else{

+							} else{

 							$logo = 'logo.png';

 							}

 

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

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -55,9 +55,9 @@ 
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -74,18 +74,18 @@ 
                         	<h2 class="text-center">
                           
                             	<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 							$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? } else {?> 
 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>	
                             	</a>
                             	<div class="col-md-12 no-padding"></div>

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -57,7 +57,7 @@ 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else{
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -76,7 +76,7 @@ 
                             	<?php
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else{
 							$logo = 'logo.png';
 							}
 

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

Indentation +4 added lines, -4 removed lines

@@ -1253,11 +1253,11 @@
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
-        		else
-        {
+				else
+		{
 
-           $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+		   $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
+		   redirect(base_url() . 'rates/termination_rates_list/');
 		}
 
 		unlink($full_path . $terminationrate_file_name);

Spacing +261 added lines, -261 removed lines

@@ -36,7 +36,7 @@ 
 		ini_set("max_execution_time", "259200");
 		ini_set("upload_max_filesize", "200M");
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function termination_rates_list() {
@@ -73,70 +73,70 @@ 
 
 		echo json_encode($json_data);
 	}
-	  function termination_rates_list_delete($flag='') {
+	  function termination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_termination_rates_list(false);
 	echo $count_all; 
 	} 
 /****************/
 	 function termination_rate_import() {
 		$data['page_title'] = 'Import Termination Rates';
-		$this->session->set_userdata('import_termination_rate_csv',"");
-		$this->session->set_userdata('import_termination_rate_csv_error',"");
+		$this->session->set_userdata('import_termination_rate_csv', "");
+		$this->session->set_userdata('import_termination_rate_csv_error', "");
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_preview_file(){
-		$invalid_flag= false;
-	$check_header=$this->input->post('check_header',true);
+	function termination_rate_preview_file() {
+		$invalid_flag = false;
+	$check_header = $this->input->post('check_header', true);
 	$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if(empty($_FILES) || !isset($_FILES)){
+		if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/termination_rates_list/");
 	}
-		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" &&  isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
+		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" && isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
 			list($txt, $ext) = explode(".", $_FILES['termination_rate_import']['name']);
-			if($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0) { 
 				$error = $_FILES['termination_rate_import']['error'];
-				if ($error == 0 ) {
+				if ($error == 0) {
 					$uploadedFile = $_FILES["termination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-			if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+			if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-			if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
+			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
+			if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
 			  $data['csv_tmp_data'] = $csv_data;
 			  $data['trunkid'] = $_POST['trunk_id'];
-			  $data['check_header']=$check_header;
+			  $data['check_header'] = $check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
-			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			  $this->session->set_userdata('import_termination_rate_csv', $actual_file_name);
+			} else {
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
 					}
 				}
-				else{
-					$data['error']=="File Uploading Fail Please Try Again";
+				else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
-			}else {
+			} else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-		}else{
-		$invalid_flag=true;
+		} else {
+		$invalid_flag = true;
 		}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
-				$str.= '<br/>Please Create Trunk.';
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
+				$str .= '<br/>Please Create Trunk.';
 			}
 			if (empty($_FILES['termination_rate_import']['name'])) {
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_rates_import($trunkID,$check_header=false) {
+	function termination_rate_rates_import($trunkID, $check_header = false) {
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
@@ -146,65 +146,65 @@ 
 		}
 	$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name,$new_final_arr_key,$check_header); 
-	$i=0;
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header); 
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {
-	 if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['prepend']= isset($csv_data['prepend'])? $csv_data['prepend'] :'';
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
-		$csv_data['strip']= isset($csv_data['strip']) ? $csv_data['strip'] :'';
+	 if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['prepend'] = isset($csv_data['prepend']) ? $csv_data['prepend'] : '';
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
+		$csv_data['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['trunk_id']=$trunkID;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $new_final_arr[$i]=$csv_data;
+		else {
+		  $csv_data['trunk_id'] = $trunkID;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		 if(!empty($new_final_arr)){
+		 if ( ! empty($new_final_arr)) {
  		$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		 }
 		  unlink($full_path.$terminationrate_file_name);
-	  $count=count($invalid_array);
-		if($count >0){
+	  $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 		   fclose($fp);
 		   $this->session->set_userdata('import_termination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['trunkid'] = $trunkID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Termination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	  $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
 		   redirect(base_url()."rates/termination_rates_list/");
 		 }        
 	}
-	function termination_rate_error_download(){
+	function termination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_termination_rate_csv_error');
+		$error_data = $this->session->userdata('import_termination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Termination_rate_error.csv", $data); 
@@ -212,182 +212,182 @@ 
 	}  
 	function origination_rate_import() {
 		$data['page_title'] = 'Import Origination Rates';
-		$this->session->set_userdata('import_origination_rate_csv',"");
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$this->session->set_userdata('import_origination_rate_csv', "");
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		if(file_exists($full_path.$error_data) && $error_data != ""){
+		if (file_exists($full_path.$error_data) && $error_data != "") {
 			unlink($full_path.$error_data);
-			$this->session->set_userdata('import_origination_rate_csv_error',"");
+			$this->session->set_userdata('import_origination_rate_csv_error', "");
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_preview_file(){
-	$invalid_flag= false;
-	$data=array();
+	function origination_rate_preview_file() {
+	$invalid_flag = false;
+	$data = array();
 	$data['page_title'] = 'Import Origination Rates';
-	$check_header=$this->input->post('check_header',true);
-	if(empty($_FILES) || !isset($_FILES)){
+	$check_header = $this->input->post('check_header', true);
+	if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/origination_rate_list/");
 	}
-	$get_extension=strpos($_FILES['origination_rate_import']['name'],'.');
+	$get_extension = strpos($_FILES['origination_rate_import']['name'], '.');
 	$new_final_arr_key = $this->config->item('Origination-rates-field');
-	if(!$get_extension){
-		$data['error']= "Please Upload File Atleast";
+	if ( ! $get_extension) {
+		$data['error'] = "Please Upload File Atleast";
 		}
 		if (isset($_FILES['origination_rate_import']['name']) && $_FILES['origination_rate_import']['name'] != "" && isset($_POST['pricelist_id']) && $_POST['pricelist_id'] != '') {
-			list($txt,$ext) = explode(".", $_FILES['origination_rate_import']['name']);
+			list($txt, $ext) = explode(".", $_FILES['origination_rate_import']['name']);
             
-			if($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0) { 
 				$error = $_FILES['origination_rate_import']['error'];
 				if ($error == 0) {
 					$uploadedFile = $_FILES["origination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-					if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+					if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-					if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
-			$flag=false;
-			$data['trunkid']=isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
+					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s").".".$ext;
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
+			$flag = false;
+			$data['trunkid'] = isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
 						$data['csv_tmp_data'] = $csv_data;
 						$data['pricelistid'] = $_POST['pricelist_id'];
 						$data['page_title'] = "Origination Rates Preview";
-						$data['check_header']=$check_header;
-						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-					}else{
+						$data['check_header'] = $check_header;
+						$this->session->set_userdata('import_origination_rate_csv', $actual_file_name);
+					} else {
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
 			 }   
-			else{
-					$data['error']=="File Uploading Fail Please Try Again";
+			else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
 		   }
 		   else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
-		$invalid_flag=true;
+			} else {
+		$invalid_flag = true;
 			}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
-				$str.= '<br/>Please Create Rate Group.';
+			if ( ! isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
+				$str .= '<br/>Please Create Rate Group.';
 			}
 			if (empty($_FILES['origination_rate_import']['name'])) {
-				$str.= '<br/>Please Select File.';
+				$str .= '<br/>Please Select File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_import_file($pricelistID,$trunkid,$check_header=false) {
+	function origination_rate_import_file($pricelistID, $trunkid, $check_header = false) {
 	   $new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Origination-rates-field');
 	$screen_path = $this->config->item('screen_path');
-	$reseller_id=0;
+	$reseller_id = 0;
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$reseller_id = $this->session->userdata["accountinfo"]['id'];
 		}
         
 		$full_path = $this->config->item('rates-file-path');
 		$originationrate_file_name = $this->session->userdata('import_origination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name,$new_final_arr_key,$check_header); 
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name, $new_final_arr_key, $check_header); 
 		//echo "<pre>";print_r($csv_tmp_data);exit;
-	$i=0;
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {	
-	  if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
+	  if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['pricelist_id']=$pricelistID;
-		  $csv_data['trunk_id']=$trunkid;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $csv_data['reseller_id']= $reseller_id;
+		else {
+		  $csv_data['pricelist_id'] = $pricelistID;
+		  $csv_data['trunk_id'] = $trunkid;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $csv_data['reseller_id'] = $reseller_id;
 		  $csv_data['creation_date'] = gmdate('Y-m-d H:i:s');
-		  $new_final_arr[$i]=$csv_data;
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		  if(!empty($new_final_arr)){
+		  if ( ! empty($new_final_arr)) {
   		$result = $this->rates_model->bulk_insert_origination_rate($new_final_arr);
 		  }
 		  unlink($full_path.$originationrate_file_name);
-	 $count=count($invalid_array);
-		if($count >0){
+	 $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 			fclose($fp);
 		   $this->session->set_userdata('import_origination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['pricelistid'] = $pricelistID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Origination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	   $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Origination rates imported successfully!');
 		   redirect(base_url()."rates/origination_rates_list/");
 		   }
 	}
-	 function data_validate($csvdata){
-		  $str=null;
+	 function data_validate($csvdata) {
+		  $str = null;
 	  $alpha_regex = "/^[a-z ,.'-]+$/i";
 	  $alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 	  $email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/"; 
-	  $str.= $csvdata['pattern']!= '' ? null : 'Code,';
-	  $str=rtrim($str,',');
-	  if(!$str){
-		  $str.= is_numeric($csvdata['pattern']) ? null : 'Code,';
-
-		  $str.= !empty($csvdata['connectcost']) && is_numeric( $csvdata['connectcost']) ? null :( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
-		  $str.= !empty($csvdata['includedseconds']) && is_numeric( $csvdata['includedseconds']) ? null :( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
-
-		  $str.= !empty($csvdata['inc']) && is_numeric( $csvdata['inc']) ? null :( empty($csvdata['inc']) ? null : 'Increment,');
-		  $str.= !empty($csvdata['precedence']) && is_numeric( $csvdata['precedence']) ? null :( empty($csvdata['precedence']) ? null : 'Precedence,');
-		  $str.= (isset($csvdata['strip']) && !empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null :'Strip,') : null;
-		  if($str){
-		$str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  $str .= $csvdata['pattern'] != '' ? null : 'Code,';
+	  $str = rtrim($str, ',');
+	  if ( ! $str) {
+		  $str .= is_numeric($csvdata['pattern']) ? null : 'Code,';
+
+		  $str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
+		  $str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
+
+		  $str .= ! empty($csvdata['inc']) && is_numeric($csvdata['inc']) ? null : (empty($csvdata['inc']) ? null : 'Increment,');
+		  $str .= ! empty($csvdata['precedence']) && is_numeric($csvdata['precedence']) ? null : (empty($csvdata['precedence']) ? null : 'Precedence,');
+		  $str .= (isset($csvdata['strip']) && ! empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null : 'Strip,') : null;
+		  if ($str) {
+		$str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+		$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
 		  }
-		  else{
+		  else {
 		  return false;
 		  }
 	  }
-	  else{
-	  $str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  else {
+	  $str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are required' : ' is Required';
+		$str .= $count > 1 ? ' are required' : ' is Required';
 	return $str;
 	}
 	}
-	function origination_rate_error_download(){
+	function origination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Origination_rate_error.csv", $data); 
@@ -417,13 +417,13 @@ 
 				$edit_data = $value;
 			}
 			$edit_data['connectcost'] = $this->common_model->to_calculate_currency($edit_data['connectcost'], '', '', true, false);
-			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '',true, false);
+			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '', true, false);
 			$edit_data['pattern'] = filter_var($edit_data['pattern'], FILTER_SANITIZE_NUMBER_INT);
 
 			$data['form'] = $this->form->build_form($this->rates_form->get_origination_rate_form_fields(), $edit_data);
 			$this->load->view('view_origination_rate_add_edit', $data);
 		} else {
-			redirect(base_url() . 'rates/origination_rate_list/');
+			redirect(base_url().'rates/origination_rate_list/');
 		}
 	}
 
@@ -471,7 +471,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -483,13 +483,13 @@ 
 	function termination_rate_delete($id) {
 		$this->rates_model->remove_termination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Termination removed successfully!');
-		redirect(base_url() . '/rates/termination_rates_list/');
+		redirect(base_url().'/rates/termination_rates_list/');
 	}
 
 	function origination_rate_delete($id) {
 		$this->rates_model->remove_origination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Origination rate removed successfully!');
-		redirect(base_url() . 'rates/origination_rates_list/');
+		redirect(base_url().'rates/origination_rates_list/');
 	}
 
 	function origination_rates_list() {
@@ -528,9 +528,9 @@ 
 		echo json_encode($json_data);
 	}
 
-	  function origination_rates_list_delete($flag='') {
+	  function origination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_origination_rate_list(false);
 		echo $count_all; 
 	} 
@@ -604,7 +604,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 
@@ -613,20 +613,20 @@ 
 		$this->session->set_userdata('account_search', "");
 	}
 
-	function customer_block_pattern_list($accountid,$accounttype) {
+	function customer_block_pattern_list($accountid, $accounttype) {
 		$json_data = array();
 		$where = array('accountid' => $accountid);
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
-		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
+		$like_str = ! empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
+		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
 		echo json_encode($json_data);
 	}
@@ -649,7 +649,7 @@ 
 		$json_data = array();
 		$account_data = $this->session->userdata("accountinfo");
 		$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-		$markup = ($markup > 0)?$markup:1;
+		$markup = ($markup > 0) ? $markup : 1;
 
 		$count_all = $this->rates_model->get_origination_rate_list_for_user(false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -659,11 +659,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_origination_rate_list_for_user());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
 					$value['inc'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','',true),
-					$this->common_model->calculate_currency($value['connectcost'],'','','',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', '', true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', '', true),
 					$value['includedseconds']                    
 			));
 		}
@@ -682,7 +682,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'user/user_rates_list/');
+			redirect(base_url().'user/user_rates_list/');
 		}
 	}
 
@@ -690,10 +690,10 @@ 
 		$this->session->set_userdata('advance_search', 0);
 		$this->session->set_userdata('account_search', "");
 	}
-	function customer_rates_download_sample_file($file_name){
+	function customer_rates_download_sample_file($file_name) {
 		$this->load->helper('download');
 		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
-		$arrContextOptions=array(
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -702,19 +702,19 @@ 
 		$file = file_get_contents($full_path, false, stream_context_create($arrContextOptions));
 		force_download("samplefile.csv", $file); 
 	}
-	function termination_rate_batch_update(){
+	function termination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
-	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"])?$this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false):"0.0000";
+	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
+	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->termination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Termination rates batch updated successfully!"));
 		exit;
 	}
     
-	function origination_rate_batch_update(){
+	function origination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
+		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->origination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Origination rates batch updated successfully!"));
@@ -723,23 +723,23 @@ 
 
 	function termination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_termination_rate(true, '', '', false);
 		$outbound_array = array();
 		ob_clean();
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost($currency)", "Included Seconds","Per Minute Cost($currency)","Initial Increment", "Increment","Priority","Strip","Prepend","Trunk","Status","Created Date");
+		$outbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Priority", "Strip", "Prepend", "Trunk", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$outbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
                         
 						$row['includedseconds'],
-			$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+			$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -751,7 +751,7 @@ 
 						$row['strip'],
 						$row['prepend'],
 						//$row['trunk_id'],
-						$this->common->get_field_name('name','trunks',$row["trunk_id"]),
+						$this->common->get_field_name('name', 'trunks', $row["trunk_id"]),
 						$this->common->get_status('export', '', $row['status']),
 						$row['creation_date'],
                         
@@ -760,7 +760,7 @@ 
 			}
 		$this->load->helper('csv');
         
-		array_to_csv($outbound_array, 'Termination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($outbound_array, 'Termination_Rates_'.date("Y-m-d").'.csv');
        
 	}
 
@@ -771,13 +771,13 @@ 
 		$this->load->library('pdf');
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
-		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20,20,20);
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost","Included Seconds","Per Minute Cost","Initial Increment", "Increment","Precedence","Prepend","Strip");
+		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20, 20, 20);
+		$outbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment", "Precedence", "Prepend", "Strip");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 					$outbound_array[] = array(
-			$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+			$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
@@ -800,7 +800,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Outbound Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Outbound Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -808,29 +808,29 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($outbound_array, "7");
-		$this->fpdf->Output('Termination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Termination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
     
 
 	function origination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
 	//echo "<pre>";print_r($query);exit;
 		$inbound_array = array();
 		ob_clean();
-		$inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)", "Initial Increment", "Increment","Rate Group","Status","Created Date");
+		$inbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Rate Group", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$inbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -846,7 +846,7 @@ 
 				}
 			}
 		$this->load->helper('csv');
-		array_to_csv($inbound_array, 'Origination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($inbound_array, 'Origination_Rates_'.date("Y-m-d").'.csv');
 	}
 	function origination_rate_export_cdr_pdf() {
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
@@ -857,15 +857,15 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 		$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-	$inbound_array[] = array("Code", "Destination","Connect Cost","Included Seconds","Per Minute Cost","Initial Increment","Increment");
+	$inbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','','',false),
+						$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -881,7 +881,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Origination Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Origination Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -889,7 +889,7 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Origination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Origination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
 
   
@@ -901,14 +901,14 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 	$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-		$inbound_array[] = array("Code", "Destination", "Increment","Cost Per Minutes",  "Connect Charge", "Included Seconds");
+		$inbound_array[] = array("Code", "Destination", "Increment", "Cost Per Minutes", "Connect Charge", "Included Seconds");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['inc'],
-			$this->common_model->calculate_currency($row['cost'],'','','',false),
+			$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 						$row['connectcost'],
 						$row['includedseconds']
 					);
@@ -920,7 +920,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -928,12 +928,12 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Rates_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Rates_'.date("Y-m-d").'.pdf', "D");
 	}
-	function resellersrates_list(){
-	$accountinfo=$this->session->userdata('accountinfo');
+	function resellersrates_list() {
+	$accountinfo = $this->session->userdata('accountinfo');
 	$data['username'] = $this->session->userdata('user_name');
-		$data['page_title'] = 'My Rates' ;
+		$data['page_title'] = 'My Rates';
 		$data['search_flag'] = true;
 		$this->session->set_userdata('advance_search', 0);
 		$data['grid_fields'] = $this->rates_form->build_rates_list_for_reseller();
@@ -953,11 +953,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_rates_list_for_reseller());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
-					$this->common_model->calculate_currency($value['connectcost'],'','','true',true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', 'true', true),
 					$value['includedseconds'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','true',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', 'true', true),
 					$value['inc'],
 					$value['precedence'],
 			));
@@ -977,7 +977,7 @@ 
 			$this->session->set_userdata('resellerrates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/resellersrates_list/');
+			redirect(base_url().'rates/resellersrates_list/');
 		}
 	}
 	function resellersrates_list_clearsearchfilter() {
@@ -1001,7 +1001,7 @@ 
 			foreach ($query->result_array() as $row) {
                 
 					$customer_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 			$row['includedseconds'],
@@ -1013,7 +1013,7 @@ 
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($customer_array, 'My_Own_Rate_' . date("Y-m-d") . '.csv');
+		array_to_csv($customer_array, 'My_Own_Rate_'.date("Y-m-d").'.csv');
 		exit;
 	}
 /***********
@@ -1030,7 +1030,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 	function origination_rates_list_batch_delete() {
@@ -1043,7 +1043,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -1059,14 +1059,14 @@ 
 
 	function csv_to_array($filename = '', $delimiter = ',')
 	{
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
+		if ( ! file_exists($filename) || ! is_readable($filename)) return FALSE;
 		$header = NULL;
 		$data = array();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if (!$header) $header = $row;
+				if ( ! $header) $header = $row;
 				else $data[] = array_combine($header, $row);
 			}
 
@@ -1079,9 +1079,9 @@ 
 	function utf8_converter($array)
 	{
 		array_walk_recursive($array,
-		function (&$item, $key)
+		function(&$item, $key)
 		{
-			if (!mb_detect_encoding($item, 'utf-8', true))
+			if ( ! mb_detect_encoding($item, 'utf-8', true))
 			{
 				$item = utf8_encode($item);
 			}
@@ -1095,9 +1095,9 @@ 
 		$check_header = $this->input->post('check_header', true);
 		$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if (empty($_FILES) || !isset($_FILES))
+		if (empty($_FILES) || ! isset($_FILES))
 		{
-			redirect(base_url() . "rates/termination_rates_list/");
+			redirect(base_url()."rates/termination_rates_list/");
 		}
 
 		$data['mapto_fields'] = $new_final_arr_key;
@@ -1117,13 +1117,13 @@ 
 					// $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
 
 					$csv_data = $this->utf8_converter($this->csvreader->parse_file($uploadedFile, $field_select, $check_header));
-					if (!empty($csv_data))
+					if ( ! empty($csv_data))
 					{
 						$full_path = $this->config->item('rates-file-path');
-						$actual_file_name = "ASTPP-TERMINATION-RATES-" . date("Y-m-d H:i:s") . "." . $ext;
+						$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
 						$actual_file_name = str_replace(' ', '-', $actual_file_name);
 						$actual_file_name = str_replace(':', '-', $actual_file_name);
-						if (move_uploaded_file($uploadedFile, $full_path . $actual_file_name))
+						if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name))
 						{
 							$data['field_select'] = serialize($field_select);
 							$data['csv_tmp_data'] = $csv_data;
@@ -1157,14 +1157,14 @@ 
 		if ($invalid_flag)
 		{
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
 			{
-				$str.= '<br/>Please Create Trunk.';
+				$str .= '<br/>Please Create Trunk.';
 			}
 
 			if (empty($_FILES['termination_rate_import_mapper']['name']))
 			{
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
 
 			$data['error'] = $str;
@@ -1185,7 +1185,7 @@ 
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = array();
-		foreach($filefields as $item)
+		foreach ($filefields as $item)
 		{
 			$new_final_arr_key[$item] = $item;
 		}
@@ -1199,30 +1199,30 @@ 
 
 		$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_mapper_csv');
-		$csv_tmp_data = $this->csvreader->parse_file($full_path . $terminationrate_file_name, $new_final_arr_key, $check_header);
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header);
 		$i = 0;
-		foreach($csv_tmp_data as $key => $csv_data)
+		foreach ($csv_tmp_data as $key => $csv_data)
 		{
-			if (isset($csv_data[$this->input->post("pattern-select") ]) && $csv_data[$this->input->post("pattern-select") ] != '' && $i != 0)
+			if (isset($csv_data[$this->input->post("pattern-select")]) && $csv_data[$this->input->post("pattern-select")] != '' && $i != 0)
 			{
 				$str = null;
-				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix") . $csv_data[$this->input->post("pattern-select") ] : $csv_data[$this->input->post("pattern-select") ];
-				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select") ] : "";
-				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix") . $csv_data['cost'] : $csv_data['cost'];
-				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select") ] : "";
-				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix") . $csv_data['prepend'] : $csv_data['prepend'];
-				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select") ] : "";
-				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix") . $csv_data['comment'] : $csv_data['comment'];
-				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select") ] : "0";
-				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix") . $csv_data['connectcost'] : $csv_data['connectcost'];
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select") ] : "0";
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix") . $csv_data['includedseconds'] : $csv_data['includedseconds'];
-				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select") ] : "0";
-				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix") . $csv_data['inc'] : $csv_data['inc'];
-				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select") ] : "";
-				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix") . $csv_data['precedence'] : $csv_data['precedence'];
-				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select") ] : "";
-				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix") . $csv_data['strip'] : $csv_data['strip'];
+				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix").$csv_data[$this->input->post("pattern-select")] : $csv_data[$this->input->post("pattern-select")];
+				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select")] : "";
+				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix").$csv_data['cost'] : $csv_data['cost'];
+				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select")] : "";
+				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix").$csv_data['prepend'] : $csv_data['prepend'];
+				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select")] : "";
+				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix").$csv_data['comment'] : $csv_data['comment'];
+				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select")] : "0";
+				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix").$csv_data['connectcost'] : $csv_data['connectcost'];
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select")] : "0";
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix").$csv_data['includedseconds'] : $csv_data['includedseconds'];
+				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select")] : "0";
+				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix").$csv_data['inc'] : $csv_data['inc'];
+				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select")] : "";
+				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix").$csv_data['precedence'] : $csv_data['precedence'];
+				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select")] : "";
+				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix").$csv_data['strip'] : $csv_data['strip'];
 				$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
 				$str = $this->data_validate($csv_data);
 				if ($str != "")
@@ -1233,13 +1233,13 @@ 
 				else
 				{
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
-					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
+					$new_final_arr[$i]['pattern'] = "^".$csv_data['pattern'].".*";
 					$new_final_arr[$i]['prepend'] = $csv_data['prepend'];
 					$new_final_arr[$i]['last_modified_date'] = $csv_data['last_modified_date'];
 					$new_final_arr[$i]['comment'] = $csv_data['comment'];
 					$new_final_arr[$i]['connectcost'] = $csv_data['connectcost'];
 					$new_final_arr[$i]['includedseconds'] = $csv_data['includedseconds'];
-					$new_final_arr[$i]['cost'] = !empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+					$new_final_arr[$i]['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
 					$new_final_arr[$i]['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
 					$new_final_arr[$i]['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 					$new_final_arr[$i]['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
@@ -1249,7 +1249,7 @@ 
 			$i++;
 		}
 
-		if (!empty($new_final_arr))
+		if ( ! empty($new_final_arr))
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
@@ -1257,29 +1257,29 @@ 
         {
 
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+           redirect(base_url().'rates/termination_rates_list/');
 		}
 
-		unlink($full_path . $terminationrate_file_name);
+		unlink($full_path.$terminationrate_file_name);
 		$count = count($invalid_array);
 		if ($count > 0)
 		{
 			$session_id = "-1";
-			$fp = fopen($full_path . $session_id . '.csv', 'w');
-			foreach($new_final_arr_key as $key => $value)
+			$fp = fopen($full_path.$session_id.'.csv', 'w');
+			foreach ($new_final_arr_key as $key => $value)
 			{
 				$custom_array[0][$key] = ucfirst($key);
 			}
 
 			$custom_array[0]['error'] = "Error";
 			$invalid_array = array_merge($custom_array, $invalid_array);
-			foreach($invalid_array as $err_data)
+			foreach ($invalid_array as $err_data)
 			{
 				fputcsv($fp, $err_data);
 			}
 
 			fclose($fp);
-			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id . ".csv");
+			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id.".csv");
 			$data["error"] = $invalid_array;
 			$data['trunkid'] = $trunkID;
 			$data['impoted_count'] = count($new_final_arr);
@@ -1289,8 +1289,8 @@ 
 		}
 		else
 		{
-			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
-			redirect(base_url() . "rates/termination_rate_list/");
+			$this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
+			redirect(base_url()."rates/termination_rate_list/");
 		}
 	}
 

Braces +36 added lines, -42 removed lines

@@ -35,8 +35,9 @@ 
 		ini_set("memory_limit", "2048M");
 		ini_set("max_execution_time", "259200");
 		ini_set("upload_max_filesize", "200M");
-		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 termination_rates_list() {
@@ -110,18 +111,17 @@ 
 			  $data['check_header']=$check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
 			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			} else{
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
 					}
-				}
-				else{
+				} else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-			}else {
+			} else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-		}else{
+		} else{
 		$invalid_flag=true;
 		}
 		if ($invalid_flag) {
@@ -164,8 +164,7 @@ 
 		if($str != ""){
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['trunk_id']=$trunkID;
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
 		  $new_final_arr[$i]=$csv_data;
@@ -253,19 +252,17 @@ 
 						$data['page_title'] = "Origination Rates Preview";
 						$data['check_header']=$check_header;
 						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-					}else{
+					} else{
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
-			 }   
-			else{
+			 } else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-		   }
-		   else {
+		   } else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
+			} else{
 		$invalid_flag=true;
 			}
 		if ($invalid_flag) {
@@ -309,8 +306,7 @@ 
 		if($str != ""){
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['pricelist_id']=$pricelistID;
 		  $csv_data['trunk_id']=$trunkid;
 		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -372,12 +368,10 @@ 
 		$count = count($error_field);
 		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
-		  }
-		  else{
+		  } else{
 		  return false;
 		  }
-	  }
-	  else{
+	  } else{
 	  $str=rtrim($str,',');
 		$error_field=explode(',',$str);
 		$count = count($error_field);
@@ -618,13 +612,15 @@ 
 		$where = array('accountid' => $accountid);
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
 		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
@@ -1059,15 +1055,20 @@ 
 
 	function csv_to_array($filename = '', $delimiter = ',')
 	{
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
+		if (!file_exists($filename) || !is_readable($filename)) {
+			return FALSE;
+		}
 		$header = NULL;
 		$data = array();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if (!$header) $header = $row;
-				else $data[] = array_combine($header, $row);
+				if (!$header) {
+					$header = $row;
+				} else {
+					$data[] = array_combine($header, $row);
+				}
 			}
 
 			fclose($handle);
@@ -1131,25 +1132,21 @@ 
 							$data['check_header'] = $check_header;
 							$data['page_title'] = 'Map CSV to Termination Rates';
 							$this->session->set_userdata('import_termination_rate_mapper_csv', $actual_file_name);
-						}
-						else
+						} else
 						{
 							$data['error'] = "File Uploading Fail Please Try Again";
 						}
 					}
-				}
-				else
+				} else
 				{
 					$data['error'] == "File Uploading Fail Please Try Again";
 				}
-			}
-			else
+			} else
 			{
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 				$data['error'] = var_dump($_FILES);
 			}
-		}
-		else
+		} else
 		{
 			$invalid_flag = true;
 		}
@@ -1229,8 +1226,7 @@ 
 				{
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = $str;
-				}
-				else
+				} else
 				{
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
 					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
@@ -1252,8 +1248,7 @@ 
 		if (!empty($new_final_arr))
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
-		}
-        		else
+		} else
         {
 
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
@@ -1286,8 +1281,7 @@ 
 			$data['failure_count'] = count($invalid_array) - 1;
 			$data['page_title'] = 'Termination Rates Import Error';
 			$this->load->view('view_import_error', $data);
-		}
-		else
+		} else
 		{
 			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
 			redirect(base_url() . "rates/termination_rate_list/");

web_interface/astpp/application/modules/accounts/libraries/accounts_form.php

Indentation +172 added lines, -172 removed lines

@@ -487,66 +487,66 @@ 
 			array(gettext('Account Type'), 'posttoexternal', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type_search'),
 			array(gettext('Balance'), 'INPUT', array('name' => 'balance[balance]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'balance[balance-integer]', '', '', '', 'search_int_type', ''),
             
-            array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit[credit_limit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'credit_limit[credit_limit-integer]', '', '', '', 'search_int_type', ''),
-            array(gettext('Status'), 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status'),
-            array(gettext('Created Date'), 'INPUT', array('name' => 'creation[0]', '', 'size' => '20', 'class' => "text field", 'id' => 'creation'), '', 'tOOL TIP', '', 'creation[creation-date]'),
-            array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
-            array('', 'HIDDEN', 'advance_search', '1', '', '', '')
-        );
-
-        $form['button_search'] = array('name' => 'action', 'id' => "account_search_btn", 'content' => gettext('Search'), 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
-        $form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => gettext('Clear'), 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');
-
-        return $form;
-    }
-
-    function get_admin_search_form() {
-        $form['forms'] = array("", array('id' => "account_search"));
-        $form['Search'] = array(
-            array(gettext('Account'), 'INPUT', array('name' => 'number[number]', '', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '1', 'number[number-string]', '', '', '', 'search_string_type', ''),
-            array(gettext('First Name'), 'INPUT', array('name' => 'first_name[first_name]', '', 'id' => 'first_name', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'first_name[first_name-string]', '', '', '', 'search_string_type', ''),
-            array(gettext('Last Name'), 'INPUT', array('name' => 'last_name[last_name]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'last_name[last_name-string]', '', '', '', 'search_string_type', ''),
-            array(gettext('Company'), 'INPUT', array('name' => 'company_name[company_name]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'company_name[company_name-string]', '', '', '', 'search_string_type', ''),
-            array(gettext('Email'), 'INPUT', array('name' => 'email[email]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'email[email-string]', '', '', '', 'search_string_type', ''),
-            array(gettext('Entity Type'), 'type', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_entity_type_admin'),
-            array(gettext('Phone'), 'INPUT', array('name' => 'telephone_1[telephone_1]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'telephone_1[telephone_1-integer]', '', '', '', 'search_int_type', ''),
-            array(gettext('Country'), 'country_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status'),
-            array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
-            array('', 'HIDDEN', 'advance_search', '1', '', '', '')
-        );
-
-        $form['button_search'] = array('name' => 'action', 'id' => "account_search_btn", 'content' => gettext('Search'), 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
-        $form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => gettext('Clear'), 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');
-
-        return $form;
-    }
-
-
-    function build_account_list_for_admin() {
-        // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-        $grid_field_arr = json_encode(array(
-            array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
-            array(gettext("Account"), "135", "number", "number", "accounts", "account_number_icon", "EDITABLE","true","left"),
-            array(gettext("First Name"), "150", "first_name", "", "", "","","true","center"),
-            array(gettext("Last Name"), "150", "last_name", "", "", "","","true","center"),
-            array(gettext("Company"), "150", "company_name", "", "", "","","true","center"),
-            array(gettext("Email"), "170", "email", "", "", "","","true","center"),
-            array(gettext("Phone"), "150", "telephone_1", "", "", "","","true","center"),
-            array(gettext("Country"), "110", "country_id", "country", "countrycode", "get_field_name","","true","center"),
-            array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
-            /*******************************************************************/
-            array(gettext("Action"), "100", "", "", "", array(
-                    "EDIT" => array("url" => "accounts/admin_edit/", "mode" => "single"),
-                    "DELETE" => array("url" => "accounts/admin_delete/", "mode" => "single")
-            ))
-                ));
-        return $grid_field_arr;
-    }
-
-    function build_account_list_for_customer() {
-      $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
-      $currency_id=$account_info['currency_id'];
-      $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
+			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit[credit_limit]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'credit_limit[credit_limit-integer]', '', '', '', 'search_int_type', ''),
+			array(gettext('Status'), 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status'),
+			array(gettext('Created Date'), 'INPUT', array('name' => 'creation[0]', '', 'size' => '20', 'class' => "text field", 'id' => 'creation'), '', 'tOOL TIP', '', 'creation[creation-date]'),
+			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
+			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
+		);
+
+		$form['button_search'] = array('name' => 'action', 'id' => "account_search_btn", 'content' => gettext('Search'), 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
+		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => gettext('Clear'), 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');
+
+		return $form;
+	}
+
+	function get_admin_search_form() {
+		$form['forms'] = array("", array('id' => "account_search"));
+		$form['Search'] = array(
+			array(gettext('Account'), 'INPUT', array('name' => 'number[number]', '', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '1', 'number[number-string]', '', '', '', 'search_string_type', ''),
+			array(gettext('First Name'), 'INPUT', array('name' => 'first_name[first_name]', '', 'id' => 'first_name', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'first_name[first_name-string]', '', '', '', 'search_string_type', ''),
+			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name[last_name]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'last_name[last_name-string]', '', '', '', 'search_string_type', ''),
+			array(gettext('Company'), 'INPUT', array('name' => 'company_name[company_name]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'company_name[company_name-string]', '', '', '', 'search_string_type', ''),
+			array(gettext('Email'), 'INPUT', array('name' => 'email[email]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'email[email-string]', '', '', '', 'search_string_type', ''),
+			array(gettext('Entity Type'), 'type', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_entity_type_admin'),
+			array(gettext('Phone'), 'INPUT', array('name' => 'telephone_1[telephone_1]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'telephone_1[telephone_1-integer]', '', '', '', 'search_int_type', ''),
+			array(gettext('Country'), 'country_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status'),
+			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
+			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
+		);
+
+		$form['button_search'] = array('name' => 'action', 'id' => "account_search_btn", 'content' => gettext('Search'), 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
+		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => gettext('Clear'), 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');
+
+		return $form;
+	}
+
+
+	function build_account_list_for_admin() {
+		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
+		$grid_field_arr = json_encode(array(
+			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
+			array(gettext("Account"), "135", "number", "number", "accounts", "account_number_icon", "EDITABLE","true","left"),
+			array(gettext("First Name"), "150", "first_name", "", "", "","","true","center"),
+			array(gettext("Last Name"), "150", "last_name", "", "", "","","true","center"),
+			array(gettext("Company"), "150", "company_name", "", "", "","","true","center"),
+			array(gettext("Email"), "170", "email", "", "", "","","true","center"),
+			array(gettext("Phone"), "150", "telephone_1", "", "", "","","true","center"),
+			array(gettext("Country"), "110", "country_id", "country", "countrycode", "get_field_name","","true","center"),
+			array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
+			/*******************************************************************/
+			array(gettext("Action"), "100", "", "", "", array(
+					"EDIT" => array("url" => "accounts/admin_edit/", "mode" => "single"),
+					"DELETE" => array("url" => "accounts/admin_delete/", "mode" => "single")
+			))
+				));
+		return $grid_field_arr;
+	}
+
+	function build_account_list_for_customer() {
+	  $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
+	  $currency_id=$account_info['currency_id'];
+	  $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
       
 	  // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
 	  $grid_field_arr = json_encode(array(
@@ -577,118 +577,118 @@ 
 	$currency_id=$account_info['currency_id'];
 	$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
 	
-        // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-        $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
-            array(gettext("Account"), "105", "number", "", "", "", "EDITABLE","true","center"),
-            array(gettext("First Name"), "120", "first_name", "", "", "","","true","center"),
-            array(gettext("Last Name"), "115", "last_name", "", "", "","","true","center"),
-            array(gettext("Company"), "130", "company_name", "", "", "","","true","center"),
-            array(gettext("Rate Group"), "95", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),
-            array(gettext("Account Type"), "107", "posttoexternal", "posttoexternal", "posttoexternal", "get_account_type","","true","center"),
-            array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency","","true","right"),
-            array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency","","true","right"),
-            array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
-            array(gettext("Created Date"), "90", "creation", "", "", "","","true","center"),          
-            /**************************************************************/
-            array(gettext("Action"), "139", "", "", "", array("PAYMENT" => array("url" => "accounts/customer_payment_process_add/", "mode" => "single"),
-                    "CALLERID" => array("url" => "accounts/customer_add_callerid/", "mode" => 'popup'),
-                    "EDIT" => array("url" => "accounts/reseller_edit/", "mode" => "single"),
-                    "DELETE" => array("url" => "accounts/reseller_delete/", "mode" => "single")
-            ))
-                ));
-        return $grid_field_arr;
-    }
-
-
-    function build_grid_buttons_customer() {
-        $logintype = $this->CI->session->userdata('userlevel_logintype');
-        $provider = null;
-        if ($logintype != 1)
-            $provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
-             // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-        $buttons_json = json_encode(array(
-            array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"),
-            array(gettext("Mass Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_bulk_creation/", "popup","medium"),
-            $provider,
-            array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/accounts/customer_export_cdr_xls/", 'single'),
-            array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/customer_selected_delete/")
-                ));
-        return $buttons_json;
-    }
-
-    function build_grid_buttons_admin() {
-        $buttons_json = json_encode(array(
-            array(gettext("Create Admin"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/admin_add/"),
-            array(gettext("Create Subadmin"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/subadmin_add/4"),
-            array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/admin_selected_delete/")
-                ));
-        return $buttons_json;
-    }
-
-    function build_grid_buttons_reseller() {
-        $buttons_json = json_encode(array(
-            array(gettext("Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/reseller_add/"),
-            array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/accounts/reseller_export_cdr_xls", 'single'),
-            array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/reseller_selected_delete/")
-                ));
-        return $buttons_json;
-    }
-
-    function build_ip_list_for_customer($accountid, $accountype) {
-        $grid_field_arr = json_encode(array(
-            array(gettext('Name'), "180", "name", "", "", "","","true","center"),
-            array(gettext('IP'), "180", "ip", "", "", "","","true","center"),
-            array(gettext('Prefix'), "180", "prefix", "", "", "","","true","center"),
-            array(gettext('Created Date'), "174", "created_date", "created_date", "created_date", "convert_GMT_to","","true","center"),
-            array(gettext('Modified Date'), "160", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
-            array(gettext('Action'), "150", "", "", "", array("DELETE" => array("url" => "accounts/" . $accountype . "_ipmap_action/delete/$accountid/$accountype/", "mode" => "single")))
-                ));
-        return $grid_field_arr;
-    }
-
-    function build_animap_list_for_customer($accountid, $accounttype) {
-        $grid_field_arr = json_encode(array(
-            array(gettext("Caller ID"), "200", "number", "", "", "","","true","center"),
-            array(gettext("Status"), "180", "status", "status", "ani_map", "get_status_new","","true","center"),
-            array(gettext("Created Date"), "200", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),
-            array(gettext("Modified Date"), "170", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
-            array(gettext("Action"), "200", "", "", "", array("DELETE" => array("url" => "accounts/" . $accounttype . "_animap_action/delete/$accountid/", "mode" => "single")))
-                ));
-        return $grid_field_arr;
-    }
-
-    function build_sipiax_list_for_customer() {
-        $grid_field_arr = json_encode(array(array("Tech", "150", "tech", "", "", ""),
-            array(gettext("Type"), "150", "type", "", "", ""),
-            array(gettext("User Name"), "150", "username", "sweep", "sweeplist", "get_field_name"),
-            array(gettext("Password"), "150", "secret", "", "", ""),
-            array(gettext("Context"), "150", "context", "", "", "")));
-        return $grid_field_arr;
-    }
-
-    function set_block_pattern_action_buttons($id) {
-        $ret_url = '';
-        $ret_url .= '<a href="/did/delete/' . $id . '/" class="icon delete_image" title="Delete" onClick="return get_alert_msg();">&nbsp;</a>';
-        return $ret_url;
-    }
-
-    function build_animap_list() {
-        $grid_field_arr = json_encode(array(array("Caller ID", "180", "number", "", "", ""),
-            array(gettext("status"),"180","status","status","animap","get_status"),    
-            array(gettext("Action"), "130", "", "", "",
-                array(
-                    "EDIT_ANIMAP" => array("url" => "accounts/callingcards_animap_list_edit/", "mode" => "single"),
-                    "DELETE_ANIMAP" => array("url" => "accounts/callingcards_animap_list_remove/", "mode" => "single")
-                )
-            )));
-        return $grid_field_arr;
-    }
-
-    function build_grid_buttons_destination() {
-        $buttons_json = json_encode(array(
-                ));
-        return $buttons_json;
-    }
+		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
+			array(gettext("Account"), "105", "number", "", "", "", "EDITABLE","true","center"),
+			array(gettext("First Name"), "120", "first_name", "", "", "","","true","center"),
+			array(gettext("Last Name"), "115", "last_name", "", "", "","","true","center"),
+			array(gettext("Company"), "130", "company_name", "", "", "","","true","center"),
+			array(gettext("Rate Group"), "95", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),
+			array(gettext("Account Type"), "107", "posttoexternal", "posttoexternal", "posttoexternal", "get_account_type","","true","center"),
+			array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency","","true","right"),
+			array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency","","true","right"),
+			array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
+			array(gettext("Created Date"), "90", "creation", "", "", "","","true","center"),          
+			/**************************************************************/
+			array(gettext("Action"), "139", "", "", "", array("PAYMENT" => array("url" => "accounts/customer_payment_process_add/", "mode" => "single"),
+					"CALLERID" => array("url" => "accounts/customer_add_callerid/", "mode" => 'popup'),
+					"EDIT" => array("url" => "accounts/reseller_edit/", "mode" => "single"),
+					"DELETE" => array("url" => "accounts/reseller_delete/", "mode" => "single")
+			))
+				));
+		return $grid_field_arr;
+	}
+
+
+	function build_grid_buttons_customer() {
+		$logintype = $this->CI->session->userdata('userlevel_logintype');
+		$provider = null;
+		if ($logintype != 1)
+			$provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
+			 // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
+		$buttons_json = json_encode(array(
+			array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"),
+			array(gettext("Mass Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_bulk_creation/", "popup","medium"),
+			$provider,
+			array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/accounts/customer_export_cdr_xls/", 'single'),
+			array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/customer_selected_delete/")
+				));
+		return $buttons_json;
+	}
+
+	function build_grid_buttons_admin() {
+		$buttons_json = json_encode(array(
+			array(gettext("Create Admin"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/admin_add/"),
+			array(gettext("Create Subadmin"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/subadmin_add/4"),
+			array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/admin_selected_delete/")
+				));
+		return $buttons_json;
+	}
+
+	function build_grid_buttons_reseller() {
+		$buttons_json = json_encode(array(
+			array(gettext("Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/reseller_add/"),
+			array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/accounts/reseller_export_cdr_xls", 'single'),
+			array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/reseller_selected_delete/")
+				));
+		return $buttons_json;
+	}
+
+	function build_ip_list_for_customer($accountid, $accountype) {
+		$grid_field_arr = json_encode(array(
+			array(gettext('Name'), "180", "name", "", "", "","","true","center"),
+			array(gettext('IP'), "180", "ip", "", "", "","","true","center"),
+			array(gettext('Prefix'), "180", "prefix", "", "", "","","true","center"),
+			array(gettext('Created Date'), "174", "created_date", "created_date", "created_date", "convert_GMT_to","","true","center"),
+			array(gettext('Modified Date'), "160", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
+			array(gettext('Action'), "150", "", "", "", array("DELETE" => array("url" => "accounts/" . $accountype . "_ipmap_action/delete/$accountid/$accountype/", "mode" => "single")))
+				));
+		return $grid_field_arr;
+	}
+
+	function build_animap_list_for_customer($accountid, $accounttype) {
+		$grid_field_arr = json_encode(array(
+			array(gettext("Caller ID"), "200", "number", "", "", "","","true","center"),
+			array(gettext("Status"), "180", "status", "status", "ani_map", "get_status_new","","true","center"),
+			array(gettext("Created Date"), "200", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),
+			array(gettext("Modified Date"), "170", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
+			array(gettext("Action"), "200", "", "", "", array("DELETE" => array("url" => "accounts/" . $accounttype . "_animap_action/delete/$accountid/", "mode" => "single")))
+				));
+		return $grid_field_arr;
+	}
+
+	function build_sipiax_list_for_customer() {
+		$grid_field_arr = json_encode(array(array("Tech", "150", "tech", "", "", ""),
+			array(gettext("Type"), "150", "type", "", "", ""),
+			array(gettext("User Name"), "150", "username", "sweep", "sweeplist", "get_field_name"),
+			array(gettext("Password"), "150", "secret", "", "", ""),
+			array(gettext("Context"), "150", "context", "", "", "")));
+		return $grid_field_arr;
+	}
+
+	function set_block_pattern_action_buttons($id) {
+		$ret_url = '';
+		$ret_url .= '<a href="/did/delete/' . $id . '/" class="icon delete_image" title="Delete" onClick="return get_alert_msg();">&nbsp;</a>';
+		return $ret_url;
+	}
+
+	function build_animap_list() {
+		$grid_field_arr = json_encode(array(array("Caller ID", "180", "number", "", "", ""),
+			array(gettext("status"),"180","status","status","animap","get_status"),    
+			array(gettext("Action"), "130", "", "", "",
+				array(
+					"EDIT_ANIMAP" => array("url" => "accounts/callingcards_animap_list_edit/", "mode" => "single"),
+					"DELETE_ANIMAP" => array("url" => "accounts/callingcards_animap_list_remove/", "mode" => "single")
+				)
+			)));
+		return $grid_field_arr;
+	}
+
+	function build_grid_buttons_destination() {
+		$buttons_json = json_encode(array(
+				));
+		return $buttons_json;
+	}
 
 }
 

Spacing +123 added lines, -123 removed lines

@@ -21,7 +21,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
 	exit('No direct script access allowed');
 
 class Accounts_form {
@@ -36,7 +36,7 @@ 
 		$type = $entity_type == 'customer' ? 0 : 3;
 		$uname = $this->CI->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
 		$pin = Common_model::$global_config['system_config']['pinlength'];
-		$pin_number=$this->CI->common->find_uniq_rendno($pin, 'pin', 'accounts');
+		$pin_number = $this->CI->common->find_uniq_rendno($pin, 'pin', 'accounts');
 		$uname_user = $this->CI->common->find_uniq_rendno('10', 'number', 'accounts');
 		$password = $this->CI->common->generate_password();
 		$logintype = $this->CI->session->userdata('logintype');
@@ -48,33 +48,33 @@ 
 		}
 		$sip_device = null;
 		$opensips_device = null;
-		if (!$entity_type) {
+		if ( ! $entity_type) {
 			$entity_type = 'customer';
 		}
-		$params=array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number','readonly'=>true);
+		$params = array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number', 'readonly'=>true);
         
 		if ($id > 0) {
 			$readable = 'disabled';
-			$val = 'accounts.email.' . $id;
-			$account_val='accounts.number.'.$id;
+			$val = 'accounts.email.'.$id;
+			$account_val = 'accounts.number.'.$id;
 			$password = array('Password', 'PASSWORD', array('name' => 'password', 'id' => 'password_show', 'onmouseover' => 'seetext(password_show)', 'onmouseout' => 'hidepassword(password_show)', 'size' => '20', 'class' => "text field medium"), 'required|', 'tOOL TIP', '');
 			$balance = array('Balance', 'INPUT', array('name' => 'balance', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), '', 'tOOL TIP', '');
-			$account=array('Account', 'INPUT',$params, 'required|integer|greater_than[0]|is_unique[' . $account_val . ']', 'tOOL TIP', '');
+			$account = array('Account', 'INPUT', $params, 'required|integer|greater_than[0]|is_unique['.$account_val.']', 'tOOL TIP', '');
 			/*             * ******************************** */
 		} else {
 			$val = 'accounts.email';
-			$account_val='accounts.number';
+			$account_val = 'accounts.number';
 			 if (common_model::$global_config['system_config']['opensips'] == 0) {
 				$sip_device = array('Create Opensips Device', 'opensips_device_flag', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_prorate');
 			} else {
 			  $sip_device = array('Create SIP Device', 'sip_device_flag', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_prorate');   
 		}
-			$account = array('Account', 'INPUT',$params, 'required|integer|greater_than[0]|is_unique[' . $account_val . ']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');      
+			$account = array('Account', 'INPUT', $params, 'required|integer|greater_than[0]|is_unique['.$account_val.']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');      
 			$password = array('Password', 'INPUT', array('name' => 'password', 'value' => $password, 'size' => '20', 'class' => "text field medium", 'id' => 'password'), 'required|', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Reset Password" class="change_pass fa fa-refresh" ></i>');
-			$balance = array('Balance', 'INPUT', array('name' => 'balance', 'size' => '20','class' => "text field medium"), '', 'tOOL TIP', '');
+			$balance = array('Balance', 'INPUT', array('name' => 'balance', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', '');
 		}
 		$pin = array('Pin', 'INPUT', array('name' => 'pin', 'value' => $pin_number, 'size' => '20', 'class' => "text field medium", 'id' => 'change_pin'), 'required|is_numeric', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Pin" class="change_pin fa fa-refresh" ></i>');
-		$form['forms'] = array(base_url() . 'accounts/' . $entity_type . '_save/'.$id."/", array("id" => "customer_form", "name" => "customer_form"));
+		$form['forms'] = array(base_url().'accounts/'.$entity_type.'_save/'.$id."/", array("id" => "customer_form", "name" => "customer_form"));
 		$form[gettext('Account Profile')] = array(
 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
 		array('', 'HIDDEN', array('name' => 'type', 'value' => $type), '', '', ''),
@@ -82,16 +82,16 @@ 
 			$password,
 			$pin,
 			array(gettext('First Name'), 'INPUT', array('name' => 'first_name', 'id' => 'first_name', 'size' => '15', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),
-			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name', 'size' => '15',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Company'), 'INPUT', array('name' => 'company_name', 'size' => '15', 'class' => 'text field medium'), 'trim|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Phone'), 'INPUT', array('name' => 'telephone_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Mobile'), 'INPUT', array('name' => 'telephone_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50',  'class' => "text field medium"), 'required|valid_email|is_unique[' . $val . ']', 'tOOL TIP', ''),
-			array(gettext('Address 1'), 'INPUT', array('name' => 'address_1', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50', 'class' => "text field medium"), 'required|valid_email|is_unique['.$val.']', 'tOOL TIP', ''),
+			array(gettext('Address 1'), 'INPUT', array('name' => 'address_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Address 2'), 'INPUT', array('name' => 'address_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('City'), 'INPUT', array('name' => 'city', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Province/State'), 'INPUT', array('name' => 'province', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Zip/Postal Code'), 'INPUT', array('name' => 'postal_code', 'size' => '15',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('City'), 'INPUT', array('name' => 'city', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Province/State'), 'INPUT', array('name' => 'province', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Zip/Postal Code'), 'INPUT', array('name' => 'postal_code', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Country'), array('name' => 'country_id', 'class' => 'country_id'), 'SELECT', '', array("name" => "country_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),
 			array(gettext('Timezone'), array('name' => 'timezone_id', 'class' => 'timezone_id'), 'SELECT', '', array("name" => "timezone_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'gmtzone', 'timezone', 'build_dropdown', '', ''),
 			array(gettext('Currency'), array('name' => 'currency_id', 'class' => 'currency_id'), 'SELECT', '', array("name" => "currency_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'currencyname,currency', 'currency', 'build_concat_dropdown', '', array())
@@ -105,9 +105,9 @@ 
 			array(gettext('Number Translation'), 'INPUT', array('name' => 'dialed_modify', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Concurrent Calls'), 'INPUT', array('name' => 'maxchannels', 'size' => '20', 'class' => "text field medium"), 'numeric', 'tOOL TIP', ''),
 			array(gettext('Interval'), 'INPUT', array('name' => 'interval', 'size' => '20', 'class' => "text field medium"), 'numeric', 'tOOL TIP', ''),
-			array(gettext('First Used'), 'INPUT', array('name' => 'first_used', 'size' => '20', 'readonly' => true,  'class' => "text field medium", 'value' => '0000-00-00 00:00:00'), '', 'tOOL TIP', ''),
+			array(gettext('First Used'), 'INPUT', array('name' => 'first_used', 'size' => '20', 'readonly' => true, 'class' => "text field medium", 'value' => '0000-00-00 00:00:00'), '', 'tOOL TIP', ''),
 		array(gettext('Account Valid Days'), 'INPUT', array('name' => 'validfordays', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),
-		array(gettext('Expiry Date'), 'INPUT', array('name' => 'expiry', 'size' => '20',  'class' => "text field medium", 'value' => $expiry_date, 'id' => 'expiry'), '', 'tOOL TIP', ''),
+		array(gettext('Expiry Date'), 'INPUT', array('name' => 'expiry', 'size' => '20', 'class' => "text field medium", 'value' => $expiry_date, 'id' => 'expiry'), '', 'tOOL TIP', ''),
 		);
 		
 		$form[gettext('Billing Settings')] = array(
@@ -121,12 +121,12 @@ 
 			array(gettext('LC Charge / Min'), 'INPUT', array('name' => 'charge_per_min', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),           
 			array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, "reseller_id" => $loginid), 'multi'),
 		);
-	if($id==0){
+	if ($id == 0) {
 	  $form[gettext('Alert Threshold')] = array(
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
 			array(gettext('Email Alerts ?'), 'notify_flag', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'custom_status'),
-			array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20',  'class' => "text field medium"), 'valid_decimal', 'tOOL TIP', ''),
-			array(gettext('Email'), 'INPUT', array('name' => 'notify_email', 'size' => '50',  'class' => "text field medium"), 'valid_email', 'tOOL TIP', ''),
+			array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20', 'class' => "text field medium"), 'valid_decimal', 'tOOL TIP', ''),
+			array(gettext('Email'), 'INPUT', array('name' => 'notify_email', 'size' => '50', 'class' => "text field medium"), 'valid_email', 'tOOL TIP', ''),
 	  );
 	}
 		$form['button_save'] = array('name' => 'action', 'content' => gettext('Save'), 'value' => 'save', 'type' => 'submit', 'class' => 'btn btn-line-parrot');
@@ -138,12 +138,12 @@ 
 	}
 
 	function customer_alert_threshold($entity_type) {
-		$form['forms'] = array(base_url() . 'accounts/' . $entity_type . '_alert_threshold_save/' . $entity_type . "/", array("id" => "customer_alert_threshold", "name" => "customer_alert_threshold"));
+		$form['forms'] = array(base_url().'accounts/'.$entity_type.'_alert_threshold_save/'.$entity_type."/", array("id" => "customer_alert_threshold", "name" => "customer_alert_threshold"));
 		$form[gettext('Alert Threshold')] = array(
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
 			array(gettext('Email Alerts ?'), 'notify_flag', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'custom_status'),
-			array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20',  'class' => "text field medium"), 'valid_decimal', 'tOOL TIP', ''),
-			array(gettext('Email'), 'INPUT', array('name' => 'notify_email', 'size' => '50',  'class' => "text field medium"), 'valid_email', 'tOOL TIP', ''),
+			array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20', 'class' => "text field medium"), 'valid_decimal', 'tOOL TIP', ''),
+			array(gettext('Email'), 'INPUT', array('name' => 'notify_email', 'size' => '50', 'class' => "text field medium"), 'valid_email', 'tOOL TIP', ''),
 		);
 		$form['button_save'] = array('name' => 'action', 'content' => gettext('Save'), 'value' => 'save', 'type' => 'submit', 'class' => 'btn btn-line-parrot');
 		return $form;
@@ -164,12 +164,12 @@ 
 				$sip_device = array(gettext('Create SIP Device'), 'sip_device_flag', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'custom_status');
 			}
 		}
-		$form['forms'] = array(base_url() . 'accounts/customer_bulk_save/', array("id" => "customer_bulk_form", "name" => "customer_bulk_form"));
+		$form['forms'] = array(base_url().'accounts/customer_bulk_save/', array("id" => "customer_bulk_form", "name" => "customer_bulk_form"));
 		$form[gettext('General Details')] = array(
-			array(gettext('Account Count'), 'INPUT', array('name' => 'count', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Start Prefix'), 'INPUT', array('name' => 'prefix', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Acc. Number Length'), 'INPUT', array('name' => 'account_length', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Company'), 'INPUT', array('name' => 'company_name',  'size' => '15', 'class' => 'text field medium'), 'trim|required|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Account Count'), 'INPUT', array('name' => 'count', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Start Prefix'), 'INPUT', array('name' => 'prefix', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Acc. Number Length'), 'INPUT', array('name' => 'account_length', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Company'), 'INPUT', array('name' => 'company_name', 'size' => '15', 'class' => 'text field medium'), 'trim|required|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Country'), array('name' => 'country_id', 'class' => 'country_id'), 'SELECT', '', array("name" => "country_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),
 			array(gettext('Timezone'), array('name' => 'timezone_id', 'class' => 'timezone_id'), 'SELECT', '', array("name" => "timezone_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'gmtzone', 'timezone', 'build_dropdown', '', ''),
 			array(gettext('Generate Pin'), 'pin', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_pin_allow_customer'),
@@ -184,7 +184,7 @@ 
 			array(gettext('Billing Schedule'), array('name' => 'sweep_id', 'id' => 'sweep_id', 'class' => 'sweep_id'), 'SELECT', '', '', 'tOOL TIP', '', 'id', 'sweep', 'sweeplist', 'build_dropdown', '', ''),
 			array(gettext('Billing Day'), array("name" => 'invoice_day', "class" => "invoice_day"), 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_invoice_option'),
 			array(gettext('Currency'), array('name' => 'currency_id', 'class' => 'currency_id'), 'SELECT', '', array("name" => "currency_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'currencyname,currency', 'currency', 'build_concat_dropdown', '', array()),
-			array(gettext('Balance'), 'INPUT', array('name' => 'balance', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|greater_than[0]|currency_decimal|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Balance'), 'INPUT', array('name' => 'balance', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|greater_than[0]|currency_decimal|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit', 'size' => '20', 'class' => "text field medium"), 'trim|currency_decimal|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Valid Days'), 'INPUT', array('name' => 'validfordays', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),
 		array(gettext('Allow Local Calls'), 'local_call', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'custom_status'),
@@ -196,7 +196,7 @@ 
 	}
 
 	function get_customer_callerid_fields() {
-		$form['forms'] = array(base_url() . 'accounts/customer_add_callerid/', array("id" => "callerid_form"));
+		$form['forms'] = array(base_url().'accounts/customer_add_callerid/', array("id" => "callerid_form"));
 		$form[gettext('Information')] = array(
 			array('', 'HIDDEN', array('name' => 'flag'), '', '', '', ''),
 			array(gettext('Account'), 'INPUT', array('name' => 'accountid', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),
@@ -210,7 +210,7 @@ 
 	}
 
 	function get_customer_payment_fields($currency, $number, $currency_id, $id) {
-		$form['forms'] = array(base_url() . 'accounts/customer_payment_save/', array('id' => 'acccount_charges_form', 'method' => 'POST', 'name' => 'acccount_charges_form'));
+		$form['forms'] = array(base_url().'accounts/customer_payment_save/', array('id' => 'acccount_charges_form', 'method' => 'POST', 'name' => 'acccount_charges_form'));
 		$form['​Refill information'] = array(
 			array('', 'HIDDEN', array('name' => 'id', 'value' => $id), '', '', '', ''),
 			array('', 'HIDDEN', array('name' => 'account_currency', 'value' => $currency_id), '', '', ''),
@@ -227,11 +227,11 @@ 
 	function get_form_reseller_fields($id = false) {
 		$readable = false;
 		$invoice_config = null;
-		$concurrent_calls=null;
+		$concurrent_calls = null;
 		$logintype = $this->CI->session->userdata('logintype');
 		$uname = $this->CI->common->find_uniq_rendno(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
 		$password = $this->CI->common->generate_password();
-		$params=array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number','readonly'=>true);
+		$params = array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number', 'readonly'=>true);
 		if ($logintype == 1 || $logintype == 5) {
 			$account_data = $this->CI->session->userdata("accountinfo");
 			$loginid = $account_data['id'];
@@ -239,18 +239,18 @@ 
 			$loginid = "0";
 		}
 		if ($id > 0) {
-			$val = 'accounts.email.' . $id;
-			$account_val='accounts.number.'.$id;
+			$val = 'accounts.email.'.$id;
+			$account_val = 'accounts.number.'.$id;
 			$readable = 'disabled';
-			$password = array('Password', 'PASSWORD', array('name' => 'password', 'id' => 'password_show', 'onmouseover' => 'seetext(password_show)', 'onmouseout' => 'hidepassword(password_show)', 'size' => '20',  'class' => "text field medium"), 'required|notMatch[number]|', 'tOOL TIP', '');
-			$concurrent_calls=array('Concurrent Calls', 'INPUT', array('name' => 'maxchannels', 'size' => '20', 'class' => "text field medium"), 'numeric', 'tOOL TIP', '');
-			$account=array('Account', 'INPUT',$params, 'required|integer|greater_than[0]|is_unique[' . $account_val . ']', 'tOOL TIP', '');
+			$password = array('Password', 'PASSWORD', array('name' => 'password', 'id' => 'password_show', 'onmouseover' => 'seetext(password_show)', 'onmouseout' => 'hidepassword(password_show)', 'size' => '20', 'class' => "text field medium"), 'required|notMatch[number]|', 'tOOL TIP', '');
+			$concurrent_calls = array('Concurrent Calls', 'INPUT', array('name' => 'maxchannels', 'size' => '20', 'class' => "text field medium"), 'numeric', 'tOOL TIP', '');
+			$account = array('Account', 'INPUT', $params, 'required|integer|greater_than[0]|is_unique['.$account_val.']', 'tOOL TIP', '');
 		} else {
 			$val = 'accounts.email';
-			$account_val='accounts.number';
+			$account_val = 'accounts.number';
 			$invoice_config = array('Use same credential for Invoice Config', 'invoice_config_flag', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_prorate');
 			$password = array('Password', 'INPUT', array('name' => 'password', 'value' => $password, 'size' => '20', 'class' => "text field medium", 'id' => 'password'), 'required|', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Reset Password" class="change_pass fa fa-refresh" ></i>');
-			$account = array('Account', 'INPUT',$params, 'required|integer|greater_than[0]|is_unique[' . $account_val . ']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');
+			$account = array('Account', 'INPUT', $params, 'required|integer|greater_than[0]|is_unique['.$account_val.']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');
 		}
 		if ($id == "") {
 			$reg_url = array('', 'HIDDEN', array('name' => 'id'), '', '', '', '');
@@ -258,7 +258,7 @@ 
 			$reg_url = array('Registration URL', 'INPUT', array('name' => 'registration_url', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'tOOL TIP', '');
 		}
 		/*         * ****************************************************************** */
-		$form['forms'] = array(base_url() . 'accounts/reseller_save/', array("id" => "reseller_form", "name" => "reseller_form"));
+		$form['forms'] = array(base_url().'accounts/reseller_save/', array("id" => "reseller_form", "name" => "reseller_form"));
 		$form['Client Panel Access'] = array(
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
 			array('', 'HIDDEN', array('name' => 'type', 'value' => '1'), '', '', ''),
@@ -275,12 +275,12 @@ 
 			array(gettext('Billing Day'), array("name" => 'invoice_day', "class" => "invoice_day"), 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_invoice_option'),
 			array(gettext('Currency'), array('name' => 'currency_id', 'class' => 'currency_id'), 'SELECT', '', array("name" => "currency_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'currencyname,currency', 'currency', 'build_concat_dropdown', '', array()),
 			array(gettext('Account Type'), array('name' => 'posttoexternal', 'disabled' => $readable, 'class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),
-			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, 'reseller_id' => $loginid), 'multi'),
 		);
 
 }
-else{
+else {
 			$form[gettext('Billing Information')] = array(
 			array(gettext('Rate Group'), 'pricelist_id', 'SELECT', '', array("name" => "pricelist_id", 'rules' => 'required'), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")),
             
@@ -288,31 +288,31 @@ 
 			array(gettext('Billing Day'), array("name" => 'invoice_day', "class" => "invoice_day"), 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_invoice_option'),
 			array(gettext('Currency'), array('name' => 'currency_id', 'class' => 'currency_id'), 'SELECT', '', array("name" => "currency_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'currencyname,currency', 'currency', 'build_concat_dropdown', '', array()),
 			array(gettext('Account Type'), array('name' => 'posttoexternal', 'disabled' => $readable, 'class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),
-			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Credit Limit'), 'INPUT', array('name' => 'credit_limit', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, 'reseller_id' => $loginid), 'multi'),
 			$invoice_config,
 		);
 	}
 		$form[gettext('Reseller Profile')] = array(
-			array(gettext('First Name'), 'INPUT', array('name' => 'first_name', 'id' => 'first_name', 'size' => '50',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name', 'size' => '15',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Company'), 'INPUT', array('name' => 'company_name',  'size' => '50', 'class' => 'text field medium'), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('First Name'), 'INPUT', array('name' => 'first_name', 'id' => 'first_name', 'size' => '50', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Company'), 'INPUT', array('name' => 'company_name', 'size' => '50', 'class' => 'text field medium'), 'trim|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Telephone 1'), 'INPUT', array('name' => 'telephone_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Telephone 2'), 'INPUT', array('name' => 'telephone_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50', 'class' => "text field medium"), 'required|valid_email|is_unique[' . $val . ']', 'tOOL TIP', ''),
+			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50', 'class' => "text field medium"), 'required|valid_email|is_unique['.$val.']', 'tOOL TIP', ''),
 			array(gettext('Address 1'), 'INPUT', array('name' => 'address_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Address 2'), 'INPUT', array('name' => 'address_2', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', ''),
+			array(gettext('Address 2'), 'INPUT', array('name' => 'address_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('City'), 'INPUT', array('name' => 'city', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 			array(gettext('Province/State'), 'INPUT', array('name' => 'province', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', ''),
-			array(gettext('Zip/Postal Code'), 'INPUT', array('name' => 'postal_code', 'size' => '15',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Zip/Postal Code'), 'INPUT', array('name' => 'postal_code', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),
 			array(gettext('Country'), array('name' => 'country_id', 'class' => 'country_id'), 'SELECT', '', array("name" => "country_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),
 			array(gettext('Timezone'), array('name' => 'timezone_id', 'class' => 'timezone_id'), 'SELECT', '', array("name" => "timezone_id", "rules" => "required"), 'tOOL TIP', 'Please Enter account number', 'id', 'gmtzone', 'timezone', 'build_dropdown', '', ''),
 			array(gettext('Account Status'), 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),
 		);
-		if($id==0){
+		if ($id == 0) {
 	  $form[gettext('Alert Threshold')] = array(
 	  array('Email Alert?', 'notify_flag', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'custom_status'),
-		  array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),
+		  array(gettext('Balance Below'), 'INPUT', array('name' => 'notify_credit_limit', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
 		  array(gettext('Email'), 'INPUT', array('name' => 'notify_email', 'size' => '50', 'class' => "text field medium"), 'valid_email', 'tOOL TIP', ''),
 	  );
 	}
@@ -323,24 +323,24 @@ 
 
 	function get_form_admin_fields($entity_type = '', $id = false) {
 	  $uname = $this->CI->common->find_uniq_rendno(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
-	  $params=array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number','readonly'=>true);
+	  $params = array('name' => 'number', 'value' => $uname, 'size' => '20', 'class' => "text field medium", 'id' => 'number', 'readonly'=>true);
 		if ($id > 0) {
-			$val = 'accounts.email.' . $id;
-			$account_val='accounts.number.'.$id;
-			$password = array('Password', 'PASSWORD', array('name' => 'password', 'id' => 'password_show', 'onmouseover' => 'seetext(password_show)', 'onmouseout' => 'hidepassword(password_show)', 'size' => '20',  'class' => "text field medium"), 'required|notMatch[number]|', 'tOOL TIP', '');
-			$account=array('Account', 'INPUT',$params, 'required|is_unique[' . $account_val . ']', 'tOOL TIP', '');
+			$val = 'accounts.email.'.$id;
+			$account_val = 'accounts.number.'.$id;
+			$password = array('Password', 'PASSWORD', array('name' => 'password', 'id' => 'password_show', 'onmouseover' => 'seetext(password_show)', 'onmouseout' => 'hidepassword(password_show)', 'size' => '20', 'class' => "text field medium"), 'required|notMatch[number]|', 'tOOL TIP', '');
+			$account = array('Account', 'INPUT', $params, 'required|is_unique['.$account_val.']', 'tOOL TIP', '');
 		} else {
 			$val = 'accounts.email';
-			$account_val='accounts.number';
+			$account_val = 'accounts.number';
 			$password = $this->CI->common->generate_password();
-			$password = array('Password', 'INPUT', array('name' => 'password', 'value' => $password, 'size' => '20','class' => "text field medium", 'id' => 'password'), 'required|', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Reset Password" class="change_pass fa fa-refresh" ></i>');
-			$account = array('Account', 'INPUT',$params, 'required|is_unique[' . $account_val . ']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');
+			$password = array('Password', 'INPUT', array('name' => 'password', 'value' => $password, 'size' => '20', 'class' => "text field medium", 'id' => 'password'), 'required|', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Reset Password" class="change_pass fa fa-refresh" ></i>');
+			$account = array('Account', 'INPUT', $params, 'required|is_unique['.$account_val.']', 'tOOL TIP', '', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;color: #1bcb61;" title="Generate Account" class="change_number fa fa-refresh" ></i>');
 			/*             * ****************** */
 		}
 
         
 		$type = $entity_type == 'admin' ? 2 : 4;
-		$form['forms'] = array(base_url() . 'accounts/' . $entity_type . '_save/', array("id" => "admin_form", "name" => "admin_form"));
+		$form['forms'] = array(base_url().'accounts/'.$entity_type.'_save/', array("id" => "admin_form", "name" => "admin_form"));
 		$form['Client Panel Access'] = array(
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
 			array('', 'HIDDEN', array('name' => 'type', 'value' => $type), '', '', ''),
@@ -348,17 +348,17 @@ 
 			$password,
 				/*                 * ********************* */
 		);
-		$form[gettext($entity_type . ' Profile')] = array(
+		$form[gettext($entity_type.' Profile')] = array(
 			array(gettext('First Name'), 'INPUT', array('name' => 'first_name', 'id' => 'first_name', 'size' => '15', 'maxlength' => '40', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),
 			array(gettext('Last Name'), 'INPUT', array('name' => 'last_name', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', 'Please Enter Password'),
-			array(gettext('Company'), 'INPUT', array('name' => 'company_name',  'size' => '15', 'class' => 'text field medium'), 'trim|xss_clean', 'tOOL TIP', ''),
-			array(gettext('Telephone 1'), 'INPUT', array('name' => 'telephone_1', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
+			array(gettext('Company'), 'INPUT', array('name' => 'company_name', 'size' => '15', 'class' => 'text field medium'), 'trim|xss_clean', 'tOOL TIP', ''),
+			array(gettext('Telephone 1'), 'INPUT', array('name' => 'telephone_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
 			array(gettext('Telephone 2'), 'INPUT', array('name' => 'telephone_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
-			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50',  'class' => "text field medium"), 'required|valid_email|is_unique[' . $val . ']', 'tOOL TIP', ''),
-			array(gettext('Address 1'), 'INPUT', array('name' => 'address_1', 'size' => '15','class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
-			array(gettext('Address 2'), 'INPUT', array('name' => 'address_2', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
+			array(gettext('Email'), 'INPUT', array('name' => 'email', 'size' => '50', 'class' => "text field medium"), 'required|valid_email|is_unique['.$val.']', 'tOOL TIP', ''),
+			array(gettext('Address 1'), 'INPUT', array('name' => 'address_1', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
+			array(gettext('Address 2'), 'INPUT', array('name' => 'address_2', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
 			array(gettext('City'), 'INPUT', array('name' => 'city', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
-			array(gettext('Province/State'), 'INPUT', array('name' => 'province', 'size' => '15',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
+			array(gettext('Province/State'), 'INPUT', array('name' => 'province', 'size' => '15', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),
 			array(gettext('Zip/Postal Code'), 'INPUT', array('name' => 'postal_code', 'size' => '15', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', 'Please Enter Password'),
 			array(gettext('Country'), array('name' => 'country_id', 'class' => 'country_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),
 			array(gettext('Timezone'), array('name' => 'timezone_id', 'class' => 'timezone_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'gmtzone', 'timezone', 'build_dropdown', '', ''),
@@ -404,7 +404,7 @@ 
 		$form['forms'] = array("accounts/customer_batch_update/", array('id' => "reseller_batch_update"));
 		$form[gettext('Batch Update')] = array(
 			array(gettext('Rate Group'), array('name' => 'pricelist_id[pricelist_id]', 'id' => 'pricelist_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0"), array('name' => 'pricelist_id[operator]', 'class' => 'update_drp'), 'update_drp_type'),
-			array(gettext('Balance'), 'INPUT', array('name' => 'balance[balance]', 'id' => 'balance', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name' => 'balance[operator]', 'class' => 'update_drp'), '', '', '', 'update_int_type', ''),
+			array(gettext('Balance'), 'INPUT', array('name' => 'balance[balance]', 'id' => 'balance', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name' => 'balance[operator]', 'class' => 'update_drp'), '', '', '', 'update_int_type', ''),
 			$status,
 		);
 		$form['button_search'] = array('name' => 'action', 'id' => "batch_update_btn", 'content' => gettext('Update'), 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
@@ -419,7 +419,7 @@ 
 
 	function get_search_customer_form() {
 		$logintype = $this->CI->session->userdata('userlevel_logintype');
-		 if($logintype != 1){
+		 if ($logintype != 1) {
 		$form['forms'] = array("", array('id' => "account_search"));
 		$form[gettext('Search')] = array(
 			array(gettext('Account'), 'INPUT', array('name' => 'number[number]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'number[number-string]', '', '', '', 'search_string_type', ''),
@@ -525,15 +525,15 @@ 
     function build_account_list_for_admin() {
         // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
         $grid_field_arr = json_encode(array(
-            array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
-            array(gettext("Account"), "135", "number", "number", "accounts", "account_number_icon", "EDITABLE","true","left"),
-            array(gettext("First Name"), "150", "first_name", "", "", "","","true","center"),
-            array(gettext("Last Name"), "150", "last_name", "", "", "","","true","center"),
-            array(gettext("Company"), "150", "company_name", "", "", "","","true","center"),
-            array(gettext("Email"), "170", "email", "", "", "","","true","center"),
-            array(gettext("Phone"), "150", "telephone_1", "", "", "","","true","center"),
-            array(gettext("Country"), "110", "country_id", "country", "countrycode", "get_field_name","","true","center"),
-            array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
+            array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),
+            array(gettext("Account"), "135", "number", "number", "accounts", "account_number_icon", "EDITABLE", "true", "left"),
+            array(gettext("First Name"), "150", "first_name", "", "", "", "", "true", "center"),
+            array(gettext("Last Name"), "150", "last_name", "", "", "", "", "true", "center"),
+            array(gettext("Company"), "150", "company_name", "", "", "", "", "true", "center"),
+            array(gettext("Email"), "170", "email", "", "", "", "", "true", "center"),
+            array(gettext("Phone"), "150", "telephone_1", "", "", "", "", "true", "center"),
+            array(gettext("Country"), "110", "country_id", "country", "countrycode", "get_field_name", "", "true", "center"),
+            array(gettext("Status"), "110", "status", "status", "accounts", "get_status", "", "true", "center"),
             /*******************************************************************/
             array(gettext("Action"), "100", "", "", "", array(
                     "EDIT" => array("url" => "accounts/admin_edit/", "mode" => "single"),
@@ -545,24 +545,24 @@ 
 
     function build_account_list_for_customer() {
       $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
-      $currency_id=$account_info['currency_id'];
-      $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
+      $currency_id = $account_info['currency_id'];
+      $currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
       
 	  // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
 	  $grid_field_arr = json_encode(array(
-		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "","","","","false","center"),
-		array(gettext("Account"), "125", "number", "number", "accounts", "account_number_icon", "EDITABLE","true","left"),
-			array(gettext("First Name"), "95", "first_name", "", "", "","","true","center"),
-			array(gettext("Last Name"), "95", "last_name", "", "", "","","true","center"),
-			array(gettext("Company"), "85", "company_name", "", "", "","","true","center"),
-			array(gettext("Rate Group"), "85", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),
-			array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency_account","","true","right"),
-			array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency_account","","true","right"),
-			array(gettext("First Used"), "80", "first_used", "", "", "","","true","center"),
-			array(gettext("Expiry Date"), "80", "expiry", "", "", "","","true","center"),
-			array("CC", "45", "maxchannels", "", "", "","","true","center"),
-			array(gettext("Status"), "90", "status", "status", "accounts", "get_status","","true","center"),
-			array(gettext("Created Date"), "90", "creation", "", "", "","","true","center"),
+		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),
+		array(gettext("Account"), "125", "number", "number", "accounts", "account_number_icon", "EDITABLE", "true", "left"),
+			array(gettext("First Name"), "95", "first_name", "", "", "", "", "true", "center"),
+			array(gettext("Last Name"), "95", "last_name", "", "", "", "", "true", "center"),
+			array(gettext("Company"), "85", "company_name", "", "", "", "", "true", "center"),
+			array(gettext("Rate Group"), "85", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),
+			array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency_account", "", "true", "right"),
+			array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency_account", "", "true", "right"),
+			array(gettext("First Used"), "80", "first_used", "", "", "", "", "true", "center"),
+			array(gettext("Expiry Date"), "80", "expiry", "", "", "", "", "true", "center"),
+			array("CC", "45", "maxchannels", "", "", "", "", "true", "center"),
+			array(gettext("Status"), "90", "status", "status", "accounts", "get_status", "", "true", "center"),
+			array(gettext("Created Date"), "90", "creation", "", "", "", "", "true", "center"),
 			/************************************************************************/
 			array(gettext("Action"), "140", "", "", "", array("PAYMENT" => array("url" => "accounts/customer_payment_process_add/", "mode" => "single"),
 					"CALLERID" => array("url" => "accounts/customer_add_callerid/", "mode" => "popup"),
@@ -574,21 +574,21 @@ 
 
 	function build_account_list_for_reseller() {
 	$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
-	$currency_id=$account_info['currency_id'];
-	$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
+	$currency_id = $account_info['currency_id'];
+	$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
 	
         // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-        $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
-            array(gettext("Account"), "105", "number", "", "", "", "EDITABLE","true","center"),
-            array(gettext("First Name"), "120", "first_name", "", "", "","","true","center"),
-            array(gettext("Last Name"), "115", "last_name", "", "", "","","true","center"),
-            array(gettext("Company"), "130", "company_name", "", "", "","","true","center"),
-            array(gettext("Rate Group"), "95", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),
-            array(gettext("Account Type"), "107", "posttoexternal", "posttoexternal", "posttoexternal", "get_account_type","","true","center"),
-            array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency","","true","right"),
-            array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency","","true","right"),
-            array(gettext("Status"), "110", "status", "status", "accounts", "get_status","","true","center"),
-            array(gettext("Created Date"), "90", "creation", "", "", "","","true","center"),          
+        $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),
+            array(gettext("Account"), "105", "number", "", "", "", "EDITABLE", "true", "center"),
+            array(gettext("First Name"), "120", "first_name", "", "", "", "", "true", "center"),
+            array(gettext("Last Name"), "115", "last_name", "", "", "", "", "true", "center"),
+            array(gettext("Company"), "130", "company_name", "", "", "", "", "true", "center"),
+            array(gettext("Rate Group"), "95", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),
+            array(gettext("Account Type"), "107", "posttoexternal", "posttoexternal", "posttoexternal", "get_account_type", "", "true", "center"),
+            array(gettext("Balance")." ($currency)", "100", "balance", "balance", "balance", "convert_to_currency", "", "true", "right"),
+            array(gettext("Credit Limit")." ($currency)", "120", "credit_limit", "credit_limit", "credit_limit", "convert_to_currency", "", "true", "right"),
+            array(gettext("Status"), "110", "status", "status", "accounts", "get_status", "", "true", "center"),
+            array(gettext("Created Date"), "90", "creation", "", "", "", "", "true", "center"),          
             /**************************************************************/
             array(gettext("Action"), "139", "", "", "", array("PAYMENT" => array("url" => "accounts/customer_payment_process_add/", "mode" => "single"),
                     "CALLERID" => array("url" => "accounts/customer_add_callerid/", "mode" => 'popup'),
@@ -608,7 +608,7 @@ 
              // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
         $buttons_json = json_encode(array(
             array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"),
-            array(gettext("Mass Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_bulk_creation/", "popup","medium"),
+            array(gettext("Mass Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_bulk_creation/", "popup", "medium"),
             $provider,
             array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/accounts/customer_export_cdr_xls/", 'single'),
             array(gettext("Delete"), "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/accounts/customer_selected_delete/")
@@ -636,23 +636,23 @@ 
 
     function build_ip_list_for_customer($accountid, $accountype) {
         $grid_field_arr = json_encode(array(
-            array(gettext('Name'), "180", "name", "", "", "","","true","center"),
-            array(gettext('IP'), "180", "ip", "", "", "","","true","center"),
-            array(gettext('Prefix'), "180", "prefix", "", "", "","","true","center"),
-            array(gettext('Created Date'), "174", "created_date", "created_date", "created_date", "convert_GMT_to","","true","center"),
-            array(gettext('Modified Date'), "160", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
-            array(gettext('Action'), "150", "", "", "", array("DELETE" => array("url" => "accounts/" . $accountype . "_ipmap_action/delete/$accountid/$accountype/", "mode" => "single")))
+            array(gettext('Name'), "180", "name", "", "", "", "", "true", "center"),
+            array(gettext('IP'), "180", "ip", "", "", "", "", "true", "center"),
+            array(gettext('Prefix'), "180", "prefix", "", "", "", "", "true", "center"),
+            array(gettext('Created Date'), "174", "created_date", "created_date", "created_date", "convert_GMT_to", "", "true", "center"),
+            array(gettext('Modified Date'), "160", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),
+            array(gettext('Action'), "150", "", "", "", array("DELETE" => array("url" => "accounts/".$accountype."_ipmap_action/delete/$accountid/$accountype/", "mode" => "single")))
                 ));
         return $grid_field_arr;
     }
 
     function build_animap_list_for_customer($accountid, $accounttype) {
         $grid_field_arr = json_encode(array(
-            array(gettext("Caller ID"), "200", "number", "", "", "","","true","center"),
-            array(gettext("Status"), "180", "status", "status", "ani_map", "get_status_new","","true","center"),
-            array(gettext("Created Date"), "200", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),
-            array(gettext("Modified Date"), "170", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),
-            array(gettext("Action"), "200", "", "", "", array("DELETE" => array("url" => "accounts/" . $accounttype . "_animap_action/delete/$accountid/", "mode" => "single")))
+            array(gettext("Caller ID"), "200", "number", "", "", "", "", "true", "center"),
+            array(gettext("Status"), "180", "status", "status", "ani_map", "get_status_new", "", "true", "center"),
+            array(gettext("Created Date"), "200", "creation_date", "creation_date", "creation_date", "convert_GMT_to", "", "true", "center"),
+            array(gettext("Modified Date"), "170", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),
+            array(gettext("Action"), "200", "", "", "", array("DELETE" => array("url" => "accounts/".$accounttype."_animap_action/delete/$accountid/", "mode" => "single")))
                 ));
         return $grid_field_arr;
     }
@@ -668,13 +668,13 @@ 
 
     function set_block_pattern_action_buttons($id) {
         $ret_url = '';
-        $ret_url .= '<a href="/did/delete/' . $id . '/" class="icon delete_image" title="Delete" onClick="return get_alert_msg();">&nbsp;</a>';
+        $ret_url .= '<a href="/did/delete/'.$id.'/" class="icon delete_image" title="Delete" onClick="return get_alert_msg();">&nbsp;</a>';
         return $ret_url;
     }
 
     function build_animap_list() {
         $grid_field_arr = json_encode(array(array("Caller ID", "180", "number", "", "", ""),
-            array(gettext("status"),"180","status","status","animap","get_status"),    
+            array(gettext("status"), "180", "status", "status", "animap", "get_status"),    
             array(gettext("Action"), "130", "", "", "",
                 array(
                     "EDIT_ANIMAP" => array("url" => "accounts/callingcards_animap_list_edit/", "mode" => "single"),

Braces +7 added lines, -7 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if (!defined('BASEPATH')) {
 	exit('No direct script access allowed');
+}
 
 class Accounts_form {
 	function __construct($library_name = '') {
@@ -279,8 +280,7 @@ 
 			array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, 'reseller_id' => $loginid), 'multi'),
 		);
 
-}
-else{
+} else{
 			$form[gettext('Billing Information')] = array(
 			array(gettext('Rate Group'), 'pricelist_id', 'SELECT', '', array("name" => "pricelist_id", 'rules' => 'required'), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")),
             
@@ -442,8 +442,7 @@ 
 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
 		);
         
-		}
-		else
+		} else
 		{
 		
 		$form['forms'] = array("", array('id' => "account_search"));
@@ -603,8 +602,9 @@ 
     function build_grid_buttons_customer() {
         $logintype = $this->CI->session->userdata('userlevel_logintype');
         $provider = null;
-        if ($logintype != 1)
-            $provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
+        if ($logintype != 1) {
+                    $provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
+        }
              // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
         $buttons_json = json_encode(array(
             array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"),