iNextrix / ASTPP

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

Spacing +13 added lines, -13 removed lines

@@ -50,16 +50,16 @@ 
           <div class="w-section inverse no-padding margin-t-20">                       
              <div class="w-box dark sign-in-wr box_shadow margin-b-10">
 		    	<div class="col-md-12 no-padding">
-			  <? if($this->session->userdata('userlevel_logintype') != '0'){?>
-				<a class="col-md-9" href="<?php echo base_url();?>">
-						<img id="logo" alt="dashboard" src="<?php echo base_url();?>assets/images/logo.png">
-			  <? } else{?> 
-						<a class="col-md-9" href="<?php echo base_url();?>">
-						<img id="logo" alt="user_logo" src="<?php echo base_url();?>assets/images/logo.png">
+			  <? if ($this->session->userdata('userlevel_logintype') != '0') {?>
+				<a class="col-md-9" href="<?php echo base_url(); ?>">
+						<img id="logo" alt="dashboard" src="<?php echo base_url(); ?>assets/images/logo.png">
+			  <? } else {?> 
+						<a class="col-md-9" href="<?php echo base_url(); ?>">
+						<img id="logo" alt="user_logo" src="<?php echo base_url(); ?>assets/images/logo.png">
 			<? }?>
 				</a>
 
-			<div class="col-md-3"><a href="<?php echo base_url();?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12 margin-t-10"></a></div>
+			<div class="col-md-3"><a href="<?php echo base_url(); ?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12 margin-t-10"></a></div>
 
 
 </div>
@@ -68,7 +68,7 @@ 
 
 <form class="form-light col-md-12 no-padding" action="<?php echo base_url(); ?>confirmpass" method="post" accept-charset="utf-8" id="customer_form" name="customer_form">
 
-<input type="hidden" name="email" value=<?php echo $email;?>>
+<input type="hidden" name="email" value=<?php echo $email; ?>>
 
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
 <h3 style="color: #173D77 !important; padding: 0 0 10px;border-bottom: 1px solid #ddd;">Enter Your Password</h3>
@@ -77,16 +77,16 @@ 
 <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>
 
@@ -94,7 +94,7 @@ 
 <button name="action" type="submit" value="Submit" class="btn btn-line-parrot col-md-12" onclick="return check_function();" >Submit</button>
 
 
-<!--<div style="color:black" >Already have an account <a style="color:blue" href="<?=base_url();?>"> Log in </a> </div>-->
+<!--<div style="color:black" >Already have an account <a style="color:blue" href="<?=base_url(); ?>"> Log in </a> </div>-->
 
 </div></form>			     
 

Braces +20 added lines, -4 removed lines

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

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

Indentation +4 added lines, -4 removed lines

@@ -40,12 +40,12 @@
                         <?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{
-                         echo "&nbsp;";
-                    } 
+						 echo "&nbsp;";
+					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
-			    if ($astpp_err_msg) {
+				if ($astpp_err_msg) {
 				echo $astpp_err_msg;
-			    }
+				}
 			?>
                     </span></div> <br/>
                     <br/><br/><br/><br/>

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
     <link href="<?= base_url() ?>assets/css/global-style.css" rel="stylesheet" type="text/css">
     
      <!-- IE -->
-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.js"></script>
-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.src.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.src.js"></script>
     <noscript>
 	 <div id="noscript-warning">
 	  ASTPP work best with JavaScript enabled
@@ -37,9 +37,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');
@@ -61,11 +61,11 @@ 
                             </h2>
                            
                            </div> 
-                            <div class="margin-t-15 padding-r-32 padding-l-32" style="color: #232222; text-align:left;"><?php echo "We sent update password link. <br>Please check your Email!!<br>";?></div>
+                            <div class="margin-t-15 padding-r-32 padding-l-32" style="color: #232222; text-align:left;"><?php echo "We sent update password link. <br>Please check your Email!!<br>"; ?></div>
 
                             <div class="margin-b-20 padding-r-32 padding-l-32">
                             <div class="col-md-12 no-padding">
-							<a href="<?php echo base_url();?>">
+							<a href="<?php echo base_url(); ?>">
 								<input type="submit" value="Go to Login Page" name="Login" style="border-radius: 3px" class="btn btn-success col-md-12 margin-t-10">
 							</a>
 			  				</div>

Braces +1 added lines, -1 removed lines

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

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

Indentation +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
                         <?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{

-                         echo "&nbsp;";

+						 echo "&nbsp;";

 						} ?>

                     </span>

                 </div> 

Spacing +12 added lines, -12 removed lines

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

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

 					<span class="login_error">

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

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

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

-						<?php }else{

+						<?php } else {

                          echo "&nbsp;";

 						} ?>

                     </span>

@@ -113,17 +113,17 @@ 
 								<div class="">	

 											<!-- Header Start-->

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

-													  <? 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;" id="logo" alt="dashboard" src="<?php echo base_url();?>assets/images/logo.png">

-														<? } else{?> 

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

-																<img style="height: 44px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url();?>assets/images/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;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>assets/images/logo.png">

+														<? } else {?> 

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

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

 														<? }?>

 															</a>

 												

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

-													<a href="<?php echo base_url();?>">

+													<a href="<?php echo base_url(); ?>">

 														<input type="submit" value="Login" name="Login" style="border-radius: 2px" class="btn btn-success col-md-12 margin-t-10">

 													</a>

 									  				</div>

@@ -196,7 +196,7 @@ 
 				<div class='col-md-9'>

 				<?

 				$js = 'id="country_id"';

-				$country = form_dropdown(array('id'=>'country_id','name'=>'country_id'), $this->db_model->build_dropdown("id,country", "countrycode", "", ""), '', 'id="country_id"');

+				$country = form_dropdown(array('id'=>'country_id', 'name'=>'country_id'), $this->db_model->build_dropdown("id,country", "countrycode", "", ""), '', 'id="country_id"');

 				echo $country;

 				?>

 				</div>

@@ -210,7 +210,7 @@ 
 				<label for="Timezone" class="col-md-3 no-padding add_settings" style="text-align: left;">Timezone</label>

 				<div class='col-md-9'>

 				<?

-				$timezone = form_dropdown(array('id'=>'timezone_id','name'=>'timezone_id'), $this->db_model->build_dropdown("id,gmtzone", "timezone", "", ""), '', 'id="timezone_id"');

+				$timezone = form_dropdown(array('id'=>'timezone_id', 'name'=>'timezone_id'), $this->db_model->build_dropdown("id,gmtzone", "timezone", "", ""), '', 'id="timezone_id"');

 				echo $timezone;

 				?>

 				</div>

@@ -219,7 +219,7 @@ 
 				<label for="Currency" class="col-md-3  no-padding add_settings" style="text-align: left;">Currency</label>

 				<div class='col-md-9'>

 				<?

-				$currency = form_dropdown(array('id'=>'currency_id','name'=>'currency_id'), $this->db_model->build_dropdown("id,currencyname", "currency", "", ""), '', 'id="currency_id"');

+				$currency = form_dropdown(array('id'=>'currency_id', 'name'=>'currency_id'), $this->db_model->build_dropdown("id,currencyname", "currency", "", ""), '', 'id="currency_id"');

 				echo $currency;

 				?>

 				</div>

Braces +51 added lines, -10 removed lines

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

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

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

-						<?php }else{

+						<?php } else{

                          echo "&nbsp;";

 						} ?>

                     </span>

@@ -136,14 +136,24 @@ 
 	

 		<div class="margin-t-15 padding-r-32 padding-l-32">

 

-		<input type="hidden" name="key_unique"  value="<?php if (isset($key_unique)) echo $key_unique; else ''; ?>"

+		<input type="hidden" name="key_unique"  value="<?php if (isset($key_unique)) {
+	echo $key_unique;
+} else {
+	'';
+}
+?>"

 		id="key_unique" size="15" maxlength="250" class="col-md-5 form-control"/>

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

 

 			<li class="col-md-6 no-padding">

 				<label class="col-md-3 no-padding" style="text-align: left;">First Name *</label>

 				<div class='col-md-9'>

-				<input type="text" name="first_name" value="<?php if (isset($value['first_name'])) echo $value['first_name']; else ''; ?>" id="first_name" size="15" maxlength="40" class="form-control"/>

+				<input type="text" name="first_name" value="<?php if (isset($value['first_name'])) {
+	echo $value['first_name'];
+} else {
+	'';
+}
+?>" id="first_name" size="15" maxlength="40" class="form-control"/>

 				<div style="width: 97.67%; float: left;text-align: left;">

 					<span id="f_name" style="color:red;"> </span>

 				</div>

@@ -152,7 +162,12 @@ 
 			<li class="col-md-6  no-padding">

 				<label class="col-md-3 no-padding" style="text-align: left;">Last Name</label>

 				<div class='col-md-9'>

-				<input type="text" name="last_name" id="last_name" value="<?php if (isset($value['last_name'])) echo $value['last_name']; else ''; ?>"  size="15" maxlength="40" class="form-control"/>

+				<input type="text" name="last_name" id="last_name" value="<?php if (isset($value['last_name'])) {
+	echo $value['last_name'];
+} else {
+	'';
+}
+?>"  size="15" maxlength="40" class="form-control"/>

 				<div style="width: 97.67%; float: left;text-align: left;">

 					<span id="l_name" style="color:red;"> </span>

 				</div>

@@ -166,13 +181,23 @@ 
 			<li class="col-md-6 no-padding">

 				<label class="col-md-3 no-padding" style="text-align: left;">Company</label>

 				<div class='col-md-9'>

-				<input type="text" id="company_name" name="company_name" value="<?php if (isset($value['company_name'])) echo $value['company_name']; else ''; ?>" maxlength="40" size="15" class="form-control"/>

+				<input type="text" id="company_name" name="company_name" value="<?php if (isset($value['company_name'])) {
+	echo $value['company_name'];
+} else {
+	'';
+}
+?>" maxlength="40" size="15" class="form-control"/>

 				</div>

 			</li>

 			<li class="col-md-6 no-padding">

 				<label class="col-md-3 no-padding" style="text-align: left;">Telephone</label>

 				<div class='col-md-9'>

-				<input type="text" id="telephone_1" name="telephone_1" value="<?php if (isset($value['telephone_1'])) echo $value['telephone_1']; else ''; ?>" size="15" maxlength="20" class="form-control"/>

+				<input type="text" id="telephone_1" name="telephone_1" value="<?php if (isset($value['telephone_1'])) {
+	echo $value['telephone_1'];
+} else {
+	'';
+}
+?>" size="15" maxlength="20" class="form-control"/>

 				<div style="width: 100%; float: left;text-align: left;">

 					<span id="phonenumber" style="color:red;"> </span>

 				</div>

@@ -186,9 +211,17 @@ 
 			<li class="col-md-6 no-padding">	

 				<label class="col-md-3 no-padding" style="text-align: left;">Email *</label>

 				<div class='col-md-9'>

-				<input type="text" name="email" id="email" value="<?php if (isset($value['email'])) echo $value['email']; else ''; ?>" size="50" maxlength="80" class="form-control"/>

+				<input type="text" name="email" id="email" value="<?php if (isset($value['email'])) {
+	echo $value['email'];
+} else {
+	'';
+}
+?>" size="50" maxlength="80" class="form-control"/>

 				<span id="email_error" style="color:red;"> 

-				<div style="width: 100%; float: left;text-align: left;"><?php if (isset($error['email'])) echo $error['email']; ?></div></span>

+				<div style="width: 100%; float: left;text-align: left;"><?php if (isset($error['email'])) {
+	echo $error['email'];
+}
+?></div></span>

 				</div>

 			</li>

 			<li class="col-md-6  no-padding">

@@ -229,7 +262,12 @@ 
 		  	<li class="col-md-6  no-padding">

 				<label class="col-md-3  no-padding" style="text-align: left;">Address</label>

 				<div class='col-md-9'>

-				<textarea id="address_1" name="address_1" value="" size="15" maxlength="200" class="form-control"> <?php if (isset($value['address_1'])) echo $value['address_1']; else ''; ?> </textarea>

+				<textarea id="address_1" name="address_1" value="" size="15" maxlength="200" class="form-control"> <?php if (isset($value['address_1'])) {
+	echo $value['address_1'];
+} else {
+	'';
+}
+?> </textarea>

 				</div>

 			</li>

 			<li class="col-md-6 no-padding">

@@ -243,7 +281,10 @@ 
 				<div class="col-md-3 no-padding"></div>

 				<div class='col-md-9 margin-t-10'>															

 				<input class='form-control posttoexternal' id="userCaptcha" name="userCaptcha" type="text" autocomplete="off" placeholder="Enter above text"/>

-				<div style="width: 100%; float: left;text-align: left;"><?php if (isset($error['userCaptcha'])) echo $error['userCaptcha']; ?></div>

+				<div style="width: 100%; float: left;text-align: left;"><?php if (isset($error['userCaptcha'])) {
+	echo $error['userCaptcha'];
+}
+?></div>

 				</div>

 			</li>

 		</div>

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

Indentation +4 added lines, -4 removed lines

@@ -38,12 +38,12 @@
                         <?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{

-                         echo "&nbsp;";

-                    } 

+						 echo "&nbsp;";

+					} 

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

-			    if ($astpp_err_msg) {

+				if ($astpp_err_msg) {

 				echo $astpp_err_msg;

-			    }

+				}

 			?>

                     </span></div> <br/>

                     <br/>

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
     <link href="<?= base_url() ?>assets/css/global-style.css" rel="stylesheet" type="text/css">

     

      <!-- IE -->

-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.js"></script>

-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.src.js"></script>

+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.js"></script>

+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.src.js"></script>

     <noscript>

 	 <div id="noscript-warning">

 	  ASTPP work best with JavaScript enabled

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

 

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

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

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

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

-                    <?php }else{

+                    <?php } else {

                          echo "&nbsp;";

                     } 

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

@@ -62,10 +62,10 @@ 
                            

                            </div> 

                            <div class="margin-t-15 padding-r-32 padding-l-32"><h2 class="no-padding" style="color:#79c57b;text-align:left;"><i class="fa fa-check-circle"></i> Successful!</h2></div>

-                            <div class="margin-t-15 padding-r-32 padding-l-32" style="color: #232222; text-align:left;"><?php echo "Your account has been created successfully!!! <br> Please check your Email!!!";?></div>

+                            <div class="margin-t-15 padding-r-32 padding-l-32" style="color: #232222; text-align:left;"><?php echo "Your account has been created successfully!!! <br> Please check your Email!!!"; ?></div>

                             <div class="margin-b-20 padding-r-32 padding-l-32">

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

-													<a href="<?php echo base_url();?>">

+													<a href="<?php echo base_url(); ?>">

 														<input type="submit" value="Go to Login Page" name="Login" style="border-radius: 3px" class="btn btn-success col-md-12 margin-t-10">

 													</a>

 									  				</div>

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,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');

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

Indentation +5 added lines, -5 removed lines

@@ -38,12 +38,12 @@ 
                         <?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{
-                         echo "&nbsp;";
-                    } 
+						 echo "&nbsp;";
+					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
-			    if ($astpp_err_msg) {
+				if ($astpp_err_msg) {
 				echo $astpp_err_msg;
-			    }
+				}
 			?>
                     </span></div> <br/>
                     <br/>
@@ -83,7 +83,7 @@ 
 	 {
 	echo "<div class=\"col-md-12 margin-t-10 margin-b-20 padding-r-32 padding-l-32\" style=\"color: #232222;\">Link is Expire Please Try Again</div><br>";
 echo "";
-       }
+	   }
 ?>
 	
                         

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
     <link href="<?= base_url() ?>assets/css/global-style.css" rel="stylesheet" type="text/css">
     
      <!-- IE -->
-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.js"></script>
-    <script type="text/javascript" src="<?php echo base_url();?>assets/js/respond.src.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/respond.src.js"></script>
     <noscript>
 	 <div id="noscript-warning">
 	  ASTPP work best with JavaScript enabled
@@ -35,9 +35,9 @@ 
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
                          echo "&nbsp;";
                     } 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -60,7 +60,7 @@ 
                            	<img alt="login" src="<?= base_url() ?>assets/images/logo.png">
                            </div>
                            <div class="col-md-3">
-							   <a class="btn btn-success col-md-12 margin-t-10" href="<?php echo base_url();?>">Login</a>
+							   <a class="btn btn-success col-md-12 margin-t-10" href="<?php echo base_url(); ?>">Login</a>
 
 						   </div>
                            
@@ -79,7 +79,7 @@ 
 	echo "<div <div class=\"col-md-12 margin-t-10 margin-b-10 padding-r-32 padding-l-32\" style=\"color: #232222;\">Password : ".$this->common->decode($user_data['password'])."</div>";
 	echo "<br><br>";
 	  
-	 }else
+	 } else
 	 {
 	echo "<div class=\"col-md-12 margin-t-10 margin-b-20 padding-r-32 padding-l-32\" style=\"color: #232222;\">Link is Expire Please Try Again</div><br>";
 echo "";

Braces +2 added lines, -2 removed lines

@@ -37,7 +37,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');
@@ -79,7 +79,7 @@ 
 	echo "<div <div class=\"col-md-12 margin-t-10 margin-b-10 padding-r-32 padding-l-32\" style=\"color: #232222;\">Password : ".$this->common->decode($user_data['password'])."</div>";
 	echo "<br><br>";
 	  
-	 }else
+	 } else
 	 {
 	echo "<div class=\"col-md-12 margin-t-10 margin-b-20 padding-r-32 padding-l-32\" style=\"color: #232222;\">Link is Expire Please Try Again</div><br>";
 echo "";

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

Spacing +8 added lines, -8 removed lines

@@ -52,17 +52,17 @@ 
 		    	<div class="col-md-12 no-padding">
 
 
-	      <? if($this->session->userdata('userlevel_logintype') != '0'){?>
-			<a class="col-md-9" href="<?php echo base_url();?>">
-                	<img id="logo" alt="dashboard" src="<?php echo base_url();?>assets/images/logo.png">
-	      <? } else{?> 
-                	<a class="col-md-9" href="<?php echo base_url();?>">
-                	<img id="logo" alt="user_logo" src="<?php echo base_url();?>assets/images/logo.png">
+	      <? if ($this->session->userdata('userlevel_logintype') != '0') {?>
+			<a class="col-md-9" href="<?php echo base_url(); ?>">
+                	<img id="logo" alt="dashboard" src="<?php echo base_url(); ?>assets/images/logo.png">
+	      <? } else {?> 
+                	<a class="col-md-9" href="<?php echo base_url(); ?>">
+                	<img id="logo" alt="user_logo" src="<?php echo base_url(); ?>assets/images/logo.png">
 		<? }?>
                 </a>
       
 	
-		<div class="col-md-3"><a href="<?php echo base_url();?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12"></a></div>
+		<div class="col-md-3"><a href="<?php echo base_url(); ?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12"></a></div>
 	
 </div>
 
@@ -71,7 +71,7 @@ 
 
 <form class="form-light col-md-12 no-padding" action="<?php echo base_url(); ?>signup/successpassword/" method="post" accept-charset="utf-8" id="customer_form" name="customer_form">
 
-<input type="hidden" name="email" value=<?php echo $email;?>>
+<input type="hidden" name="email" value=<?php echo $email; ?>>
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
 <h3 style="color: #37A137 !important; padding: 0 0 10px;"><i class="fa fa-check-circle" style="color:#37A137;"></i> Your password successfully changed</h3>
 </div> 

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

Spacing +8 added lines, -8 removed lines

@@ -51,17 +51,17 @@ 
           <div class="w-section inverse no-padding margin-t-20">                       
              <div class="w-box dark sign-in-wr box_shadow margin-b-10">
 		    	<div class="col-md-12 no-padding">
-					  <? if($this->session->userdata('userlevel_logintype') != '0'){?>
-						<a class="col-md-9" href="<?php echo base_url();?>">
-								<img id="logo" alt="dashboard" src="<?php echo base_url();?>assets/images/logo.png">
-					  <? } else{?> 
-								<a class="col-md-9" href="<?php echo base_url();?>">
-								<img id="logo" alt="user_logo" src="<?php echo base_url();?>assets/images/logo.png">
+					  <? if ($this->session->userdata('userlevel_logintype') != '0') {?>
+						<a class="col-md-9" href="<?php echo base_url(); ?>">
+								<img id="logo" alt="dashboard" src="<?php echo base_url(); ?>assets/images/logo.png">
+					  <? } else {?> 
+								<a class="col-md-9" href="<?php echo base_url(); ?>">
+								<img id="logo" alt="user_logo" src="<?php echo base_url(); ?>assets/images/logo.png">
 					<? }?>
 							</a>
 
 			
-					<div class="col-md-3"><a href="<?php echo base_url();?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12 margin-t-10"></a></div>
+					<div class="col-md-3"><a href="<?php echo base_url(); ?>"><input type="submit" value="Login" name="Login" class="btn btn-success col-md-12 margin-t-10"></a></div>
 		
 		</div>
 	
@@ -70,7 +70,7 @@ 
 <br>
 
 <form class="form-light col-md-12 no-padding" action="<?php echo base_url(); ?>signup/successpassword/" method="post" accept-charset="utf-8" id="customer_form" name="customer_form">
-<input type="hidden" name="email" value=<?php echo $email;?>>
+<input type="hidden" name="email" value=<?php echo $email; ?>>
 <div class="col-md-12 margin-t-20 margin-b-10 padding-r-32 padding-l-32" style="color:#232222;">
 <br/>	Sorry, we cannot process for singup at this time.<br>Please contact administrator for more information<br><br>
 </div>

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

Indentation +20 added lines, -20 removed lines

@@ -24,15 +24,15 @@ 
 
 class Signup_model extends CI_Model 
 {
-    function Signup_model()
+	function Signup_model()
 	{
-        parent::__construct();
+		parent::__construct();
 	
-        $this->load->model('Astpp_common');
-        $this->load->helper('form');
-        $this->load->model('common_model');
+		$this->load->model('Astpp_common');
+		$this->load->helper('form');
+		$this->load->model('common_model');
 	$this->load->library('session');
-    	}
+		}
 
 	function get_rate()
 	{
@@ -46,8 +46,8 @@ 
 		return $query->row();
 
 	}
-	    function add_user($data)
-	    {	
+		function add_user($data)
+		{	
 		$data['reseller_id'] = $data['key_unique'];	
 		unset($data['agreeCheck']);
 		unset($data['key_unique']);
@@ -55,31 +55,31 @@ 
 		$data['expiry'] = date('Y-m-d H:i:s', strtotime('+10 years'));
 		$this->db->insert("accounts",$data);
 		return   $this->db->insert_id();
-	    }
+		}
 
 	function check_user($accno,$email,$balance)
 	{
 		$info = array("number"=>$accno,"email"=>$email,"status"=>1);
-                        $this->db->where($info);
-                        $this->db->select('*');
+						$this->db->where($info);
+						$this->db->select('*');
 		$acc_res=$this->db->get('accounts');
 		if($acc_res->num_rows() > 0)	
 		{         
-                        $acc_res=$acc_res->result_array();
-                        $acc_res=$acc_res[0];
-                        $this->db->where('pricelist_id',$acc_res['pricelist_id']);
-                        $this->db->select("*");
-                        $charge_res=$this->db->get('charges');
+						$acc_res=$acc_res->result_array();
+						$acc_res=$acc_res[0];
+						$this->db->where('pricelist_id',$acc_res['pricelist_id']);
+						$this->db->select("*");
+						$charge_res=$this->db->get('charges');
                         
 			if($charge_res->num_rows() > 0){
 			$charge_res=$charge_res->result_array();
-                        $charge_res=$charge_res[0];
-                        $charge_acc_arr=array(
+						$charge_res=$charge_res[0];
+						$charge_acc_arr=array(
 						"charge_id"=>$charge_res['id'],
 						"accountid"=>$acc_res['id'],
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
-					     );
+						 );
 			}else{
 			$charge_res=$charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
@@ -87,7 +87,7 @@ 
 						"accountid"=>$acc_res['id'],
 						"assign_date"=>date('Y-m-d H:i:s'));
 			}
-                        $result=$this->db->insert("charge_to_account",$charge_acc_arr);
+						$result=$this->db->insert("charge_to_account",$charge_acc_arr);
 			$update = array("status" => 0,"balance" => $balance );
 			$this->db->where($info);
 			$result = $this->db->update('accounts', $update);

Spacing +21 added lines, -21 removed lines

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

Braces +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
 					     );
-			}else{
+			} else{
 			$charge_res=$charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
 			$charge_acc_arr = array("charge_id"=>'id',
@@ -93,7 +93,7 @@ 
 			$result = $this->db->update('accounts', $update);
 			$sip_device_update = array('username'=>$accno,"status"=>1);
 			return 1;
-		}else{
+		} else{
 			return 0;
 		}
 	}

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

Indentation +1684 added lines, -1684 removed lines

@@ -24,30 +24,30 @@ 
 
 class User extends MX_Controller {
 
-    function User() {
-        parent::__construct();
-        $this->load->helper('template_inheritance');
-        $this->load->helper('form');
-        $this->load->library("astpp/form");
-        $this->load->library("user_form");
-        $this->load->model('Auth_model');
-        $this->load->model('Astpp_common');
-        $this->load->model('user_model');
-    }
-
-    function index() {
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . 'login/login');
-        $data['page_title'] = 'Dashboard';
-        $this->load->view('view_user_dashboard', $data);
-    }
-
-    function user_dashboard_recent_payments() {
-        $result=$this->user_model->user_dashboard_recent_recharge_info();
+	function User() {
+		parent::__construct();
+		$this->load->helper('template_inheritance');
+		$this->load->helper('form');
+		$this->load->library("astpp/form");
+		$this->load->library("user_form");
+		$this->load->model('Auth_model');
+		$this->load->model('Astpp_common');
+		$this->load->model('user_model');
+	}
+
+	function index() {
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . 'login/login');
+		$data['page_title'] = 'Dashboard';
+		$this->load->view('view_user_dashboard', $data);
+	}
+
+	function user_dashboard_recent_payments() {
+		$result=$this->user_model->user_dashboard_recent_recharge_info();
 	$gmtoffset=$this->common->get_timezone_offset();
-        $i=0;
-        $json_data=array();
-        if($result->num_rows() > 0)
+		$i=0;
+		$json_data=array();
+		if($result->num_rows() > 0)
 	{
 		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
 		 $json_data[0]['accountid']='Accounts';
@@ -55,63 +55,63 @@ 
 		 $json_data[0]['payment_date']='Date';
 		 $json_data[0]['notes']='Notes';
 		 foreach($result->result_array() as $key=>$data){
-		      $current_timestamp=strtotime($data['payment_date']);
-		      $modified_date=$current_timestamp+$gmtoffset;
-          	      $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-		      $json_data[$i]['accountid']=$data['accountid'];
-		      $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
-		      $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
-		       $json_data[$i]['notes']=$data['notes'];
-		      $i++;
-          	}
-          }
-         echo json_encode($json_data); 
-    }
-
-    function user_dashboard_package_data() {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $json_data = array();
-        $this->db->where('pricelist_id', $accountinfo['pricelist_id']);
-        $this->db->select('*');
-        $result = $this->db->get('packages', 10);
-        $i = 1;
-        if ($result->num_rows() > 0) {
-            $json_data[0]['package_name'] = 'Package Name';
-            $json_data[0]['includedseconds'] = 'Included Seconds';
-            $json_data[0]['status'] = 'Status';
-            $result = $result->result_array();
-            foreach ($result as $data) {
-                $json_data[$i]['package_name'] = $data['package_name'];
-                $json_data[$i]['includedseconds'] = $data['includedseconds'];
-                $json_data[$i]['status'] = $this->common->get_status('export', '', $data['status']);
-                $i++;
-            }
-        }
-        echo json_encode($json_data);
-    }   
-    function user_dashboard_invoices_data() {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
-        $this->db->where('accountid', $accountinfo['id']);
-        $this->db->where('confirm', 1);
-        $this->db->select('*');
-        $this->db->order_by('invoice_date', 'desc');
-        $result = $this->db->get('invoices', 10);
-        $json_data = array();
-        $gmtoffset = $this->common->get_timezone_offset();
-        if ($result->num_rows() > 0) {
-            $result = $result->result_array();
-            $json_data[0]['type'] = 'Invoice Type';
-            $json_data[0]['id'] = 'Number';
-            $json_data[0]['from_date'] = 'From Date';
-            $json_data[0]['invoice_date'] = 'Generated Date';
-            $json_data[0]['amount'] = 'Amount ('.$currency.')';
-            $json_data[0]['inv_type'] = 'Recharge Type';
-            $i = 1;
-            foreach ($result as $key => $data) {
-	        $invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$data['id']));
-
-	        $invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$data['id']));
+			  $current_timestamp=strtotime($data['payment_date']);
+			  $modified_date=$current_timestamp+$gmtoffset;
+		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
+			  $json_data[$i]['accountid']=$data['accountid'];
+			  $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
+			  $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
+			   $json_data[$i]['notes']=$data['notes'];
+			  $i++;
+		  	}
+		  }
+		 echo json_encode($json_data); 
+	}
+
+	function user_dashboard_package_data() {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$json_data = array();
+		$this->db->where('pricelist_id', $accountinfo['pricelist_id']);
+		$this->db->select('*');
+		$result = $this->db->get('packages', 10);
+		$i = 1;
+		if ($result->num_rows() > 0) {
+			$json_data[0]['package_name'] = 'Package Name';
+			$json_data[0]['includedseconds'] = 'Included Seconds';
+			$json_data[0]['status'] = 'Status';
+			$result = $result->result_array();
+			foreach ($result as $data) {
+				$json_data[$i]['package_name'] = $data['package_name'];
+				$json_data[$i]['includedseconds'] = $data['includedseconds'];
+				$json_data[$i]['status'] = $this->common->get_status('export', '', $data['status']);
+				$i++;
+			}
+		}
+		echo json_encode($json_data);
+	}   
+	function user_dashboard_invoices_data() {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
+		$this->db->where('accountid', $accountinfo['id']);
+		$this->db->where('confirm', 1);
+		$this->db->select('*');
+		$this->db->order_by('invoice_date', 'desc');
+		$result = $this->db->get('invoices', 10);
+		$json_data = array();
+		$gmtoffset = $this->common->get_timezone_offset();
+		if ($result->num_rows() > 0) {
+			$result = $result->result_array();
+			$json_data[0]['type'] = 'Invoice Type';
+			$json_data[0]['id'] = 'Number';
+			$json_data[0]['from_date'] = 'From Date';
+			$json_data[0]['invoice_date'] = 'Generated Date';
+			$json_data[0]['amount'] = 'Amount ('.$currency.')';
+			$json_data[0]['inv_type'] = 'Recharge Type';
+			$i = 1;
+			foreach ($result as $key => $data) {
+			$invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$data['id']));
+
+			$invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$data['id']));
 			$invoice_num=$invoice_prefix.$invoiceid;
 			$inv_type=$this->common->get_invoice_total('item_type', '', $data['id']);
 			if($inv_type == ''){
@@ -131,12 +131,12 @@ 
 			$json_data[$i]['amount'] = $inv_debit;
 			$json_data[$i]['inv_type'] = $inv_type;
 			$i++;
-            }
-        }
-        echo json_encode($json_data);
-    }
+			}
+		}
+		echo json_encode($json_data);
+	}
     
-    function user_dashboard_subscription_data(){
+	function user_dashboard_subscription_data(){
 		$accountinfo=$this->session->userdata('accountinfo');
 		$this->db->where('accountid',$accountinfo['id']);
 		$this->db->select('*');
@@ -187,487 +187,487 @@ 
 		}
 		$i++;
 		}
-      }
-      echo json_encode($json_data); 
-    }
+	  }
+	  echo json_encode($json_data); 
+	}
     
-    function user_edit_account() {
-        if ($add_array['id'] != '') {
-            $data['form'] = $this->form->build_form($this->accounts->accounts_form->get_user_form_fields($add_array['id']), $add_array);
-            $data['page_title'] = 'Edit ' . $entity_name;
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
-                $add_array['password'] = $this->common->encode($add_array['password']);
-                unset($add_array['number']);
-                $this->accounts->accounts_model->edit_account($add_array, $add_array['id']);
-                $accountinfo = $this->session->userdata('accountinfo');
-                if ($add_array['id'] == $accountinfo['id']) {
-                    $this->session->set_userdata('accountinfo',(array)$this->db->get_where('accounts', array('id' => $add_array['id']))->first_row());
-                }
-                $this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name) . ' updated successfully!');
-                redirect(base_url() . 'user/user/');
-            }
-            $this->load->view('view_user_details', $data);
-        } else {
-            $data['page_title'] = 'Edit ' . $entity_name;
-            $where = array('id' => $account_data["id"]);
-            $account = $this->db_model->getSelect("*", "accounts", $where);
-            $data["account_data"] = $account->result_array();
-
-            foreach ($account->result_array() as $key => $value) {
-                $editable_data = $value;
-            }
-            $editable_data['password'] = $this->common->decode($editable_data['password']);
-            $data['form'] = $this->form->build_form($this->accounts->accounts_form->get_user_form_fields($editable_data['id']), $editable_data);
-            $this->load->view('view_user_details', $data);
-        }
-    }
+	function user_edit_account() {
+		if ($add_array['id'] != '') {
+			$data['form'] = $this->form->build_form($this->accounts->accounts_form->get_user_form_fields($add_array['id']), $add_array);
+			$data['page_title'] = 'Edit ' . $entity_name;
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
+				$add_array['password'] = $this->common->encode($add_array['password']);
+				unset($add_array['number']);
+				$this->accounts->accounts_model->edit_account($add_array, $add_array['id']);
+				$accountinfo = $this->session->userdata('accountinfo');
+				if ($add_array['id'] == $accountinfo['id']) {
+					$this->session->set_userdata('accountinfo',(array)$this->db->get_where('accounts', array('id' => $add_array['id']))->first_row());
+				}
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name) . ' updated successfully!');
+				redirect(base_url() . 'user/user/');
+			}
+			$this->load->view('view_user_details', $data);
+		} else {
+			$data['page_title'] = 'Edit ' . $entity_name;
+			$where = array('id' => $account_data["id"]);
+			$account = $this->db_model->getSelect("*", "accounts", $where);
+			$data["account_data"] = $account->result_array();
+
+			foreach ($account->result_array() as $key => $value) {
+				$editable_data = $value;
+			}
+			$editable_data['password'] = $this->common->decode($editable_data['password']);
+			$data['form'] = $this->form->build_form($this->accounts->accounts_form->get_user_form_fields($editable_data['id']), $editable_data);
+			$this->load->view('view_user_details', $data);
+		}
+	}
    
-    function user_did_edit($edit_id = '') {
-        $data['page_title'] = 'Edit DIDs';
-        $account_data = $this->session->userdata("accountinfo");
-        $this->db->where('id',$edit_id);
-        $this->db->select('id,call_type,extensions,number');
-        $did_info=(array)$this->db->get('dids')->first_row();
-        $did_info['free_didlist']=$did_info['id'];
-        $data['form'] = $this->form->build_form($this->user_form->build_user_did_form(),$did_info);
-        $this->load->view('view_user_did_edit', $data);
-    }
-
-    function user_dids_action($action,$did_id = "") {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['reseller_id'];
-        $did_id = empty($did_id) ? $this->input->post("free_didlist", true) : $did_id;
+	function user_did_edit($edit_id = '') {
+		$data['page_title'] = 'Edit DIDs';
+		$account_data = $this->session->userdata("accountinfo");
+		$this->db->where('id',$edit_id);
+		$this->db->select('id,call_type,extensions,number');
+		$did_info=(array)$this->db->get('dids')->first_row();
+		$did_info['free_didlist']=$did_info['id'];
+		$data['form'] = $this->form->build_form($this->user_form->build_user_did_form(),$did_info);
+		$this->load->view('view_user_did_edit', $data);
+	}
+
+	function user_dids_action($action,$did_id = "") {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['reseller_id'];
+		$did_id = empty($did_id) ? $this->input->post("free_didlist", true) : $did_id;
           
-        if($did_id !=''){
-            $account_query = $this->db_model->getSelect("*", "accounts",array('id' => $accountinfo['id']));
-            $account_arr = (array) $account_query->first_row();
-            $did_query = $this->db_model->getSelect("*", "dids", array("id" => $did_id));
-            $did_arr = (array) $did_query->first_row();
-        if ($action == "add"){
-            if($did_arr['accountid'] == 0 && $did_arr['parent_id'] == $reseller_id ) {
-             $setup_cost=$did_arr['setup'];
-                if ($accountinfo["reseller_id"] > 0) {
-                    $reseller_pricing_res = $this->db_model->getSelect("*", "reseller_pricing", array("note" => $did_arr['number'],"reseller_id"=>$accountinfo['reseller_id']));
-                    $reseller_pricing_arr = (array)$reseller_pricing_res->first_row();
-                    $setup_cost=$reseller_pricing_arr['setup'];
-                }
-                $available_bal = $this->db_model->get_available_bal($account_arr);
-                if ($available_bal >= $setup_cost) {
-                    $available_bal = $this->db_model->update_balance($setup_cost,$accountinfo["id"], "debit");
-                    $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-                    $this->common->add_invoice_details($accountinfo,"DIDCHRG",$setup_cost,$did_arr['number']);
-                    $this->db_model->update("dids", array("accountid" => $accountinfo["id"],"assign_date" => gmdate('Y-m-d H:i:s')), array("id" => $did_id));
-                    $this->common->mail_to_users('email_add_did', $account_arr,"",$did_arr['number']);
-                    $this->session->set_flashdata('astpp_errormsg', 'Did added successfully.');
-                    redirect(base_url() . "user/user_didlist/");
-                } else {
-                    $this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
-                    redirect(base_url() . "user/user_didlist/");
-                }
-        }else{
-                $this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
-                redirect(base_url() . "user/user_didlist/");
-        }
-        }
-        if ($action == "edit") {
-            $add_array=$this->input->post();
-	    $data['form'] = $this->form->build_form($this->user_form->build_user_did_form($add_array['free_didlist']), $add_array);
-	    if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-	      $update_arr = array("call_type" => $add_array['call_type'],
+		if($did_id !=''){
+			$account_query = $this->db_model->getSelect("*", "accounts",array('id' => $accountinfo['id']));
+			$account_arr = (array) $account_query->first_row();
+			$did_query = $this->db_model->getSelect("*", "dids", array("id" => $did_id));
+			$did_arr = (array) $did_query->first_row();
+		if ($action == "add"){
+			if($did_arr['accountid'] == 0 && $did_arr['parent_id'] == $reseller_id ) {
+			 $setup_cost=$did_arr['setup'];
+				if ($accountinfo["reseller_id"] > 0) {
+					$reseller_pricing_res = $this->db_model->getSelect("*", "reseller_pricing", array("note" => $did_arr['number'],"reseller_id"=>$accountinfo['reseller_id']));
+					$reseller_pricing_arr = (array)$reseller_pricing_res->first_row();
+					$setup_cost=$reseller_pricing_arr['setup'];
+				}
+				$available_bal = $this->db_model->get_available_bal($account_arr);
+				if ($available_bal >= $setup_cost) {
+					$available_bal = $this->db_model->update_balance($setup_cost,$accountinfo["id"], "debit");
+					$accountinfo=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
+					$this->common->add_invoice_details($accountinfo,"DIDCHRG",$setup_cost,$did_arr['number']);
+					$this->db_model->update("dids", array("accountid" => $accountinfo["id"],"assign_date" => gmdate('Y-m-d H:i:s')), array("id" => $did_id));
+					$this->common->mail_to_users('email_add_did', $account_arr,"",$did_arr['number']);
+					$this->session->set_flashdata('astpp_errormsg', 'Did added successfully.');
+					redirect(base_url() . "user/user_didlist/");
+				} else {
+					$this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
+					redirect(base_url() . "user/user_didlist/");
+				}
+		}else{
+				$this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
+				redirect(base_url() . "user/user_didlist/");
+		}
+		}
+		if ($action == "edit") {
+			$add_array=$this->input->post();
+		$data['form'] = $this->form->build_form($this->user_form->build_user_did_form($add_array['free_didlist']), $add_array);
+		if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+		  $update_arr = array("call_type" => $add_array['call_type'],
 		  "extensions" => $add_array['extensions'],"last_modified_date"=>gmdate("Y-m-d H:i:s")
-	      );
-	      $this->db->update("dids", $update_arr, array("id" => $did_id));
-	      if($accountinfo['reseller_id'] > 0 ){
+		  );
+		  $this->db->update("dids", $update_arr, array("id" => $did_id));
+		  if($accountinfo['reseller_id'] > 0 ){
 		  
 		  $this->db->update('reseller_pricing',$update_arr,array('note'=>$did_arr['number']));
-	      }
-	      echo json_encode(array("SUCCESS" => $did_arr['number'] . " DID Updated Successfully!"));
-	      exit;
-            }
-            $this->load->view('view_user_did_edit', $data);
-        }
-        if ($action == "delete") {
-            $this->db->update("dids", array("accountid" =>0,"assign_date" =>"0000-00-00 00:00:00" , 'charge_upto'=>"0000-00-00 00:00:00"),array("id" => $did_id));
-            $this->common->mail_to_users('email_remove_did', $account_arr,"",$did_arr['number']);
-            $this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
-            redirect(base_url() . "user/user_didlist/");
-        }
-        }else{
+		  }
+		  echo json_encode(array("SUCCESS" => $did_arr['number'] . " DID Updated Successfully!"));
+		  exit;
+			}
+			$this->load->view('view_user_did_edit', $data);
+		}
+		if ($action == "delete") {
+			$this->db->update("dids", array("accountid" =>0,"assign_date" =>"0000-00-00 00:00:00" , 'charge_upto'=>"0000-00-00 00:00:00"),array("id" => $did_id));
+			$this->common->mail_to_users('email_remove_did', $account_arr,"",$did_arr['number']);
+			$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
+			redirect(base_url() . "user/user_didlist/");
+		}
+		}else{
 	  $this->session->set_flashdata('astpp_notification', 'DID not found.');
 	  redirect(base_url() . "user/user_didlist/");
-        }
-    }
-
-    function user_rates_list() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'My Rates';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $this->load->module('rates/rates');
-        $data["grid_buttons"] = $this->user_form->user_rates_list_buttons();
-        $data['grid_fields'] = $this->user_form->user_rates_list();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->user_rates_list_search());
-        $this->load->view('view_user_rates_list', $data);
-    }
-
-    function user_rates_list_json() {
-        $account_data = $this->session->userdata("accountinfo");
-        $markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-        $count_all = $this->user_model->get_user_rates_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-
-        $query = $this->user_model->get_user_rates_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->user_form->user_rates_list());
-        foreach ($query->result_array() as $key => $value) {
-            $cost=$account_data['type']!=3 ? ($value['cost'] + (($value['cost']*$markup)/100)) : $value['cost'];
-            $json_data['rows'][] = array('cell' => array(
-                    $this->common->get_only_numeric_val("","",$value["pattern"]),
-                    $value['comment'],
-                    $this->common_model->calculate_currency($value['connectcost'],'','',true,false),
-                    $value['includedseconds'],
-                    $this->common_model->calculate_currency(($cost),'','',true,false),
-                    $value['init_inc'],
-                    $value['inc']                   
-            ));
-        }
-        echo json_encode($json_data);
-    }
+		}
+	}
+
+	function user_rates_list() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'My Rates';
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$this->load->module('rates/rates');
+		$data["grid_buttons"] = $this->user_form->user_rates_list_buttons();
+		$data['grid_fields'] = $this->user_form->user_rates_list();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->user_rates_list_search());
+		$this->load->view('view_user_rates_list', $data);
+	}
+
+	function user_rates_list_json() {
+		$account_data = $this->session->userdata("accountinfo");
+		$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
+		$count_all = $this->user_model->get_user_rates_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+
+		$query = $this->user_model->get_user_rates_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->user_form->user_rates_list());
+		foreach ($query->result_array() as $key => $value) {
+			$cost=$account_data['type']!=3 ? ($value['cost'] + (($value['cost']*$markup)/100)) : $value['cost'];
+			$json_data['rows'][] = array('cell' => array(
+					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$value['comment'],
+					$this->common_model->calculate_currency($value['connectcost'],'','',true,false),
+					$value['includedseconds'],
+					$this->common_model->calculate_currency(($cost),'','',true,false),
+					$value['init_inc'],
+					$value['inc']                   
+			));
+		}
+		echo json_encode($json_data);
+	}
     
-    function user_rates_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
-            if (isset($action['connectcost']['connectcost']) && $action['connectcost']['connectcost'] != '') {
-                $action['connectcost']['connectcost'] = $this->common_model->add_calculate_currency($action['connectcost']['connectcost'], "", '', true, false);
-            }
-            if (isset($action['cost']['cost']) && $action['cost']['cost'] != '') {
-                $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;
-                $action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-                if($account_data['type']!=3)
-                    $action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
-            }
-            $this->session->set_userdata('user_rates_list_search', $action);
-        }
-        if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_rates_list/');
-        }
-    }
-
-    function user_rates_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_rates_list_search', "");
-    }
+	function user_rates_list_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action'],$action['advance_search']);
+			if (isset($action['connectcost']['connectcost']) && $action['connectcost']['connectcost'] != '') {
+				$action['connectcost']['connectcost'] = $this->common_model->add_calculate_currency($action['connectcost']['connectcost'], "", '', true, false);
+			}
+			if (isset($action['cost']['cost']) && $action['cost']['cost'] != '') {
+				$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;
+				$action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
+				if($account_data['type']!=3)
+					$action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+			}
+			$this->session->set_userdata('user_rates_list_search', $action);
+		}
+		if ($ajax_search != 1) {
+			redirect(base_url() . 'user/user_rates_list/');
+		}
+	}
+
+	function user_rates_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_rates_list_search', "");
+	}
     
-    function user_rates_list_export() {
+	function user_rates_list_export() {
 	$account_data=$this->session->userdata('accountinfo');
-        $currency_id=$account_data['currency_id'];
-        $currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-        $query = $this->user_model->get_user_rates_list(true, '', '', false);
-        $markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-        ob_clean();
-        $inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)","Initital Increment","Increment");
-        if ($query->num_rows() > 0) {
-            foreach ($query->result_array() as $row) {
+		$currency_id=$account_data['currency_id'];
+		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$query = $this->user_model->get_user_rates_list(true, '', '', false);
+		$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
+		ob_clean();
+		$inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)","Initital Increment","Increment");
+		if ($query->num_rows() > 0) {
+			foreach ($query->result_array() as $row) {
 		$cost=$account_data['type']!=3 ? ($row['cost'] + ($row['cost']*$markup)/100) :$row['cost'];
 		$inbound_array[] = array(
-                        $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
-                        $row['comment'],
-                        $this->common_model->calculate_currency($row['connectcost'],'','',true,false),
-                        $row['includedseconds'],
+						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['comment'],
+						$this->common_model->calculate_currency($row['connectcost'],'','',true,false),
+						$row['includedseconds'],
 			$this->common_model->calculate_currency($cost,'','',true,false),
 			$row['init_inc'],
-                        $row['inc']
-                    );
-            }
-        }
-        $this->load->helper('csv');
-        array_to_csv($inbound_array, 'Rates_' . date("Y-m-d") . '.csv');
-    } 
-
-    function user_refill($action = "") {
-        if (common_model::$global_config['system_config']['paypal_status'] == 1) {
-            redirect(base_url() . 'user/user/');
-        }
-        $this->load->module("user/refill");
-        if ($action == "GET_AMT") {
-            $amount = $this->input->post("value", true);
-            $this->refill->convert_amount($amount);
-        } else {
-            $this->refill->index();
-        }
-    }
-
-    function user_convert_amount($amount) {
-        $amount = $this->common_model->add_calculate_currency($amount, "", "", false, false);
-        echo number_format($amount, 5);
-    }
+						$row['inc']
+					);
+			}
+		}
+		$this->load->helper('csv');
+		array_to_csv($inbound_array, 'Rates_' . date("Y-m-d") . '.csv');
+	} 
+
+	function user_refill($action = "") {
+		if (common_model::$global_config['system_config']['paypal_status'] == 1) {
+			redirect(base_url() . 'user/user/');
+		}
+		$this->load->module("user/refill");
+		if ($action == "GET_AMT") {
+			$amount = $this->input->post("value", true);
+			$this->refill->convert_amount($amount);
+		} else {
+			$this->refill->index();
+		}
+	}
+
+	function user_convert_amount($amount) {
+		$amount = $this->common_model->add_calculate_currency($amount, "", "", false, false);
+		echo number_format($amount, 5);
+	}
     
 
-    function user_report_export() {
-        $this->load->module('reports/reports');
-        $this->user_cdrreport_export();
-    }
-
-    function change_password() {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $id = $accountinfo['id'];
-        $this->load->model('user_model');
-
-        $query = $this->user_model->change_password($id);
-        foreach ($query as $row) {
-            $data['password'] = $row->password;
-        }
-        $databasepassword = $data['password'];
-        $password = $_POST['oldpassword'];
-        $newpassword = $_POST['newpassword'];
-        $conformpassword = $_POST['conformpassword'];
-        if ($databasepassword == $password) {
-
-            if ($conformpassword == $newpassword) {
-                $update = $newpassword;
-                $this->load->model('user_model');
-                $this->user_model->change_db_password($update, $id);
-                $this->session->set_flashdata('astpp_errormsg', "Password changed Sucessfully....!!!");
-                redirect(base_url() . 'user/user/changepassword/');
-            } else {
-                $this->session->set_flashdata('astpp_notification', "New Password & Conformpassword not match.");
-                redirect(base_url() . 'user/user/changepassword/');
-            }
-        } else {
-            $this->session->set_flashdata('astpp_notification', "Invalid old passwword.");
-            redirect(base_url() . 'user/user/changepassword/');
-        }
-    }
-
-    function changepassword() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Change Password';
-        $this->load->view('view_changepassword', $data);
-    }
-
-    function user_generate_password() {
-        echo $this->common->generate_password();
-    }
-
-    function user_generate_number($digit) {
-        echo $this->common->find_uniq_rendno($digit, 'number', 'accounts');
-    }
-
-    function user_refill_coupon_list() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Refill Coupon List';
-        $this->load->module('refill_coupon/refill_coupon');
-        $data['grid_fields'] = $this->refill_coupon->refill_coupon_form->build_user_refill_coupon_grid();
-        $acc_data = $this->session->userdata("accountinfo");
-        $reseller_id = $acc_data['reseller_id'];
-
-        $drp_data = $this->db->query("SELECT id,CONCAT(number,'(',amount,')') as details,number FROM refill_coupon WHERE status = '0' and reseller_id='" . $reseller_id . "'");
-        $reseller_data = array();
-        $data['refill_coupon_list'] = form_dropdown_all('refill_coupon_list', $reseller_data, '');
-        $this->load->view('view_refill_coupon_list', $data);
-    }
-
-    function user_refill_coupon_list_json() {
-        $account_data = $this->session->userdata("accountinfo");
-
-        $this->load->module('refill_coupon/refill_coupon');
-        $this->refill_coupon->refill_coupon_customer_json($account_data["id"]);
-    }
-
-    function user_refill_coupon_number($refill_coupon_no) {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['reseller_id'];
-        $customer_id = $accountinfo['id'];
-        $this->db->where('reseller_id', $reseller_id);
-        $this->db->where('number', $refill_coupon_no);
-        $this->db->select('*');
-        $refill_coupon_result = $this->db->get('refill_coupon');
-        if ($refill_coupon_result->num_rows() > 0) {
-            $refill_coupon_result = $refill_coupon_result->result_array();
-            $refill_coupon_result = $refill_coupon_result[0];
-            if ($refill_coupon_result['status'] == 1) {
-                echo json_encode(1);
-            } elseif ($refill_coupon_result['status'] == 2) {
-                echo json_encode(2);
-            } else {
-                $this->db->select('balance');
-                $result = (array)$this->db->get_where('accounts',array('id'=>$customer_id))->first_row();
-                $user_balance=$this->db_model->get_available_bal($accountinfo);
-                $original_balance=$refill_coupon_result['amount'];
-                $refill_coupon_result['amount'] = $this->common_model->to_calculate_currency($original_balance,'','',TRUE,TRUE);
-                $refill_coupon_result['new_balance'] = $this->common_model->to_calculate_currency($user_balance+$original_balance,'','',TRUE,TRUE);
-                echo json_encode($refill_coupon_result);
-            }
-        } else {
-            echo json_encode(3);
-        }
-    }
-
-    function user_refill_coupon_action($refill_coupon_no) {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['reseller_id'];
-        if ($reseller_id == 0) {
-            $reseller_id = '-1';
-        }
-        $date = gmdate('Y-m-d H:i:s');
-        $customer_id = $accountinfo['id'];
-        $this->db->where('number', $refill_coupon_no);
-        $this->db->select('amount');
-        $result = $this->db->get('refill_coupon');
-        if ($result->num_rows() > 0) {
-            $result = $result->result_array();
-            $amount = $result[0]['amount'];
-            $this->db->where('id', $customer_id);
-            $this->db->select('balance');
-            $result = $this->db->get('accounts');
-            $result = $result->result_array();
-            $current_balance = $result[0]['balance'];
-            $new_balance = $current_balance + $amount;
-            $data = array('balance' => $new_balance);
-            $this->db->where('id', $customer_id);
-            $this->db->update('accounts', $data);
-            $this->db->where('number', $refill_coupon_no);
-            $refill_coupon_data = array('status' => 2, "account_id" => $customer_id, 'firstused' => $date);
-            $this->db->update('refill_coupon', $refill_coupon_data);
-            $payment_arr = array("accountid" => $customer_id, 'type' => 'refill_coupon', 'credit' => $amount, 'payment_by' => $reseller_id, 'payment_date' => $date, 'refill_coupon_number' => $refill_coupon_no, 'notes' => 'Recharge using Refill coupon,Refill coupon No. ' . $refill_coupon_no . '');
-            $this->db->insert('payments', $payment_arr);
-        }
-        redirect(base_url() . "user/user_refill_coupon_list/");
-    }
-
-    function user_packages() {
-        $data['page_title'] = 'Packages';
-        $data['grid_fields'] = $this->user_form->build_packages_list_for_user();
-        $this->load->view('view_user_packages_list', $data);
-    }
-
-    function user_packages_json() {
-        $json_data = array();
-        $count_all = $this->user_model->get_user_packages_list(false,'','');
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_packages_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->user_form->build_packages_list_for_user());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_invoices() {
-        $data['page_title'] = 'Invoices';
-        $this->load->view('view_user_invoices_list', $data);
-    }
-
-    function user_invoices_json() {
-        $json_data = array();
-        $count_all = $this->user_model->get_user_invoices_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, 10, 1);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_invoices_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $this->load->module('invoices/invoices');
-        $grid_fields = json_decode($this->user_form->build_invoices_list_for_user());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_emails() {
-        $data['page_title'] = 'EMails';
-        $data['grid_fields'] = $this->user_form->build_emails_list_for_user();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_emails_search());
-        $this->load->view('view_user_emails_list', $data);
-    }
-
-    function user_emails_json() {
-        $json_data = array();
-        $count_all = $this->user_model->get_user_emails_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_emails_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->user_form->build_emails_list_for_user());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
-    function user_emails_search(){
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
-            $this->session->set_userdata('user_emails_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_emails/');
-        }
-    }
-    function user_emails_clearsearchfilter(){
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_emails_search', "");
-    }
-    function user_invoice_config() {
-        $data['page_title'] = 'Company Profile';
-        $accountinfo = $this->session->userdata("accountinfo");
-        $add_array = $this->input->post();
-        $data["account_data"] = $add_array;
-        if (isset($add_array['submit'])) {
-            if ($_FILES['file']['name'] == '') {
-                $invoiceconf = $this->user_model->get_invoiceconf();
-                $file_name=($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
-            }
-            if (isset($_FILES['file']['name']) && $_FILES['file']['name'] != '') {
-                $files = $_FILES['file'];
-                if ($files['size'] < 0) {
-                    $this->session->set_flashdata('astpp_notification', 'PLease upload maximum file');
-	            redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
-                }
-                $file = $_FILES['file'];
-                $uploadedFile = $file["tmp_name"];
-                $file_name = $file['name'];
-                $file_type = $file['type'];
-                if ($file_type == 'image/jpg' || $file_type == 'image/png' || $file_type == 'image/jpeg') {
-                    $dir_path = FCPATH. "upload/";
-                    $path = $dir_path . $add_array['accountid']."_".$file['name'];
-                    if (move_uploaded_file($uploadedFile, $path)) {
-                        $this->session->set_flashdata('astpp_errormsg', gettext('files added successfully!'));
-                    } else {
-                        $this->session->set_flashdata('astpp_notification', "File Uploading Fail Please Try Again");
-                        redirect(base_url() . 'user/user_invoice_config/');
-                    }
-                } else {
-                    $this->session->set_flashdata('astpp_notification', 'Please upload only image!');
-                    redirect(base_url() . 'user/user_invoice_config/');
-                }
-            }
-            $add_array['logo'] = $file_name;
-            unset($add_array['submit']);
-            if ($add_array['id'] == '') {
-                $add_array['accountid'] = $accountinfo['id'];
-                $this->user_model->add_invoice_config($add_array);
-            } else {
-                $this->user_model->edit_invoice_config($add_array, $add_array['id']);
-            }
-            $this->session->set_flashdata('astpp_errormsg', 'Invoice config updated successfully!');
-            redirect(base_url() . 'user/user_invoice_config/');
-        } else {
-            $data["account_data"] =(array)$this->db->get_where('invoice_conf',array("accountid"=>$accountinfo['id']))->first_row();
-            if(isset($data["account_data"]['logo'])){
-	            $data["account_data"]['file']=$accountinfo['id']."_".$data["account_data"]['logo'];
-	    }
-            $this->load->view('view_user_invoices_config', $data);
-        }
-    }
-
-     function user_invoice_logo_delete($accountid){
+	function user_report_export() {
+		$this->load->module('reports/reports');
+		$this->user_cdrreport_export();
+	}
+
+	function change_password() {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$id = $accountinfo['id'];
+		$this->load->model('user_model');
+
+		$query = $this->user_model->change_password($id);
+		foreach ($query as $row) {
+			$data['password'] = $row->password;
+		}
+		$databasepassword = $data['password'];
+		$password = $_POST['oldpassword'];
+		$newpassword = $_POST['newpassword'];
+		$conformpassword = $_POST['conformpassword'];
+		if ($databasepassword == $password) {
+
+			if ($conformpassword == $newpassword) {
+				$update = $newpassword;
+				$this->load->model('user_model');
+				$this->user_model->change_db_password($update, $id);
+				$this->session->set_flashdata('astpp_errormsg', "Password changed Sucessfully....!!!");
+				redirect(base_url() . 'user/user/changepassword/');
+			} else {
+				$this->session->set_flashdata('astpp_notification', "New Password & Conformpassword not match.");
+				redirect(base_url() . 'user/user/changepassword/');
+			}
+		} else {
+			$this->session->set_flashdata('astpp_notification', "Invalid old passwword.");
+			redirect(base_url() . 'user/user/changepassword/');
+		}
+	}
+
+	function changepassword() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Change Password';
+		$this->load->view('view_changepassword', $data);
+	}
+
+	function user_generate_password() {
+		echo $this->common->generate_password();
+	}
+
+	function user_generate_number($digit) {
+		echo $this->common->find_uniq_rendno($digit, 'number', 'accounts');
+	}
+
+	function user_refill_coupon_list() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Refill Coupon List';
+		$this->load->module('refill_coupon/refill_coupon');
+		$data['grid_fields'] = $this->refill_coupon->refill_coupon_form->build_user_refill_coupon_grid();
+		$acc_data = $this->session->userdata("accountinfo");
+		$reseller_id = $acc_data['reseller_id'];
+
+		$drp_data = $this->db->query("SELECT id,CONCAT(number,'(',amount,')') as details,number FROM refill_coupon WHERE status = '0' and reseller_id='" . $reseller_id . "'");
+		$reseller_data = array();
+		$data['refill_coupon_list'] = form_dropdown_all('refill_coupon_list', $reseller_data, '');
+		$this->load->view('view_refill_coupon_list', $data);
+	}
+
+	function user_refill_coupon_list_json() {
+		$account_data = $this->session->userdata("accountinfo");
+
+		$this->load->module('refill_coupon/refill_coupon');
+		$this->refill_coupon->refill_coupon_customer_json($account_data["id"]);
+	}
+
+	function user_refill_coupon_number($refill_coupon_no) {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['reseller_id'];
+		$customer_id = $accountinfo['id'];
+		$this->db->where('reseller_id', $reseller_id);
+		$this->db->where('number', $refill_coupon_no);
+		$this->db->select('*');
+		$refill_coupon_result = $this->db->get('refill_coupon');
+		if ($refill_coupon_result->num_rows() > 0) {
+			$refill_coupon_result = $refill_coupon_result->result_array();
+			$refill_coupon_result = $refill_coupon_result[0];
+			if ($refill_coupon_result['status'] == 1) {
+				echo json_encode(1);
+			} elseif ($refill_coupon_result['status'] == 2) {
+				echo json_encode(2);
+			} else {
+				$this->db->select('balance');
+				$result = (array)$this->db->get_where('accounts',array('id'=>$customer_id))->first_row();
+				$user_balance=$this->db_model->get_available_bal($accountinfo);
+				$original_balance=$refill_coupon_result['amount'];
+				$refill_coupon_result['amount'] = $this->common_model->to_calculate_currency($original_balance,'','',TRUE,TRUE);
+				$refill_coupon_result['new_balance'] = $this->common_model->to_calculate_currency($user_balance+$original_balance,'','',TRUE,TRUE);
+				echo json_encode($refill_coupon_result);
+			}
+		} else {
+			echo json_encode(3);
+		}
+	}
+
+	function user_refill_coupon_action($refill_coupon_no) {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['reseller_id'];
+		if ($reseller_id == 0) {
+			$reseller_id = '-1';
+		}
+		$date = gmdate('Y-m-d H:i:s');
+		$customer_id = $accountinfo['id'];
+		$this->db->where('number', $refill_coupon_no);
+		$this->db->select('amount');
+		$result = $this->db->get('refill_coupon');
+		if ($result->num_rows() > 0) {
+			$result = $result->result_array();
+			$amount = $result[0]['amount'];
+			$this->db->where('id', $customer_id);
+			$this->db->select('balance');
+			$result = $this->db->get('accounts');
+			$result = $result->result_array();
+			$current_balance = $result[0]['balance'];
+			$new_balance = $current_balance + $amount;
+			$data = array('balance' => $new_balance);
+			$this->db->where('id', $customer_id);
+			$this->db->update('accounts', $data);
+			$this->db->where('number', $refill_coupon_no);
+			$refill_coupon_data = array('status' => 2, "account_id" => $customer_id, 'firstused' => $date);
+			$this->db->update('refill_coupon', $refill_coupon_data);
+			$payment_arr = array("accountid" => $customer_id, 'type' => 'refill_coupon', 'credit' => $amount, 'payment_by' => $reseller_id, 'payment_date' => $date, 'refill_coupon_number' => $refill_coupon_no, 'notes' => 'Recharge using Refill coupon,Refill coupon No. ' . $refill_coupon_no . '');
+			$this->db->insert('payments', $payment_arr);
+		}
+		redirect(base_url() . "user/user_refill_coupon_list/");
+	}
+
+	function user_packages() {
+		$data['page_title'] = 'Packages';
+		$data['grid_fields'] = $this->user_form->build_packages_list_for_user();
+		$this->load->view('view_user_packages_list', $data);
+	}
+
+	function user_packages_json() {
+		$json_data = array();
+		$count_all = $this->user_model->get_user_packages_list(false,'','');
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_packages_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->user_form->build_packages_list_for_user());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_invoices() {
+		$data['page_title'] = 'Invoices';
+		$this->load->view('view_user_invoices_list', $data);
+	}
+
+	function user_invoices_json() {
+		$json_data = array();
+		$count_all = $this->user_model->get_user_invoices_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, 10, 1);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_invoices_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$this->load->module('invoices/invoices');
+		$grid_fields = json_decode($this->user_form->build_invoices_list_for_user());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_emails() {
+		$data['page_title'] = 'EMails';
+		$data['grid_fields'] = $this->user_form->build_emails_list_for_user();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_emails_search());
+		$this->load->view('view_user_emails_list', $data);
+	}
+
+	function user_emails_json() {
+		$json_data = array();
+		$count_all = $this->user_model->get_user_emails_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_emails_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->user_form->build_emails_list_for_user());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
+	function user_emails_search(){
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action'],$action['advance_search']);
+			$this->session->set_userdata('user_emails_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_emails/');
+		}
+	}
+	function user_emails_clearsearchfilter(){
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_emails_search', "");
+	}
+	function user_invoice_config() {
+		$data['page_title'] = 'Company Profile';
+		$accountinfo = $this->session->userdata("accountinfo");
+		$add_array = $this->input->post();
+		$data["account_data"] = $add_array;
+		if (isset($add_array['submit'])) {
+			if ($_FILES['file']['name'] == '') {
+				$invoiceconf = $this->user_model->get_invoiceconf();
+				$file_name=($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
+			}
+			if (isset($_FILES['file']['name']) && $_FILES['file']['name'] != '') {
+				$files = $_FILES['file'];
+				if ($files['size'] < 0) {
+					$this->session->set_flashdata('astpp_notification', 'PLease upload maximum file');
+				redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+				}
+				$file = $_FILES['file'];
+				$uploadedFile = $file["tmp_name"];
+				$file_name = $file['name'];
+				$file_type = $file['type'];
+				if ($file_type == 'image/jpg' || $file_type == 'image/png' || $file_type == 'image/jpeg') {
+					$dir_path = FCPATH. "upload/";
+					$path = $dir_path . $add_array['accountid']."_".$file['name'];
+					if (move_uploaded_file($uploadedFile, $path)) {
+						$this->session->set_flashdata('astpp_errormsg', gettext('files added successfully!'));
+					} else {
+						$this->session->set_flashdata('astpp_notification', "File Uploading Fail Please Try Again");
+						redirect(base_url() . 'user/user_invoice_config/');
+					}
+				} else {
+					$this->session->set_flashdata('astpp_notification', 'Please upload only image!');
+					redirect(base_url() . 'user/user_invoice_config/');
+				}
+			}
+			$add_array['logo'] = $file_name;
+			unset($add_array['submit']);
+			if ($add_array['id'] == '') {
+				$add_array['accountid'] = $accountinfo['id'];
+				$this->user_model->add_invoice_config($add_array);
+			} else {
+				$this->user_model->edit_invoice_config($add_array, $add_array['id']);
+			}
+			$this->session->set_flashdata('astpp_errormsg', 'Invoice config updated successfully!');
+			redirect(base_url() . 'user/user_invoice_config/');
+		} else {
+			$data["account_data"] =(array)$this->db->get_where('invoice_conf',array("accountid"=>$accountinfo['id']))->first_row();
+			if(isset($data["account_data"]['logo'])){
+				$data["account_data"]['file']=$accountinfo['id']."_".$data["account_data"]['logo'];
+		}
+			$this->load->view('view_user_invoices_config', $data);
+		}
+	}
+
+	 function user_invoice_logo_delete($accountid){
 	$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
 	$result=$invoiceconf->result_array();
 	$logo=$result[0]['logo'];
@@ -675,164 +675,164 @@ 
 	$where_arr=array('logo'=>$logo);
 	$this->db->where($where_arr);
 	$this->db->update('invoice_conf',$post_arr);
-     }
+	 }
     
-    function user_myprofile() {
-        $accountinfo = $this->session->userdata("accountinfo");
-        $entity_name = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
-        $data['page_title'] = 'My Profile';
-        $add_array = $this->input->post();
-        if ($add_array['id'] != '') {
-            $add_array['type'] = $accountinfo['type'];
-            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_form_fields($add_array), $add_array);
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
-                if ($add_array['id'] == $accountinfo['id']) {
-                    $this->user_model->edit_account($add_array, $add_array['id']);
-                    $result = $this->db->get_where('accounts', array('id' => $add_array['id']));
-                    $result = $result->result_array();
-                    $this->session->set_userdata('accountinfo', $result[0]);
-                    $this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
-                    redirect(base_url() . 'user/user_myprofile/');
-                }else{
-                    $this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
-                }
-            }
-        } else {
-            $where = array('id' => $accountinfo["id"]);
-            $account = $this->db_model->getSelect("*", "accounts", $where);
-            $data["account_data"] = $account->result_array();
-
-            foreach ($account->result_array() as $key => $value) {
-                $editable_data = $value;
-            }
-            $editable_data['password'] = $this->common->decode($editable_data['password']);
-            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_form_fields($editable_data), $editable_data);
-        }
-        $this->load->view('view_user_details', $data);
-    }
+	function user_myprofile() {
+		$accountinfo = $this->session->userdata("accountinfo");
+		$entity_name = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
+		$data['page_title'] = 'My Profile';
+		$add_array = $this->input->post();
+		if ($add_array['id'] != '') {
+			$add_array['type'] = $accountinfo['type'];
+			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_form_fields($add_array), $add_array);
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
+				if ($add_array['id'] == $accountinfo['id']) {
+					$this->user_model->edit_account($add_array, $add_array['id']);
+					$result = $this->db->get_where('accounts', array('id' => $add_array['id']));
+					$result = $result->result_array();
+					$this->session->set_userdata('accountinfo', $result[0]);
+					$this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
+					redirect(base_url() . 'user/user_myprofile/');
+				}else{
+					$this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
+				}
+			}
+		} else {
+			$where = array('id' => $accountinfo["id"]);
+			$account = $this->db_model->getSelect("*", "accounts", $where);
+			$data["account_data"] = $account->result_array();
+
+			foreach ($account->result_array() as $key => $value) {
+				$editable_data = $value;
+			}
+			$editable_data['password'] = $this->common->decode($editable_data['password']);
+			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_form_fields($editable_data), $editable_data);
+		}
+		$this->load->view('view_user_details', $data);
+	}
   
-    function user_change_password() {
-        $accountinfo = $this->session->userdata("accountinfo");
-        $data['page_title'] = "Change Password";
-        $add_array = $this->input->post();    
-        if(!empty($add_array)) {
-            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(), $add_array);
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
-                $password_encode = $this->common->encode($add_array['new_password']);
-                $data = array('password' => $password_encode);
-                $this->db->where('id',$add_array['id']);
-                $this->db->update('accounts', $data);
-                $this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
-                redirect(base_url() . 'user/user_change_password/');
-            }
-        }else{
-            $data_array['id']=$accountinfo['id'];
-            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
-        }
-        $this->load->view('view_user_change_password', $data);
-    }
-
-    function user_refill_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $data['page_title'] = 'Refill Report';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_refill_report();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
-        if($accountinfo['type'] == 1){
-            $this->load->view('view_reseller_refill_report', $data);
-        }else{
-            $this->load->view('view_user_refill_report', $data);
-        }
-    }
-
-    function user_refill_report_json() {
-        $json_data = array();
-        $count_all = $this->user_model->get_user_refill_list(false);
-        $paging_data = $this->form->load_grid_config($count_all,$_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_refill_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->user_form->build_user_refill_report());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
+	function user_change_password() {
+		$accountinfo = $this->session->userdata("accountinfo");
+		$data['page_title'] = "Change Password";
+		$add_array = $this->input->post();    
+		if(!empty($add_array)) {
+			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(), $add_array);
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
+				$password_encode = $this->common->encode($add_array['new_password']);
+				$data = array('password' => $password_encode);
+				$this->db->where('id',$add_array['id']);
+				$this->db->update('accounts', $data);
+				$this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
+				redirect(base_url() . 'user/user_change_password/');
+			}
+		}else{
+			$data_array['id']=$accountinfo['id'];
+			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
+		}
+		$this->load->view('view_user_change_password', $data);
+	}
+
+	function user_refill_report() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$data['page_title'] = 'Refill Report';
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_refill_report();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
+		if($accountinfo['type'] == 1){
+			$this->load->view('view_reseller_refill_report', $data);
+		}else{
+			$this->load->view('view_user_refill_report', $data);
+		}
+	}
+
+	function user_refill_report_json() {
+		$json_data = array();
+		$count_all = $this->user_model->get_user_refill_list(false);
+		$paging_data = $this->form->load_grid_config($count_all,$_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_refill_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->user_form->build_user_refill_report());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
     
-    function user_refill_report_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
-            if (isset($action['credit']['credit']) && $action['credit']['credit'] != '') {
-             $action['credit']['credit'] = $this->common_model->add_calculate_currency($action['credit']['credit'], "", '', true, false);
-            }
-            $this->session->set_userdata('user_refill_report_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_refill_report/');
-        }
-    }
+	function user_refill_report_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action'],$action['advance_search']);
+			if (isset($action['credit']['credit']) && $action['credit']['credit'] != '') {
+			 $action['credit']['credit'] = $this->common_model->add_calculate_currency($action['credit']['credit'], "", '', true, false);
+			}
+			$this->session->set_userdata('user_refill_report_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_refill_report/');
+		}
+	}
     
-    function user_refill_report_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_refill_report_search', "");
-    }
+	function user_refill_report_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_refill_report_search', "");
+	}
     
-    function user_invoices_list() {
+	function user_invoices_list() {
 		$data['page_title'] = 'Invoices';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_invoices();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_invoices_search());
-        $this->load->view('view_user_invoices_list', $data);
-    }
-    function user_invoices_list_json() {
-        $accountinfo = $this->session->userdata('accountinfo');
-        $where = array("accountid" => $accountinfo['id']);
-        $count_all = $this->user_model->get_user_invoice_list(false, '', '', $where);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $user_currency=$this->common->get_field_name('currency','currency',$accountinfo['currency_id']);
-        $invoices_query = $this->user_model->get_user_invoice_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $where);
-        $invoices_result = $invoices_query->result_array();
-        $ountstanding_value = 0;
-        $total_amount = 0;
-        $this->db->where('accountid', $accountinfo['id']);
-        $this->db->select('sum(credit) as total_credit');
-        $invoice_details_result = $this->db->get('invoice_details');
-        $total_credit = (array)$invoice_details_result->first_row();
-        $total_credit = $total_credit['total_credit'];
-        foreach ($invoices_result as $key => $value) {
-            $total_amount+=$value['amount'];
-            $invoice_date = date("Y-m-d", strtotime($value['invoice_date']));
-            $from_date = date("Y-m-d", strtotime($value['from_date']));
-            $due_date = date("Y-m-d", strtotime($value['due_date']));
-            $outstanding = $value['amount'];
-            $invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid" => $value['id'], "item_type" => "INVPAY"), "created_date", "DESC", "1", "0");
-            if ($invoice_total_query->num_rows() > 0) {
-                $invoice_total_query = $invoice_total_query->result_array();
-                $outstanding -= $invoice_total_query[0]['credit'];
-                $payment_last = ($invoice_total_query[0]['created_date']) ? date("Y-m-d", strtotime($invoice_total_query[0]['created_date'])) : '';
-            }
-            $invoice_total_query = $this->db_model->select("debit,created_date", "invoice_details", array("invoiceid" => $value['id'], "item_type" => "INVPAY"), "created_date", "DESC", "1", "0");
-            if ($invoice_total_query->num_rows() > 0) {
-                $invoice_total_result = $invoice_total_query->result_array();
-            }
-            $download = '<a href="' . base_url() . '/user/user_invoice_download/' . $value['id'] . '/00' . $value['invoice_prefix'] . $value['invoiceid'] . '" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp';
-          if($value['type'] == 'I'){
-            if ($outstanding > 0) {
-                $payment = ' <a style="padding: 0 8px;" href="' . base_url() . 'user/user_invoice_payment/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</a>';
-            } else {
-                $payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
-            }
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_invoices();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_invoices_search());
+		$this->load->view('view_user_invoices_list', $data);
+	}
+	function user_invoices_list_json() {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$where = array("accountid" => $accountinfo['id']);
+		$count_all = $this->user_model->get_user_invoice_list(false, '', '', $where);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$user_currency=$this->common->get_field_name('currency','currency',$accountinfo['currency_id']);
+		$invoices_query = $this->user_model->get_user_invoice_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $where);
+		$invoices_result = $invoices_query->result_array();
+		$ountstanding_value = 0;
+		$total_amount = 0;
+		$this->db->where('accountid', $accountinfo['id']);
+		$this->db->select('sum(credit) as total_credit');
+		$invoice_details_result = $this->db->get('invoice_details');
+		$total_credit = (array)$invoice_details_result->first_row();
+		$total_credit = $total_credit['total_credit'];
+		foreach ($invoices_result as $key => $value) {
+			$total_amount+=$value['amount'];
+			$invoice_date = date("Y-m-d", strtotime($value['invoice_date']));
+			$from_date = date("Y-m-d", strtotime($value['from_date']));
+			$due_date = date("Y-m-d", strtotime($value['due_date']));
+			$outstanding = $value['amount'];
+			$invoice_total_query = $this->db_model->select("sum(debit) as debit,sum(credit) as credit,created_date", "invoice_details", array("invoiceid" => $value['id'], "item_type" => "INVPAY"), "created_date", "DESC", "1", "0");
+			if ($invoice_total_query->num_rows() > 0) {
+				$invoice_total_query = $invoice_total_query->result_array();
+				$outstanding -= $invoice_total_query[0]['credit'];
+				$payment_last = ($invoice_total_query[0]['created_date']) ? date("Y-m-d", strtotime($invoice_total_query[0]['created_date'])) : '';
+			}
+			$invoice_total_query = $this->db_model->select("debit,created_date", "invoice_details", array("invoiceid" => $value['id'], "item_type" => "INVPAY"), "created_date", "DESC", "1", "0");
+			if ($invoice_total_query->num_rows() > 0) {
+				$invoice_total_result = $invoice_total_query->result_array();
+			}
+			$download = '<a href="' . base_url() . '/user/user_invoice_download/' . $value['id'] . '/00' . $value['invoice_prefix'] . $value['invoiceid'] . '" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp';
+		  if($value['type'] == 'I'){
+			if ($outstanding > 0) {
+				$payment = ' <a style="padding: 0 8px;" href="' . base_url() . 'user/user_invoice_payment/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</a>';
+			} else {
+				$payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
+			}
 	   }else{
-                $payment = '';
+				$payment = '';
 	   }
-            if($value['generate_type'] == 1){
+			if($value['generate_type'] == 1){
 		$invoice_type='Manually';
 	   }else{
 		$invoice_type='Automatically';
@@ -859,87 +859,87 @@ 
 			$download . $payment,
 			));
 			$ountstanding_value = $ountstanding_value + $outstanding;
-        }
-        echo json_encode($json_data);
-    }
-
-    function user_invoices_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
+		}
+		echo json_encode($json_data);
+	}
+
+	function user_invoices_list_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
 			print_r($action);
-            unset($action['action']);
-            unset($action['advance_search']);
-            $action['from_date'][0] = $action['from_date'][0] ? $action['from_date'][0] . " 00:00:00" : '';
-            $action['to_date'][1] = $action['to_date'][1] ? $action['to_date'][1] . " 23:59:59" : '';
-            $action['invoice_date'][0] = $action['invoice_date'][0] ? $action['invoice_date'][0] . " 00:00:00" : '';
-            $this->session->set_userdata('user_invoice_list_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_invoice_list/');
-        }
-    }
-
-    function user_invoices_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_invoice_list_search', "");
-    }
-
-    function user_invoices_download($invoiceid) {
-        $this->load->module('invoices/invoices');
-        $this->invoices->invoice_main_download($invoiceid);
-    }
-    function user_list_responce(){
+			unset($action['action']);
+			unset($action['advance_search']);
+			$action['from_date'][0] = $action['from_date'][0] ? $action['from_date'][0] . " 00:00:00" : '';
+			$action['to_date'][1] = $action['to_date'][1] ? $action['to_date'][1] . " 23:59:59" : '';
+			$action['invoice_date'][0] = $action['invoice_date'][0] ? $action['invoice_date'][0] . " 00:00:00" : '';
+			$this->session->set_userdata('user_invoice_list_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_invoice_list/');
+		}
+	}
+
+	function user_invoices_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_invoice_list_search', "");
+	}
+
+	function user_invoices_download($invoiceid) {
+		$this->load->module('invoices/invoices');
+		$this->invoices->invoice_main_download($invoiceid);
+	}
+	function user_list_responce(){
 	$this->load->module('invoices/invoices');
-        $this->invoices->invoice_list_responce();
-    }
-     function user_invoice_payment($invoiceid){
+		$this->invoices->invoice_list_responce();
+	}
+	 function user_invoice_payment($invoiceid){
 	$this->load->module('invoices/invoices');
-        $this->invoices->invoice_summary($invoiceid);
-    }	
-    function user_invoice_payment_pay($action=""){
-        $this->load->module("user/payment");
-        if($action=="GET_AMT"){
-            $amount = $this->input->post("value",true);
-       $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
-       echo number_format($amount,2);
-        }else{
-            $this->payment->index();
-        }
-    }
-    function user_invoice_download($invoiceid){
+		$this->invoices->invoice_summary($invoiceid);
+	}	
+	function user_invoice_payment_pay($action=""){
+		$this->load->module("user/payment");
+		if($action=="GET_AMT"){
+			$amount = $this->input->post("value",true);
+	   $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
+	   echo number_format($amount,2);
+		}else{
+			$this->payment->index();
+		}
+	}
+	function user_invoice_download($invoiceid){
 	$this->load->module('invoices/invoices');
-        $this->invoices->invoice_download($invoiceid);
-    }    
-    function user_charges_history() {
+		$this->invoices->invoice_download($invoiceid);
+	}    
+	function user_charges_history() {
 		$data['page_title'] = 'Charges History';
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_charge_history();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_charge_history_search());
-        $this->load->view('view_user_charges_list', $data);
-    }
-
-    function user_charges_history_json() {
-        $json_data = array();
-        $count_all = $this->user_model->get_user_charge_history(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_charge_history(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_charge_history();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_charge_history_search());
+		$this->load->view('view_user_charges_list', $data);
+	}
+
+	function user_charges_history_json() {
+		$json_data = array();
+		$count_all = $this->user_model->get_user_charge_history(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_charge_history(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 
 	$result= $query->result_array();
-        $query1 = $this->user_model->get_user_charge_history(true,'','');
+		$query1 = $this->user_model->get_user_charge_history(true,'','');
 	$res= $query1->result_array();
 	$debit=0;
 	$credit=0;
 	$before_balance=0;
 	$after_balance=0;
 	$i=0;
-        foreach ($result as $key => $value) {
-   	     $date=$this->common->convert_GMT_to('','',$value['created_date']);
- 	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
-	        $invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$value['invoiceid']));
-	        $invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$value['invoiceid']));
+		foreach ($result as $key => $value) {
+   		 $date=$this->common->convert_GMT_to('','',$value['created_date']);
+ 		 $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
+			$invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$value['invoiceid']));
+			$invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$value['invoiceid']));
 		$invoice_num=$invoice_prefix.$invoiceid;
 		$account=$this->common->get_field_name_coma_new('first_name,last_name,number','accounts',$value['accountid']);
 		$reseller=$this->common->reseller_select_value('first_name,last_name,number','accounts',$value['reseller_id']);
@@ -955,17 +955,17 @@ 
 			$debit=$this->common->convert_to_currency('','',$value['debit']);
 		}
 		$credit=$this->common->convert_to_currency('','',$value['credit']);
-    	     if($cust_type == 0 && $value['item_type'] == 'INVPAY'){
+			 if($cust_type == 0 && $value['item_type'] == 'INVPAY'){
 		$credit = '(-) '.$credit;
-	     }
+		 }
 		if($value['after_balance'] == '-'){
 			$after_balance='-';
 		}else{		
 			$after_balance=$this->common->convert_to_currency('','',$value['after_balance']);
 		}
 		$description=$value['description'];
-	        $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
-            $json_data['rows'][] = array('cell' => array(
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
+			$json_data['rows'][] = array('cell' => array(
 							$date,
 							$invoice_num,
 							$item_type,
@@ -974,1005 +974,1005 @@ 
 							$credit,
 							$after_balance,
 							$description,
-				                    ));
+									));
 
-        }
+		}
 	$debit_sum = 0;
 	$credit_sum = 0;
 	foreach($res as $value){
- 	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
- 	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
+ 		 $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
+ 		 $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
 		$debit_sum += $value['debit'];
 		$credit_sum += $value['credit'];
 		$before_balance += $value['before_balance'];
 		$after_balance += $value['after_balance'];
 	}
-	        $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
-      echo json_encode($json_data);
-
-
-    }
-    function user_charges_history_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $action['created_date'][0] = $action['created_date'][0] ? $action['created_date'][0] . " 00:00:00" : '';
-            $action['created_date'][1] = $action['created_date'][1] ? $action['created_date'][1] . " 23:59:59" : '';
-            if (isset($action['debit']['debit']) && $action['debit']['debit'] != '') {
-                $action['debit']['debit'] = $this->common_model->add_calculate_currency($action['debit']['debit'], "", '', true, false);
-            }
-            if (isset($action['credit']['credit']) && $action['credit']['credit'] != '') {
-                $action['credit']['credit'] = $this->common_model->add_calculate_currency($action['credit']['credit'], "", '', true, false);
-            }
-            $this->session->set_userdata('user_charge_history_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_charges_history/');
-        }
-    }
-
-    function user_charges_history_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_charge_history_search', "");
-    }
-    function user_subscriptions() {
+			$json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
+	  echo json_encode($json_data);
+
+
+	}
+	function user_charges_history_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$action['created_date'][0] = $action['created_date'][0] ? $action['created_date'][0] . " 00:00:00" : '';
+			$action['created_date'][1] = $action['created_date'][1] ? $action['created_date'][1] . " 23:59:59" : '';
+			if (isset($action['debit']['debit']) && $action['debit']['debit'] != '') {
+				$action['debit']['debit'] = $this->common_model->add_calculate_currency($action['debit']['debit'], "", '', true, false);
+			}
+			if (isset($action['credit']['credit']) && $action['credit']['credit'] != '') {
+				$action['credit']['credit'] = $this->common_model->add_calculate_currency($action['credit']['credit'], "", '', true, false);
+			}
+			$this->session->set_userdata('user_charge_history_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_charges_history/');
+		}
+	}
+
+	function user_charges_history_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_charge_history_search', "");
+	}
+	function user_subscriptions() {
 		$data['page_title'] = 'Subscriptions';
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_subscription();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_subscription_search());
-        $this->load->view('view_user_subscriptions_list', $data);
-    }
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_subscription();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_subscription_search());
+		$this->load->view('view_user_subscriptions_list', $data);
+	}
 
-    function user_subscriptions_json() {
+	function user_subscriptions_json() {
         
-        $accountinfo=$this->session->userdata('accountinfo');
-        $json_data = array();
-        $select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id";
-        $table = "charges";
-        $jionTable = array('charge_to_account', 'accounts');
-        $jionCondition = array('charges.id = charge_to_account.charge_id', 'accounts.id = charge_to_account.accountid');
-        $type = array('left', 'inner');
-        $where = array('accounts.id' => $accountinfo['id']);
-        $order_type = 'charges.id';
-        $order_by = "ASC";
-        $this->db_model->build_search("user_subscription_search");
-        $count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $this->db_model->build_search("user_subscription_search");
+		$accountinfo=$this->session->userdata('accountinfo');
+		$json_data = array();
+		$select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id";
+		$table = "charges";
+		$jionTable = array('charge_to_account', 'accounts');
+		$jionCondition = array('charges.id = charge_to_account.charge_id', 'accounts.id = charge_to_account.accountid');
+		$type = array('left', 'inner');
+		$where = array('accounts.id' => $accountinfo['id']);
+		$order_type = 'charges.id';
+		$order_by = "ASC";
+		$this->db_model->build_search("user_subscription_search");
+		$count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$this->db_model->build_search("user_subscription_search");
         
-        $account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
-        $grid_fields = json_decode($this->user_form->build_user_subscription());
-        $json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);
-        echo json_encode($json_data);
-    }
-     function user_subscriptions_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            if (isset($action['charge']['charge']) && $action['charge']['charge'] != '') {
-                $action['charge']['charge'] = $this->common_model->add_calculate_currency($action['charge']['charge'], "", '', true, false);
-            }
-            if(isset($action['sweep_id']) && $action['sweep_id'] != ''){
-                $action['charges.sweep_id']=$action['sweep_id'];
-                unset($action['sweep_id']);
-            }
-            $this->session->set_userdata('user_subscription_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_subscriptions/');
-        }
-    }
-
-    function user_subscriptions_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_subscription_search', "");
-    }
-
-    function user_didlist() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $data['page_title'] = 'Purchase DIDs';
-        $data['search_flag'] = true;
-        $data['grid_fields'] = $this->user_form->build_user_didlist();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_didlist_search());
-        $data["grid_buttons"] = array();
-        $acc_data = $this->session->userdata("accountinfo");
-        $data['accountid'] = $acc_data['id'];
-        $data['country_id']=$acc_data['country_id'];
-        $result_did_final = array();
-        if($accountinfo['reseller_id'] > 0){
+		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], $order_by, $order_type, "");
+		$grid_fields = json_decode($this->user_form->build_user_subscription());
+		$json_data['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);
+		echo json_encode($json_data);
+	}
+	 function user_subscriptions_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			if (isset($action['charge']['charge']) && $action['charge']['charge'] != '') {
+				$action['charge']['charge'] = $this->common_model->add_calculate_currency($action['charge']['charge'], "", '', true, false);
+			}
+			if(isset($action['sweep_id']) && $action['sweep_id'] != ''){
+				$action['charges.sweep_id']=$action['sweep_id'];
+				unset($action['sweep_id']);
+			}
+			$this->session->set_userdata('user_subscription_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_subscriptions/');
+		}
+	}
+
+	function user_subscriptions_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_subscription_search', "");
+	}
+
+	function user_didlist() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$data['page_title'] = 'Purchase DIDs';
+		$data['search_flag'] = true;
+		$data['grid_fields'] = $this->user_form->build_user_didlist();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_didlist_search());
+		$data["grid_buttons"] = array();
+		$acc_data = $this->session->userdata("accountinfo");
+		$data['accountid'] = $acc_data['id'];
+		$data['country_id']=$acc_data['country_id'];
+		$result_did_final = array();
+		if($accountinfo['reseller_id'] > 0){
 	  $this->db->select('dids.id, dids.number, reseller_pricing.setup, reseller_pricing.monthlycost');
 	  $this->db->where('dids.accountid',0);
 	  $this->db->where('reseller_pricing.note','dids.number',false);
 	  $this->db->where('reseller_pricing.reseller_id',$accountinfo['reseller_id']);
 	  $this->db->from('dids,reseller_pricing');
-        }else{
+		}else{
 	  $this->db->where('parent_id',0);
 	  $this->db->where('accountid',0);
 	  $this->db->select('id,number,setup,monthlycost');
 	  $this->db->from('dids');
-        }
-        $dids_array=(array)$this->db->get()->result_array();
-        $drp_list=array();
-        if(!empty($dids_array)){
+		}
+		$dids_array=(array)$this->db->get()->result_array();
+		$drp_list=array();
+		if(!empty($dids_array)){
 	  foreach ($dids_array as $drp_value) {
-	    if (!empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
-	      $did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'],'','',true,true);
-	    } else {
+		if (!empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
+		  $did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'],'','',true,true);
+		} else {
 		$did_cost = 0;
-	    }
-	    if (!empty($drp_value['setup']) && $drp_value['setup'] != 0) {
+		}
+		if (!empty($drp_value['setup']) && $drp_value['setup'] != 0) {
 		$did_setup = $this->common_model->to_calculate_currency($drp_value['setup'],'','',true,true);
-	    } else {
+		} else {
 		$did_setup = 0;
-	    }
-	    $drp_list[$drp_value['id']] = $drp_value['number'] . ' ( Setup : ' . $did_setup . ')' . '( Monthly : ' . $did_cost . ' )';
+		}
+		$drp_list[$drp_value['id']] = $drp_value['number'] . ' ( Setup : ' . $did_setup . ')' . '( Monthly : ' . $did_cost . ' )';
 	  }
-        }
-        $data['didlist'] = form_dropdown_all(array("name"=>"free_didlist","id"=>"free_didlist","class"=>"did_dropdown"), $drp_list, '');
-        $this->load->view('view_user_did_list', $data);
-    }
-
-    function user_didlist_json() {
-        $account_data = $this->session->userdata("accountinfo");
-        if ($account_data['reseller_id'] != 0) {
-            $json_data = array();
-            $where = array('dids.accountid' => $account_data['id']);
-            $jionCondition = 'dids.number = reseller_pricing.note AND dids.parent_id = reseller_pricing.reseller_id';
-            $count_all = $this->db_model->getJionQueryCount("dids", '*', $where, "reseller_pricing", $jionCondition, 'inner');
-            $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-            $json_data = $paging_data["json_paging"];
-            $this->db_model->build_search('user_did_search');
-            $query = $this->db_model->getJionQuery("dids", 'reseller_pricing.setup,reseller_pricing.cost,reseller_pricing.last_modified_date,reseller_pricing.connectcost,reseller_pricing.inc,reseller_pricing.init_inc,reseller_pricing.includedseconds,reseller_pricing.monthlycost,dids.number,dids.id,dids.accountid,dids.extensions,dids.status,dids.provider_id,dids.allocation_bill_status,reseller_pricing.disconnectionfee,dids.dial_as,dids.call_type,dids.country_id', $where, "reseller_pricing", $jionCondition, 'inner', $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], "dids.id", "", '');
-        } else {
-            $json_data = array();
-            $where = array('accountid' => $account_data['id']);
-            $this->db_model->build_search('user_did_search');
-            $count_all = $this->db_model->countQuery("*", "dids", $where);
-            $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-            $json_data = $paging_data["json_paging"];
-            $this->db_model->build_search('user_did_search');
-            $query = $this->db_model->getSelect("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-        }
-        $did_grid_fields = json_decode($this->user_form->build_user_didlist());
-        $json_data['rows'] = $this->form->build_grid($query, $did_grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_did_country() {
-       $this->load->module('accounts/accounts');
-       $this->accounts->customer_did_country();
-    }
-
-    function user_didlist_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            $accountinfo=$this->session->userdata('accountinfo');
-            if($accountinfo['reseller_id'] > 0 && $action['call_type'] > 0){
-	      $action['dids.call_type']=$action['call_type'];
-	      unset($action['call_type']);
-            }
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('user_did_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_didlist/');
-        }
-    }
-
-    function user_didlist_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_did_search', "");
-    }
+		}
+		$data['didlist'] = form_dropdown_all(array("name"=>"free_didlist","id"=>"free_didlist","class"=>"did_dropdown"), $drp_list, '');
+		$this->load->view('view_user_did_list', $data);
+	}
+
+	function user_didlist_json() {
+		$account_data = $this->session->userdata("accountinfo");
+		if ($account_data['reseller_id'] != 0) {
+			$json_data = array();
+			$where = array('dids.accountid' => $account_data['id']);
+			$jionCondition = 'dids.number = reseller_pricing.note AND dids.parent_id = reseller_pricing.reseller_id';
+			$count_all = $this->db_model->getJionQueryCount("dids", '*', $where, "reseller_pricing", $jionCondition, 'inner');
+			$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+			$json_data = $paging_data["json_paging"];
+			$this->db_model->build_search('user_did_search');
+			$query = $this->db_model->getJionQuery("dids", 'reseller_pricing.setup,reseller_pricing.cost,reseller_pricing.last_modified_date,reseller_pricing.connectcost,reseller_pricing.inc,reseller_pricing.init_inc,reseller_pricing.includedseconds,reseller_pricing.monthlycost,dids.number,dids.id,dids.accountid,dids.extensions,dids.status,dids.provider_id,dids.allocation_bill_status,reseller_pricing.disconnectionfee,dids.dial_as,dids.call_type,dids.country_id', $where, "reseller_pricing", $jionCondition, 'inner', $paging_data["paging"]["page_no"], $paging_data["paging"]["start"], "dids.id", "", '');
+		} else {
+			$json_data = array();
+			$where = array('accountid' => $account_data['id']);
+			$this->db_model->build_search('user_did_search');
+			$count_all = $this->db_model->countQuery("*", "dids", $where);
+			$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+			$json_data = $paging_data["json_paging"];
+			$this->db_model->build_search('user_did_search');
+			$query = $this->db_model->getSelect("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
+		}
+		$did_grid_fields = json_decode($this->user_form->build_user_didlist());
+		$json_data['rows'] = $this->form->build_grid($query, $did_grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_did_country() {
+	   $this->load->module('accounts/accounts');
+	   $this->accounts->customer_did_country();
+	}
+
+	function user_didlist_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			$accountinfo=$this->session->userdata('accountinfo');
+			if($accountinfo['reseller_id'] > 0 && $action['call_type'] > 0){
+		  $action['dids.call_type']=$action['call_type'];
+		  unset($action['call_type']);
+			}
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('user_did_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_didlist/');
+		}
+	}
+
+	function user_didlist_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_did_search', "");
+	}
     
-    function user_ipmap(){
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_ipmap();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_ipmap_search());
-        $this->load->view('view_user_ipmap_list', $data);
-    }
+	function user_ipmap(){
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_ipmap();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_ipmap_search());
+		$this->load->view('view_user_ipmap_list', $data);
+	}
     
-    function user_ipmap_json(){
-        $json_data = array();
-        $account_data = $this->session->userdata("accountinfo");
-        $count_all = $this->user_model->user_ipmap_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->user_ipmap_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $ipmap_grid_fields = json_decode($this->user_form->build_user_ipmap());
-        $json_data['rows'] = $this->form->build_grid($query, $ipmap_grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_ipmap_search(){
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('user_ipmap_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_ipmap/');
-        }
-    }
+	function user_ipmap_json(){
+		$json_data = array();
+		$account_data = $this->session->userdata("accountinfo");
+		$count_all = $this->user_model->user_ipmap_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->user_ipmap_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$ipmap_grid_fields = json_decode($this->user_form->build_user_ipmap());
+		$json_data['rows'] = $this->form->build_grid($query, $ipmap_grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_ipmap_search(){
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('user_ipmap_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_ipmap/');
+		}
+	}
     
-    function user_ipmap_clearsearchfilter(){
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_ipmap_search', "");
-    }
+	function user_ipmap_clearsearchfilter(){
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_ipmap_search', "");
+	}
     
-    function user_ipmap_action($action='delete',$id=false){
-        $add_array=$this->input->post();
-        $accountinfo=$this->session->userdata('accountinfo');
-        if($action == 'add'){
-              $ip = $add_array['ip'];
-              if (strpos($ip, '/') !== false) {
-                 $add_array['ip'] = $add_array['ip'];
-              } else {
-                $add_array['ip'] = $add_array['ip'] . '/32';
-              }
-              $where = array("ip" => trim($add_array['ip']), "prefix" => trim($add_array['prefix']));
-              $getdata = $this->db_model->countQuery("*", "ip_map", $where);
-              if ($getdata > 0) {
-                $this->session->set_flashdata('astpp_notification', 'IP already exist in system.');
-              } else {
-                unset($add_array['action']);
-                $add_array['context'] = 'default';
-                $add_array['accountid'] = $accountinfo['id'];
-                $ip_flag = $this->db->insert("ip_map", $add_array);
-                if ($ip_flag) {
-                    $this->load->library('freeswitch_lib');
-                    $this->load->module('freeswitch/freeswitch');
-                    $command = "api reloadacl";
-                    $response = $this->freeswitch_model->reload_freeswitch($command);
-                    $this->session->set_userdata('astpp_notification', $response);
-                }
-                $this->session->set_flashdata('astpp_errormsg', 'IP Added Sucessfully.');
-            }
-            }
-        if($action =='delete'){
-            $this->db->delete('ip_map',array('id'=>$id));
-            $this->session->set_flashdata('astpp_notification', 'IP Removed Sucessfully.');
-        }
-        redirect(base_url()."user/user_ipmap/");
-    }
+	function user_ipmap_action($action='delete',$id=false){
+		$add_array=$this->input->post();
+		$accountinfo=$this->session->userdata('accountinfo');
+		if($action == 'add'){
+			  $ip = $add_array['ip'];
+			  if (strpos($ip, '/') !== false) {
+				 $add_array['ip'] = $add_array['ip'];
+			  } else {
+				$add_array['ip'] = $add_array['ip'] . '/32';
+			  }
+			  $where = array("ip" => trim($add_array['ip']), "prefix" => trim($add_array['prefix']));
+			  $getdata = $this->db_model->countQuery("*", "ip_map", $where);
+			  if ($getdata > 0) {
+				$this->session->set_flashdata('astpp_notification', 'IP already exist in system.');
+			  } else {
+				unset($add_array['action']);
+				$add_array['context'] = 'default';
+				$add_array['accountid'] = $accountinfo['id'];
+				$ip_flag = $this->db->insert("ip_map", $add_array);
+				if ($ip_flag) {
+					$this->load->library('freeswitch_lib');
+					$this->load->module('freeswitch/freeswitch');
+					$command = "api reloadacl";
+					$response = $this->freeswitch_model->reload_freeswitch($command);
+					$this->session->set_userdata('astpp_notification', $response);
+				}
+				$this->session->set_flashdata('astpp_errormsg', 'IP Added Sucessfully.');
+			}
+			}
+		if($action =='delete'){
+			$this->db->delete('ip_map',array('id'=>$id));
+			$this->session->set_flashdata('astpp_notification', 'IP Removed Sucessfully.');
+		}
+		redirect(base_url()."user/user_ipmap/");
+	}
     
-    function user_sipdevices() {
+	function user_sipdevices() {
 		$data['page_title'] = 'SIP Devices';
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_sipdevices();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_sipdevices_search());
-        $this->load->view('view_user_sipdevices_list', $data);
-    }
-
-    function user_sipdevices_json() {
-        $account_data = $this->session->userdata("accountinfo");
-        $json_data = array();
-        $count_all = $this->user_model->user_sipdevices_list(false, $account_data['id']);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $devices_result = array();
-        $query = $this->user_model->user_sipdevices_list(true,$account_data['id'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        foreach ($query as $key => $value) {
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_sipdevices();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_sipdevices_search());
+		$this->load->view('view_user_sipdevices_list', $data);
+	}
+
+	function user_sipdevices_json() {
+		$account_data = $this->session->userdata("accountinfo");
+		$json_data = array();
+		$count_all = $this->user_model->user_sipdevices_list(false, $account_data['id']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$devices_result = array();
+		$query = $this->user_model->user_sipdevices_list(true,$account_data['id'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		foreach ($query as $key => $value) {
 	$path_true = base_url().'/assets/images/true.png';
 	$path_false = base_url().'/assets/images/false.png';
 	$voicemail_enabled = $value['voicemail_enabled'] == 'true'? '<img src='.$path_true.' style="height:20px;width:20px;" title="Enable">' : '<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
-        $json_data['rows'][] = array('cell' => array(
-		    '<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value=' .$value['id'].'><lable class="lbl"></lable>',
-                    $value['username'],
-                    $value['password'],
-                    $value['effective_caller_id_name'],
-                    $value['effective_caller_id_number'],
-                    $this->common->get_status('status', 'sip_devices',$value),
-                    $this->common->convert_GMT_to('','',$value['creation_date']),
-                    $this->common->convert_GMT_to('','',$value['last_modified_date']),
-                    $voicemail_enabled,
-                    '<a href="'. base_url() .'user/user_sipdevices_edit/' . $value['id'] . '/" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;'.
-                    '<a href="'. base_url() .'user/user_sipdevices_delete/' .$value['id']. '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>'
-                    ));
-        }
-        echo json_encode($json_data);
-    }
-    function user_sipdevices_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('user_sipdevices_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_sipdevices/');
-        }
-    }
+		$json_data['rows'][] = array('cell' => array(
+			'<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value=' .$value['id'].'><lable class="lbl"></lable>',
+					$value['username'],
+					$value['password'],
+					$value['effective_caller_id_name'],
+					$value['effective_caller_id_number'],
+					$this->common->get_status('status', 'sip_devices',$value),
+					$this->common->convert_GMT_to('','',$value['creation_date']),
+					$this->common->convert_GMT_to('','',$value['last_modified_date']),
+					$voicemail_enabled,
+					'<a href="'. base_url() .'user/user_sipdevices_edit/' . $value['id'] . '/" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;'.
+					'<a href="'. base_url() .'user/user_sipdevices_delete/' .$value['id']. '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>'
+					));
+		}
+		echo json_encode($json_data);
+	}
+	function user_sipdevices_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('user_sipdevices_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_sipdevices/');
+		}
+	}
     
-    function user_sipdevices_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_sipdevices_search', "");
-    }
+	function user_sipdevices_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_sipdevices_search', "");
+	}
         
-    function user_sipdevices_add(){
-        $data['page_title'] = 'Create SIP Device';
-        $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form(),"");
-        $this->load->view('view_user_sipdevices_add_edit', $data);
-    }
-    function user_sipdevices_edit($edit_id=''){
-        $account_data = $this->session->userdata("accountinfo");
-        $data['page_title'] = 'Edit SIP Device';
-        $where = array('id' => $edit_id);
-        $sipdevice_info = $this->user_model->user_sipdevice_info($edit_id);
-        $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($edit_id), $sipdevice_info);
-        $this->load->view('view_user_sipdevices_add_edit', $data);
-    }
-    function user_sipdevices_save(){
-        $add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($add_array['id']), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit SIP Devices';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->user_model->user_sipdevice_edit($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> "SIP Device Updated Successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Create SIP Device';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->user_model->user_sipdevice_add($add_array);
-                echo json_encode(array("SUCCESS"=> "SIP Device Added Successfully!"));
-                exit;
-            }
-        }
-    }
-    function user_sipdevices_delete($id) {
-        $this->db->delete('sip_devices',array('id'=>$id));
-        $this->session->set_flashdata('astpp_notification', 'SIP Device Removed Sucessfully!');
-        redirect(base_url() . "user/user_sipdevices/");
-    }
+	function user_sipdevices_add(){
+		$data['page_title'] = 'Create SIP Device';
+		$data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form(),"");
+		$this->load->view('view_user_sipdevices_add_edit', $data);
+	}
+	function user_sipdevices_edit($edit_id=''){
+		$account_data = $this->session->userdata("accountinfo");
+		$data['page_title'] = 'Edit SIP Device';
+		$where = array('id' => $edit_id);
+		$sipdevice_info = $this->user_model->user_sipdevice_info($edit_id);
+		$data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($edit_id), $sipdevice_info);
+		$this->load->view('view_user_sipdevices_add_edit', $data);
+	}
+	function user_sipdevices_save(){
+		$add_array = $this->input->post();
+		$data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($add_array['id']), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit SIP Devices';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->user_model->user_sipdevice_edit($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> "SIP Device Updated Successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Create SIP Device';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->user_model->user_sipdevice_add($add_array);
+				echo json_encode(array("SUCCESS"=> "SIP Device Added Successfully!"));
+				exit;
+			}
+		}
+	}
+	function user_sipdevices_delete($id) {
+		$this->db->delete('sip_devices',array('id'=>$id));
+		$this->session->set_flashdata('astpp_notification', 'SIP Device Removed Sucessfully!');
+		redirect(base_url() . "user/user_sipdevices/");
+	}
     
-    function user_sipdevices_delete_multiple(){
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $this->db->delete("sip_devices",$where);
-        echo TRUE;    
-    }
+	function user_sipdevices_delete_multiple(){
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$this->db->delete("sip_devices",$where);
+		echo TRUE;    
+	}
     
-     function user_animap_list() {
+	 function user_animap_list() {
 		 $data['page_title'] = 'Caller ID';
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->user_form->build_user_animap();
-        $this->load->view('view_user_animap', $data);
-    }
-
-    function user_animap_list_json() {
-        $account_data = $this->session->userdata("accountinfo");
-        $json_data = array();
-        $where = array("accountid" => $account_data['id']);
-        $count_all = $this->db_model->countQuery("*", "ani_map", $where);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->db_model->select("*", "ani_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-        $grid_fields = json_decode($this->user_form->build_user_animap());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_animap_action($action, $aniid = "") {
-        $add_array = $this->input->post();
-        if ($action == "add" && $add_array['number'] != '') {
-            $this->db->where('number', $add_array['number']);
-            $this->db->select('count(id) as count');       
-            $cnt_result = $this->db->get('ani_map');
-            $cnt_result = $cnt_result->result_array();
-            $count = $cnt_result[0]['count'];
-            if ($count == 0) {
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->user_form->build_user_animap();
+		$this->load->view('view_user_animap', $data);
+	}
+
+	function user_animap_list_json() {
+		$account_data = $this->session->userdata("accountinfo");
+		$json_data = array();
+		$where = array("accountid" => $account_data['id']);
+		$count_all = $this->db_model->countQuery("*", "ani_map", $where);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->db_model->select("*", "ani_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
+		$grid_fields = json_decode($this->user_form->build_user_animap());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_animap_action($action, $aniid = "") {
+		$add_array = $this->input->post();
+		if ($action == "add" && $add_array['number'] != '') {
+			$this->db->where('number', $add_array['number']);
+			$this->db->select('count(id) as count');       
+			$cnt_result = $this->db->get('ani_map');
+			$cnt_result = $cnt_result->result_array();
+			$count = $cnt_result[0]['count'];
+			if ($count == 0) {
 				if($add_array['number'] != ""){
-                $accountinfo = $this->session->userdata("accountinfo");
-                $insert_arr = array("number" => $add_array['number'],
-                                    "accountid" => $accountinfo['id'],
-                                    "context" => "default"
-                                    );
-                $this->db->insert("ani_map", $insert_arr);
-                $this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
+				$accountinfo = $this->session->userdata("accountinfo");
+				$insert_arr = array("number" => $add_array['number'],
+									"accountid" => $accountinfo['id'],
+									"context" => "default"
+									);
+				$this->db->insert("ani_map", $insert_arr);
+				$this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
 				}else{
 					 $this->session->set_flashdata('astpp_notification', 'Please Enter Caller ID value.');
 				}
-            } else {
-                $this->session->set_flashdata('astpp_notification', ' Caller ID already Exists.');
-            }
-        }
-        if ($action == "delete") {
-            $this->session->set_flashdata('astpp_notification', 'Caller ID removed sucessfully!');
-            $this->db_model->delete("ani_map", array("id" => $aniid));
+			} else {
+				$this->session->set_flashdata('astpp_notification', ' Caller ID already Exists.');
+			}
+		}
+		if ($action == "delete") {
+			$this->session->set_flashdata('astpp_notification', 'Caller ID removed sucessfully!');
+			$this->db_model->delete("ani_map", array("id" => $aniid));
             
-        }
-        redirect(base_url() . "user/user_animap_list/");
-    }
+		}
+		redirect(base_url() . "user/user_animap_list/");
+	}
     
-    function user_alert_threshold() {
-        $data['page_title'] = 'Alert Threshold';
-        $accountinfo = $this->session->userdata("accountinfo");
-        $add_array = $this->input->post();
-        if (!empty($add_array)) {
-            unset($add_array['action'],$add_array['id']);
-            $this->user_model->edit_alert_threshold($add_array, $accountinfo['id']);
-            $this->session->set_flashdata('astpp_errormsg', 'Alert Threshold updated successfully!');
-            redirect(base_url() . 'user/user_alert_threshold/');
-        } else {
-            $where = array('id' => $accountinfo["id"]);
-            $account = $this->db_model->getSelect("notify_credit_limit,notify_flag,notify_email", "accounts", $where);
-            $data['form'] = $this->form->build_form($this->user_form->user_alert_threshold(),(array)$account->first_row());
-            $this->load->view('view_user_alert_threshold', $data);
-        }
-    }
+	function user_alert_threshold() {
+		$data['page_title'] = 'Alert Threshold';
+		$accountinfo = $this->session->userdata("accountinfo");
+		$add_array = $this->input->post();
+		if (!empty($add_array)) {
+			unset($add_array['action'],$add_array['id']);
+			$this->user_model->edit_alert_threshold($add_array, $accountinfo['id']);
+			$this->session->set_flashdata('astpp_errormsg', 'Alert Threshold updated successfully!');
+			redirect(base_url() . 'user/user_alert_threshold/');
+		} else {
+			$where = array('id' => $accountinfo["id"]);
+			$account = $this->db_model->getSelect("notify_credit_limit,notify_flag,notify_email", "accounts", $where);
+			$data['form'] = $this->form->build_form($this->user_form->user_alert_threshold(),(array)$account->first_row());
+			$this->load->view('view_user_alert_threshold', $data);
+		}
+	}
     
-    function user_cdrs_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $data['page_title'] = 'CDRs';
-        $data['search_flag'] = true;
-        $data["grid_buttons"] = $this->user_form->build_cdrs_report_buttons();
-        $data['grid_fields'] = $this->user_form->build_cdrs_report($accountinfo['type']);
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_cdrs_report_search($accountinfo['type']));
-        $this->load->view('view_user_cdrs_report', $data);
-    }
-
-    function user_cdrs_report_json() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
-        $count_res = $this->user_model->getuser_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
-        $paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->getuser_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
-        $grid_fields = json_decode($this->user_form->build_cdrs_report($accountinfo['type']));
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        if ($count_all['count'] > 0) {
-            $search_arr = $this->session->userdata('user_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
-            $json_data['rows'][] = array("cell" => array(
-                    "<b>Grand Total</b>",
-                    "",
-                    "",
-                    "",
-                    $duration,
-                    "<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
-                    "",
-                    "",
-                    ));
-        }
-        echo json_encode($json_data);
-    }
-
-    function user_cdrs_report_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            if (isset($action['debit']['debit']) && $action['debit']['debit'] != '') {
-                $action['debit']['debit'] = $this->common_model->add_calculate_currency($action['debit']['debit'], "", '', true, false);
-            }
-            $this->session->set_userdata('user_cdrs_report_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_cdrs_report/');
-        }
-    }
-
-    function user_cdrs_report_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_cdrs_report_search', "");
-    }
-
-    function user_cdrreport_export() {
+	function user_cdrs_report() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$data['page_title'] = 'CDRs';
+		$data['search_flag'] = true;
+		$data["grid_buttons"] = $this->user_form->build_cdrs_report_buttons();
+		$data['grid_fields'] = $this->user_form->build_cdrs_report($accountinfo['type']);
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_cdrs_report_search($accountinfo['type']));
+		$this->load->view('view_user_cdrs_report', $data);
+	}
+
+	function user_cdrs_report_json() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
+		$count_res = $this->user_model->getuser_cdrs_list(false, "", "");
+		$count_all = (array) $count_res->first_row();
+		$paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->getuser_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
+		$grid_fields = json_decode($this->user_form->build_cdrs_report($accountinfo['type']));
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		if ($count_all['count'] > 0) {
+			$search_arr = $this->session->userdata('user_cdrs_report_search');
+			$show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+			$duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
+			floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+			$json_data['rows'][] = array("cell" => array(
+					"<b>Grand Total</b>",
+					"",
+					"",
+					"",
+					$duration,
+					"<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
+					"",
+					"",
+					));
+		}
+		echo json_encode($json_data);
+	}
+
+	function user_cdrs_report_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			if (isset($action['debit']['debit']) && $action['debit']['debit'] != '') {
+				$action['debit']['debit'] = $this->common_model->add_calculate_currency($action['debit']['debit'], "", '', true, false);
+			}
+			$this->session->set_userdata('user_cdrs_report_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'user/user_cdrs_report/');
+		}
+	}
+
+	function user_cdrs_report_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_cdrs_report_search', "");
+	}
+
+	function user_cdrreport_export() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id=$account_info['currency_id'];
 		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-        $count_res = $this->user_model->getuser_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
-        ob_clean();
-        $customer_array[] = array("Date", "CallerID", "Called Number","Code", "Destination", "Duration", "Debit($currency)", "Disposition", "Call Type");
-        if ($count_all['count'] > 0) {
-            $query = $this->user_model->getuser_cdrs_list(true, '', '', true);
-            $currency_info = $this->common->get_currency_info();
-            $search_arr = $this->session->userdata('user_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            foreach ($query->result_array() as $value) {
-                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
-                                floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
-                $customer_array[] = array(
-                    $this->common->convert_GMT_to('', '', $value['callstart']),
-                    $value['callerid'],
-                    $value['callednum'],
-                    filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
-                    $value['notes'],
-                    $duration,
-                    $this->common->calculate_currency_manually($currency_info, $value['debit'],false),
-                    $value['disposition'],
-                    $value['calltype']
-                );
-            }
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-                            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
-            $customer_array[] = array("Grand Total",
-                "",
-                "",
-                "",
+		$count_res = $this->user_model->getuser_cdrs_list(false, "", "");
+		$count_all = (array) $count_res->first_row();
+		ob_clean();
+		$customer_array[] = array("Date", "CallerID", "Called Number","Code", "Destination", "Duration", "Debit($currency)", "Disposition", "Call Type");
+		if ($count_all['count'] > 0) {
+			$query = $this->user_model->getuser_cdrs_list(true, '', '', true);
+			$currency_info = $this->common->get_currency_info();
+			$search_arr = $this->session->userdata('user_cdrs_report_search');
+			$show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+			foreach ($query->result_array() as $value) {
+				$duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
+								floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
+				$customer_array[] = array(
+					$this->common->convert_GMT_to('', '', $value['callstart']),
+					$value['callerid'],
+					$value['callednum'],
+					filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
+					$value['notes'],
+					$duration,
+					$this->common->calculate_currency_manually($currency_info, $value['debit'],false),
+					$value['disposition'],
+					$value['calltype']
+				);
+			}
+			$duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
+							floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+			$customer_array[] = array("Grand Total",
+				"",
+				"",
+				"",
 		"",
-                $duration,
-                $this->common->calculate_currency_manually($currency_info, $count_all['total_debit']),
-                "",
-                ""
-            );
-        }
-        $this->load->helper('csv');
-        array_to_csv($customer_array, 'Customer_CDR_' . date("Y-m-d") . '.csv');
-    }
-    function user_payment($action=""){
-      if(common_model::$global_config['system_config']['paypal_status'] == 1){
-        redirect(base_url() . 'user/user/');  
-      }
-        $this->load->module("user/payment");
-        if($action=="GET_AMT"){
-            $amount = $this->input->post("value",true);
-            $this->payment->convert_amount($amount);
-        }else{
-            $this->payment->index();
-        }
-    }
+				$duration,
+				$this->common->calculate_currency_manually($currency_info, $count_all['total_debit']),
+				"",
+				""
+			);
+		}
+		$this->load->helper('csv');
+		array_to_csv($customer_array, 'Customer_CDR_' . date("Y-m-d") . '.csv');
+	}
+	function user_payment($action=""){
+	  if(common_model::$global_config['system_config']['paypal_status'] == 1){
+		redirect(base_url() . 'user/user/');  
+	  }
+		$this->load->module("user/payment");
+		if($action=="GET_AMT"){
+			$amount = $this->input->post("value",true);
+			$this->payment->convert_amount($amount);
+		}else{
+			$this->payment->index();
+		}
+	}
     
-    function user_fund_transfer(){
-        $data['page_title'] = 'Fund Transfer';
-        $accountinfo = $this->session->userdata('accountinfo');
-        $account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-        $currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
-        $data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), '');
-        $this->load->view('view_user_fund_transfer', $data);
-    }
+	function user_fund_transfer(){
+		$data['page_title'] = 'Fund Transfer';
+		$accountinfo = $this->session->userdata('accountinfo');
+		$account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
+		$currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
+		$data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), '');
+		$this->load->view('view_user_fund_transfer', $data);
+	}
     
-        function user_fund_transfer_save() {
-        $data['page_title'] = 'Fund Transfer';
-        $post_array = $this->input->post();
-        $accountinfo = $this->session->userdata('accountinfo');
-        $account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-        $currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
-        $data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), $post_array);
-        if ($this->form_validation->run() == FALSE) {
-            $data['validation_errors'] = validation_errors();
-        } else {
-            if (trim($post_array['fromaccountid']) != trim($post_array['toaccountid'])) {
-                $account_info = $this->session->userdata('accountinfo');
-                $balance = $this->common->get_field_name('balance', 'accounts', array('id' => $account_info['id'], 'status' => 0, 'type' => 0, 'deleted' => 0));                
-                $toid = $this->common->get_field_name('id', 'accounts', array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0));
-                $toaccountinfo=(array)$this->db->get_where('accounts',array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0),1)->first_row();
-                if($toaccountinfo){
-                $reseller_id = $toaccountinfo['reseller_id'];
-                $post_array['credit'] = $this->common_model->add_calculate_currency($post_array['credit'], '', '', false, false);
-                $minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
-                if ($post_array['toaccountid'] == $account_info['number']) {
-                    $this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
-                }
-                elseif ($reseller_id != $account_info['reseller_id']) {
-                    $this->session->set_flashdata('astpp_notification', 'You can only transfer fund in same level account.');
-                }
-                elseif ($post_array['toaccountid'] == '') {
-                    $this->session->set_flashdata('astpp_notification', 'Please enter To account number.');
-                }
-                elseif (empty($post_array['credit'])) {
-                    $this->session->set_flashdata('astpp_notification', 'Please enter a amount.');
-                }
-                elseif ($post_array['credit'] > $balance) {
-                    $this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
-                }
-                elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
-                    $this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
-                }
-                elseif ($post_array['credit'] < 0) {
-                    $this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
-                }
-                elseif ($minimum_fund['value'] >= $post_array['credit']) {
-                    $this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
-                }
-                elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
-                    $this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
-                }
-                elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
-                    $this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
-                }else{
-                    $from['id'] = $post_array['id'];
-                    $from['account_currency'] = $post_array['account_currency'];
-                    $from['accountid'] = $post_array['fromaccountid'];
-                    if ($account['posttoexternal'] == 1) {
-                        $from['credit'] = abs($post_array['credit']);
-                        $from['payment_type'] = '0';
-                    } else {
-                        $from['credit'] = abs($post_array['credit']);
-                        $from['payment_type'] = 'debit';
-                    }
-                    $from['posttoexternal'] = $account['posttoexternal'];
+		function user_fund_transfer_save() {
+		$data['page_title'] = 'Fund Transfer';
+		$post_array = $this->input->post();
+		$accountinfo = $this->session->userdata('accountinfo');
+		$account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
+		$currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
+		$data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), $post_array);
+		if ($this->form_validation->run() == FALSE) {
+			$data['validation_errors'] = validation_errors();
+		} else {
+			if (trim($post_array['fromaccountid']) != trim($post_array['toaccountid'])) {
+				$account_info = $this->session->userdata('accountinfo');
+				$balance = $this->common->get_field_name('balance', 'accounts', array('id' => $account_info['id'], 'status' => 0, 'type' => 0, 'deleted' => 0));                
+				$toid = $this->common->get_field_name('id', 'accounts', array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0));
+				$toaccountinfo=(array)$this->db->get_where('accounts',array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0),1)->first_row();
+				if($toaccountinfo){
+				$reseller_id = $toaccountinfo['reseller_id'];
+				$post_array['credit'] = $this->common_model->add_calculate_currency($post_array['credit'], '', '', false, false);
+				$minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
+				if ($post_array['toaccountid'] == $account_info['number']) {
+					$this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
+				}
+				elseif ($reseller_id != $account_info['reseller_id']) {
+					$this->session->set_flashdata('astpp_notification', 'You can only transfer fund in same level account.');
+				}
+				elseif ($post_array['toaccountid'] == '') {
+					$this->session->set_flashdata('astpp_notification', 'Please enter To account number.');
+				}
+				elseif (empty($post_array['credit'])) {
+					$this->session->set_flashdata('astpp_notification', 'Please enter a amount.');
+				}
+				elseif ($post_array['credit'] > $balance) {
+					$this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
+				}
+				elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
+					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
+				}
+				elseif ($post_array['credit'] < 0) {
+					$this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
+				}
+				elseif ($minimum_fund['value'] >= $post_array['credit']) {
+					$this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
+				}
+				elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
+					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
+				}
+				elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
+					$this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
+				}else{
+					$from['id'] = $post_array['id'];
+					$from['account_currency'] = $post_array['account_currency'];
+					$from['accountid'] = $post_array['fromaccountid'];
+					if ($account['posttoexternal'] == 1) {
+						$from['credit'] = abs($post_array['credit']);
+						$from['payment_type'] = '0';
+					} else {
+						$from['credit'] = abs($post_array['credit']);
+						$from['payment_type'] = 'debit';
+					}
+					$from['posttoexternal'] = $account['posttoexternal'];
                     
-                    $from['notes'] = $post_array['notes'];
-                    $from['action'] = 'save';
-                    $to['id'] = $toid;
-                    $to['account_currency'] = $post_array['account_currency'];
-                    $to['accountid'] = $post_array['toaccountid'];
-                    if ($toaccountinfo['posttoexternal'] == 0) {
-                        $to['credit'] = abs($post_array['credit']);
-                        $to['payment_type'] = '0';
-                    } else {
-                        $to['credit'] = abs($post_array['credit']);
-                        $to['payment_type'] = 'debit';
-                    }
-                    $to['notes'] = $post_array['notes'];
-                    $to['action'] = 'save';
-                    $response = $this->user_model->user_fund_transfer($from);
-                    if ($response) {
-                        $toresponse = $this->user_model->user_fund_transfer($to);
-                        $this->session->set_flashdata('astpp_errormsg', 'Transfer success!');
-                    } else {
-                        $this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
-                    }
-                }
-            }else{
+					$from['notes'] = $post_array['notes'];
+					$from['action'] = 'save';
+					$to['id'] = $toid;
+					$to['account_currency'] = $post_array['account_currency'];
+					$to['accountid'] = $post_array['toaccountid'];
+					if ($toaccountinfo['posttoexternal'] == 0) {
+						$to['credit'] = abs($post_array['credit']);
+						$to['payment_type'] = '0';
+					} else {
+						$to['credit'] = abs($post_array['credit']);
+						$to['payment_type'] = 'debit';
+					}
+					$to['notes'] = $post_array['notes'];
+					$to['action'] = 'save';
+					$response = $this->user_model->user_fund_transfer($from);
+					if ($response) {
+						$toresponse = $this->user_model->user_fund_transfer($to);
+						$this->session->set_flashdata('astpp_errormsg', 'Transfer success!');
+					} else {
+						$this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
+					}
+				}
+			}else{
 		$this->session->set_flashdata('astpp_notification', 'Account number not found.');
-            }
-            } else {
-                $this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
-            }
-            redirect(base_url() . 'user/user_fund_transfer/');
-        }
-        $this->load->view('view_user_fund_transfer', $data);
-    }
-    function user_opensips() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Opensips List';
-        $data['search_flag'] = true;
-        $data["fs_grid_buttons"] = $this->user_form->build_user_opensips_buttons();
-        $data['grid_fields'] = $this->user_form->build_user_opensips();
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_opensips_search());
-        $this->load->view('view_opensips_list', $data);
-    }
-
-    function user_opensips_json() {
-        $accountinfo = $this->session->userdata("accountinfo");
-        $json_data = array();
-        $count_all = $this->user_model->get_user_opensips(false, $accountinfo['number']);
-        $paging_data = $this->form->load_grid_config($count_all,$_GET['rp'],$_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->get_user_opensips(true, $accountinfo['number'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->user_form->build_user_opensips());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
-
-    function user_opensips_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_opensips_search', "");
-    }
-
-    function user_opensips_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('user_opensips_search', $action);
-        }
-        if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_opensips/');
-        }
-    }
-
-    function user_opensips_add() {
+			}
+			} else {
+				$this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
+			}
+			redirect(base_url() . 'user/user_fund_transfer/');
+		}
+		$this->load->view('view_user_fund_transfer', $data);
+	}
+	function user_opensips() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Opensips List';
+		$data['search_flag'] = true;
+		$data["fs_grid_buttons"] = $this->user_form->build_user_opensips_buttons();
+		$data['grid_fields'] = $this->user_form->build_user_opensips();
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_opensips_search());
+		$this->load->view('view_opensips_list', $data);
+	}
+
+	function user_opensips_json() {
+		$accountinfo = $this->session->userdata("accountinfo");
+		$json_data = array();
+		$count_all = $this->user_model->get_user_opensips(false, $accountinfo['number']);
+		$paging_data = $this->form->load_grid_config($count_all,$_GET['rp'],$_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->get_user_opensips(true, $accountinfo['number'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->user_form->build_user_opensips());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
+
+	function user_opensips_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_opensips_search', "");
+	}
+
+	function user_opensips_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('user_opensips_search', $action);
+		}
+		if ($ajax_search != 1) {
+			redirect(base_url() . 'user/user_opensips/');
+		}
+	}
+
+	function user_opensips_add() {
 	$accountinfo = $this->session->userdata("accountinfo");
-        $data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Create Opensips';
-        $data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form(), '');
-        $this->load->view('view_opensips_add_edit', $data);
-    }
+		$data['username'] = $this->session->userdata('user_name');
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Create Opensips';
+		$data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form(), '');
+		$this->load->view('view_opensips_add_edit', $data);
+	}
     
-    function user_opensips_edit($edit_id){
+	function user_opensips_edit($edit_id){
 	$data['page_title'] = 'Edit Opensips';
-        $db_config = Common_model::$global_config['system_config'];
-        $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-        $this->opensips_db = $this->load->database($opensipdsn, true);
-        $where = array('id' => $edit_id);
-        $this->opensips_db->where($where);
-        $account = $this->opensips_db->get("subscriber");
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form($edit_id), $edit_data);
-        $this->load->view('view_opensips_add_edit', $data);
+		$db_config = Common_model::$global_config['system_config'];
+		$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+		$this->opensips_db = $this->load->database($opensipdsn, true);
+		$where = array('id' => $edit_id);
+		$this->opensips_db->where($where);
+		$account = $this->opensips_db->get("subscriber");
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form($edit_id), $edit_data);
+		$this->load->view('view_opensips_add_edit', $data);
     
-    }
+	}
     
-    function user_opensips_save(){
+	function user_opensips_save(){
 	$add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Opensips';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $auth_flag = $this->validate_device_data($add_array);
-                if($auth_flag == "TRUE"){
-                        $this->user_model->user_opensips_edit($add_array, $add_array['id']);
-                        echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
-                        exit;
-                }else{
-                       echo json_encode($auth_flag);
-                       exit;
-                }
-            }
-        } else {
-            $data['page_title'] = 'Add Opensips';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $auth_flag = $this->validate_device_data($add_array);
-                if($auth_flag == "TRUE"){
-                        $this->user_model->user_opensips_add($add_array);
-                        echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
-                        exit;
-                }else{
-                       echo json_encode($auth_flag);
-                        exit;
-                }
-            }
-        }
-    }
-    function validate_device_data($data){
-        if(isset($data["username"]) && $data["username"] != ""){
-                $db_config = Common_model::$global_config['system_config'];
-                $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-                $this->opensips_db = $this->load->database($opensipdsn, true);
-                $where = array("username"=>$data["username"]);
-                if($data['id'] != ""){
-                    $this->opensips_db->where("id <>",$data['id']);
-                }
-                $this->opensips_db->where($where);
-                $auth_flag = $this->opensips_db->get("subscriber");
-                $auth_flag = $auth_flag->num_rows();
-                if($auth_flag == 0){
-                    return "TRUE";
-                }else{
-                    return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
-                }
-        }else{
-          return array("username_error"=>"User name is required field.");
-        }
-        return "0";
-    }
+		$data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Opensips';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$auth_flag = $this->validate_device_data($add_array);
+				if($auth_flag == "TRUE"){
+						$this->user_model->user_opensips_edit($add_array, $add_array['id']);
+						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
+						exit;
+				}else{
+					   echo json_encode($auth_flag);
+					   exit;
+				}
+			}
+		} else {
+			$data['page_title'] = 'Add Opensips';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$auth_flag = $this->validate_device_data($add_array);
+				if($auth_flag == "TRUE"){
+						$this->user_model->user_opensips_add($add_array);
+						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
+						exit;
+				}else{
+					   echo json_encode($auth_flag);
+						exit;
+				}
+			}
+		}
+	}
+	function validate_device_data($data){
+		if(isset($data["username"]) && $data["username"] != ""){
+				$db_config = Common_model::$global_config['system_config'];
+				$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+				$this->opensips_db = $this->load->database($opensipdsn, true);
+				$where = array("username"=>$data["username"]);
+				if($data['id'] != ""){
+					$this->opensips_db->where("id <>",$data['id']);
+				}
+				$this->opensips_db->where($where);
+				$auth_flag = $this->opensips_db->get("subscriber");
+				$auth_flag = $auth_flag->num_rows();
+				if($auth_flag == 0){
+					return "TRUE";
+				}else{
+					return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
+				}
+		}else{
+		  return array("username_error"=>"User name is required field.");
+		}
+		return "0";
+	}
     
-    function user_opensips_delete($id){
-      $this->user_model->user_opensips_delete($id);
-      $this->session->set_flashdata('astpp_errormsg', 'Opensips Device Removed Successfully!.');
-      redirect(base_url() . "user/user_opensips/");
-    }
-    function user_opensips_delete_multiple(){
-      $db_config = Common_model::$global_config['system_config'];
-      $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
-      $this->opensips_db = $this->load->database($opensipdsn, true);
-      $ids = $this->input->post("selected_ids", true);
-      $where = "id IN ($ids)";
-      $this->opensips_db->where($where);
-      $this->opensips_db->delete("subscriber");
-      echo TRUE;
-    }
+	function user_opensips_delete($id){
+	  $this->user_model->user_opensips_delete($id);
+	  $this->session->set_flashdata('astpp_errormsg', 'Opensips Device Removed Successfully!.');
+	  redirect(base_url() . "user/user_opensips/");
+	}
+	function user_opensips_delete_multiple(){
+	  $db_config = Common_model::$global_config['system_config'];
+	  $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+	  $this->opensips_db = $this->load->database($opensipdsn, true);
+	  $ids = $this->input->post("selected_ids", true);
+	  $where = "id IN ($ids)";
+	  $this->opensips_db->where($where);
+	  $this->opensips_db->delete("subscriber");
+	  echo TRUE;
+	}
     
-    function user_cdrs(){
-      $data['username'] = $this->session->userdata('user_name');
-      $accountinfo=$this->session->userdata('accountinfo');
-      $data['page_title'] = 'CDRs';
-      $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
-      $this->load->module('reports/reports');
-      $data['grid_fields'] = $this->reports->reports_form->build_report_list_for_user($accounttype);
-      $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_opensips_search());
-      $data['accounttype']=$accounttype;
-      $this->load->view('view_user_cdrs', $data);    
-    }
-    function user_cdrs_json(){
-      $accountinfo=$this->session->userdata('accountinfo');
-      $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
-      $this->load->module('reports/reports');
-      $this->reports->customer_cdrreport($accountinfo['id'], $accounttype);     
-    }
-    function user_details_search($module_name){
-        $action = $this->input->post();
-        $this->session->set_userdata('left_panel_search_'.$module_name,"");
-        if(!empty($action['left_panel_search'])){
-            $this->session->set_userdata('left_panel_search_'.$module_name, $action['left_panel_search']);
-	}
-    }
-
-    function user_provider_report_export() {
-        $this->load->module('reports/reports');
-        $this->provider_cdrreport_export();
-    }
+	function user_cdrs(){
+	  $data['username'] = $this->session->userdata('user_name');
+	  $accountinfo=$this->session->userdata('accountinfo');
+	  $data['page_title'] = 'CDRs';
+	  $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
+	  $this->load->module('reports/reports');
+	  $data['grid_fields'] = $this->reports->reports_form->build_report_list_for_user($accounttype);
+	  $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_opensips_search());
+	  $data['accounttype']=$accounttype;
+	  $this->load->view('view_user_cdrs', $data);    
+	}
+	function user_cdrs_json(){
+	  $accountinfo=$this->session->userdata('accountinfo');
+	  $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
+	  $this->load->module('reports/reports');
+	  $this->reports->customer_cdrreport($accountinfo['id'], $accounttype);     
+	}
+	function user_details_search($module_name){
+		$action = $this->input->post();
+		$this->session->set_userdata('left_panel_search_'.$module_name,"");
+		if(!empty($action['left_panel_search'])){
+			$this->session->set_userdata('left_panel_search_'.$module_name, $action['left_panel_search']);
+	}
+	}
+
+	function user_provider_report_export() {
+		$this->load->module('reports/reports');
+		$this->provider_cdrreport_export();
+	}
     
     
-    function user_provider_cdrs_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $data['page_title'] = 'Provider CDRs Report';
-        $data['search_flag'] = true;
-        $data["grid_buttons"] = $this->user_form->build_provider_report_buttons();
-        $data['grid_fields'] = $this->user_form->build_provider_report($accountinfo['type']);
-        $data['form_search'] = $this->form->build_serach_form($this->user_form->build_provider_report_search($accountinfo['type']));
-        $this->load->view('view_provider_cdrs_report', $data);
-    }
-
-    function user_provider_cdrs_report_json() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
-        $count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
-        $paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->user_model->getprovider_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
-        $grid_fields = json_decode($this->user_form->build_provider_report($accountinfo['type']));
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        if ($count_all['count'] > 0) {
-            $search_arr = $this->session->userdata('user_provider_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
-            $json_data['rows'][] = array("cell" => array(
-                    "<b>Grand Total</b>",
-                    "",
-                    "",
-                    "",
-                    $duration,
-                    "<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
-                    "",
-                    "",
-                    ));
-        }
-        echo json_encode($json_data);
-    }
-
-    function user_provider_cdrs_report_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-             if (isset($action['cost']['cost']) && $action['cost']['cost'] != '') {
-                $action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-            }
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('user_provider_cdrs_report_search', $action);
-        }
-        if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_provider_cdrs_report/');
-        }
-    }
-
-    function user_provider_cdrs_report_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('user_provider_cdrs_report_search', "");
-    }
-
-    function user_provider_cdrreport_export() {
+	function user_provider_cdrs_report() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$data['page_title'] = 'Provider CDRs Report';
+		$data['search_flag'] = true;
+		$data["grid_buttons"] = $this->user_form->build_provider_report_buttons();
+		$data['grid_fields'] = $this->user_form->build_provider_report($accountinfo['type']);
+		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_provider_report_search($accountinfo['type']));
+		$this->load->view('view_provider_cdrs_report', $data);
+	}
+
+	function user_provider_cdrs_report_json() {
+		$accountinfo=$this->session->userdata('accountinfo');
+		$variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
+		$count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
+		$count_all = (array) $count_res->first_row();
+		$paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->user_model->getprovider_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
+		$grid_fields = json_decode($this->user_form->build_provider_report($accountinfo['type']));
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		if ($count_all['count'] > 0) {
+			$search_arr = $this->session->userdata('user_provider_cdrs_report_search');
+			$show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+			$duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
+			floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+			$json_data['rows'][] = array("cell" => array(
+					"<b>Grand Total</b>",
+					"",
+					"",
+					"",
+					$duration,
+					"<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
+					"",
+					"",
+					));
+		}
+		echo json_encode($json_data);
+	}
+
+	function user_provider_cdrs_report_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			 if (isset($action['cost']['cost']) && $action['cost']['cost'] != '') {
+				$action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
+			}
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('user_provider_cdrs_report_search', $action);
+		}
+		if ($ajax_search != 1) {
+			redirect(base_url() . 'user/user_provider_cdrs_report/');
+		}
+	}
+
+	function user_provider_cdrs_report_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('user_provider_cdrs_report_search', "");
+	}
+
+	function user_provider_cdrreport_export() {
 	$account_info = $accountinfo = $this->session->userdata('accountinfo');
 	$currency_id=$account_info['currency_id'];
 	$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-        $count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
-        ob_clean();
-        $customer_array[] = array("Date", "CallerID", "Called Number", "Destination", "Duration", "Cost($currency)", "Disposition", "Call Type");
-        if ($count_all['count'] > 0) {
-            $query = $this->user_model->getuser_cdrs_list(true, '', '', true);
-            $currency_info = $this->common->get_currency_info();
-            $search_arr = $this->session->userdata('user_provider_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            foreach ($query->result_array() as $value) {
-                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
-                floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
-                $customer_array[] = array(
-                    $this->common->convert_GMT_to('', '', $value['callstart']),
-                    $value['callerid'],
-                    $value['callednum'],
-                    filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
-                    $duration,
-                    $this->common->calculate_currency_manually($currency_info, $value['cost'],false),
-                    $value['disposition'],
-                    $value['calltype']
-                );
-            }
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
-            $customer_array[] = array("Grand Total",
-                "",
-                "",
-                "",
-                $duration,
-                $this->common->calculate_currency_manually($currency_info, $count_all['total_cost'],false,true),
-                "",
-                ""
-            );
-        }
-        $this->load->helper('csv');
-        array_to_csv($customer_array, 'Provider_CDR_' . date("Y-m-d") . '.csv');
-    }
-    function user_speeddial(){
-        $data['page_title'] = "Speed Dial";
-        $accountinfo = $this->session->userdata('accountinfo');
-        $where = array('id' => $accountinfo['id'], "reseller_id" => $accountinfo['reseller_id']);
-        $account = $this->db_model->getSelect("*", "accounts", $where);
+		$count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
+		$count_all = (array) $count_res->first_row();
+		ob_clean();
+		$customer_array[] = array("Date", "CallerID", "Called Number", "Destination", "Duration", "Cost($currency)", "Disposition", "Call Type");
+		if ($count_all['count'] > 0) {
+			$query = $this->user_model->getuser_cdrs_list(true, '', '', true);
+			$currency_info = $this->common->get_currency_info();
+			$search_arr = $this->session->userdata('user_provider_cdrs_report_search');
+			$show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+			foreach ($query->result_array() as $value) {
+				$duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
+				floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
+				$customer_array[] = array(
+					$this->common->convert_GMT_to('', '', $value['callstart']),
+					$value['callerid'],
+					$value['callednum'],
+					filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
+					$duration,
+					$this->common->calculate_currency_manually($currency_info, $value['cost'],false),
+					$value['disposition'],
+					$value['calltype']
+				);
+			}
+			$duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
+			floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+			$customer_array[] = array("Grand Total",
+				"",
+				"",
+				"",
+				$duration,
+				$this->common->calculate_currency_manually($currency_info, $count_all['total_cost'],false,true),
+				"",
+				""
+			);
+		}
+		$this->load->helper('csv');
+		array_to_csv($customer_array, 'Provider_CDR_' . date("Y-m-d") . '.csv');
+	}
+	function user_speeddial(){
+		$data['page_title'] = "Speed Dial";
+		$accountinfo = $this->session->userdata('accountinfo');
+		$where = array('id' => $accountinfo['id'], "reseller_id" => $accountinfo['reseller_id']);
+		$account = $this->db_model->getSelect("*", "accounts", $where);
 	if ($account->num_rows() > 0) {
 	$account_data = (array) $account->first_row();
 	$speeddial_res = $this->db->get_where("speed_dial", array("accountid" => $accountinfo['id']));
 	$speeddial_info = array();
-        if ($speeddial_res->num_rows() > 0) {
-          $speeddial_res = $speeddial_res->result_array();
-          foreach ($speeddial_res as $key => $value) {
-            $speeddial_info[$value['speed_num']] = $value['number'];
-          }
-        }
-        $data['speeddial'] = $speeddial_info;
+		if ($speeddial_res->num_rows() > 0) {
+		  $speeddial_res = $speeddial_res->result_array();
+		  foreach ($speeddial_res as $key => $value) {
+			$speeddial_info[$value['speed_num']] = $value['number'];
+		  }
+		}
+		$data['speeddial'] = $speeddial_info;
 	$this->load->view('view_user_speeddial', $data);
 	}else{
 	 redirect(base_url.'user/user/');
 	}
-      }
+	  }
       
-      function user_speeddial_save(){
-          $add_array= $this->input->post();
-          $accountinfo=$this->session->userdata('accountinfo');
-          $where = array("accountid" => $accountinfo['id']);
+	  function user_speeddial_save(){
+		  $add_array= $this->input->post();
+		  $accountinfo=$this->session->userdata('accountinfo');
+		  $where = array("accountid" => $accountinfo['id']);
 	  $this->db->select('count(id) as count');
 	  $this->db->where($where);
 	  $speed_dial_result = (array)$this->db->get('speed_dial')->first_row();
 	  if ($speed_dial_result['count'] == 0) {
-            for ($i = 0; $i <= 9; $i++) {
-                $dest_number = $add_array['number'] == $i ? $add_array['destination'] : '';
-                $data[$i] = array("number" => $dest_number, "speed_num" => $i, 'accountid' => $accountinfo['id']);
-            }
-            $this->db->insert_batch('speed_dial', $data);
+			for ($i = 0; $i <= 9; $i++) {
+				$dest_number = $add_array['number'] == $i ? $add_array['destination'] : '';
+				$data[$i] = array("number" => $dest_number, "speed_num" => $i, 'accountid' => $accountinfo['id']);
+			}
+			$this->db->insert_batch('speed_dial', $data);
 	  } else {
-            $this->db->where('speed_num', $add_array['number']);
-            $this->db->where('accountid', $accountinfo['id']);
-            $result = $this->db->update('speed_dial', array('number' => $add_array['destination']));
+			$this->db->where('speed_num', $add_array['number']);
+			$this->db->where('accountid', $accountinfo['id']);
+			$result = $this->db->update('speed_dial', array('number' => $add_array['destination']));
 	  }
-    }
-    function user_speeddial_remove() {
+	}
+	function user_speeddial_remove() {
 	$accountinfo=$this->session->userdata('accountinfo');
 	$add_array=$this->input->post();
-        $updateinfo = array('number' => '');
-        $this->db->where('speed_num', $add_array['number']);
-        $this->db->where('accountid', $accountinfo['id']);
-        $result = $this->db->update('speed_dial', $updateinfo);
-    }
+		$updateinfo = array('number' => '');
+		$this->db->where('speed_num', $add_array['number']);
+		$this->db->where('accountid', $accountinfo['id']);
+		$result = $this->db->update('speed_dial', $updateinfo);
+	}
 }
 
 ?>

Spacing +393 added lines, -393 removed lines

@@ -37,31 +37,31 @@ 
 
     function index() {
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . 'login/login');
+            redirect(base_url().'login/login');
         $data['page_title'] = 'Dashboard';
         $this->load->view('view_user_dashboard', $data);
     }
 
     function user_dashboard_recent_payments() {
-        $result=$this->user_model->user_dashboard_recent_recharge_info();
-	$gmtoffset=$this->common->get_timezone_offset();
-        $i=0;
-        $json_data=array();
-        if($result->num_rows() > 0)
+        $result = $this->user_model->user_dashboard_recent_recharge_info();
+	$gmtoffset = $this->common->get_timezone_offset();
+        $i = 0;
+        $json_data = array();
+        if ($result->num_rows() > 0)
 	{
-		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
-		 $json_data[0]['accountid']='Accounts';
-		 $json_data[0]['credit']='Amount';
-		 $json_data[0]['payment_date']='Date';
-		 $json_data[0]['notes']='Notes';
-		 foreach($result->result_array() as $key=>$data){
-		      $current_timestamp=strtotime($data['payment_date']);
-		      $modified_date=$current_timestamp+$gmtoffset;
-          	      $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-		      $json_data[$i]['accountid']=$data['accountid'];
-		      $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
-		      $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
-		       $json_data[$i]['notes']=$data['notes'];
+		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', '');
+		 $json_data[0]['accountid'] = 'Accounts';
+		 $json_data[0]['credit'] = 'Amount';
+		 $json_data[0]['payment_date'] = 'Date';
+		 $json_data[0]['notes'] = 'Notes';
+		 foreach ($result->result_array() as $key=>$data) {
+		      $current_timestamp = strtotime($data['payment_date']);
+		      $modified_date = $current_timestamp + $gmtoffset;
+          	      $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+		      $json_data[$i]['accountid'] = $data['accountid'];
+		      $json_data[$i]['credit'] = $this->common_model->calculate_currency($data['credit'], '', '', true, false);
+		      $json_data[$i]['payment_date'] = date('Y-m-d H:i:s', strtotime($data['payment_date']) + $gmtoffset);
+		       $json_data[$i]['notes'] = $data['notes'];
 		      $i++;
           	}
           }
@@ -91,7 +91,7 @@ 
     }   
     function user_dashboard_invoices_data() {
         $accountinfo = $this->session->userdata('accountinfo');
-        $currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
+        $currency = $this->common->get_field_name('currency', 'currency', array("id"=>$accountinfo['currency_id']));
         $this->db->where('accountid', $accountinfo['id']);
         $this->db->where('confirm', 1);
         $this->db->select('*');
@@ -109,20 +109,20 @@ 
             $json_data[0]['inv_type'] = 'Recharge Type';
             $i = 1;
             foreach ($result as $key => $data) {
-	        $invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$data['id']));
+	        $invoice_prefix = $entity_type = $this->common->get_field_name('invoice_prefix', 'invoices', array('id'=>$data['id']));
 
-	        $invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$data['id']));
-			$invoice_num=$invoice_prefix.$invoiceid;
-			$inv_type=$this->common->get_invoice_total('item_type', '', $data['id']);
-			if($inv_type == ''){
-			  $inv_type='Automatically';
+	        $invoiceid = $entity_type = $this->common->get_field_name('invoiceid', 'invoices', array('id'=>$data['id']));
+			$invoice_num = $invoice_prefix.$invoiceid;
+			$inv_type = $this->common->get_invoice_total('item_type', '', $data['id']);
+			if ($inv_type == '') {
+			  $inv_type = 'Automatically';
 			}
-			if($inv_type == 'manual_inv'){
-			  $inv_type='Manually';
+			if ($inv_type == 'manual_inv') {
+			  $inv_type = 'Manually';
 			}
-			$inv_debit=$this->common->get_invoice_total('debit', '', $data['id']);
-			if($inv_debit == ''){
-			  $inv_debit=$this->common->convert_to_currency('', '',0);
+			$inv_debit = $this->common->get_invoice_total('debit', '', $data['id']);
+			if ($inv_debit == '') {
+			  $inv_debit = $this->common->convert_to_currency('', '', 0);
 			}
 			$json_data[$i]['type'] = $data['type'];
 			$json_data[$i]['id'] = $invoice_num;
@@ -136,54 +136,54 @@ 
         echo json_encode($json_data);
     }
     
-    function user_dashboard_subscription_data(){
-		$accountinfo=$this->session->userdata('accountinfo');
-		$this->db->where('accountid',$accountinfo['id']);
+    function user_dashboard_subscription_data() {
+		$accountinfo = $this->session->userdata('accountinfo');
+		$this->db->where('accountid', $accountinfo['id']);
 		$this->db->select('*');
-		$this->db->order_by('assign_date','desc');
-		$result=$this->db->get('charge_to_account',10);
-		$json_data=array();
+		$this->db->order_by('assign_date', 'desc');
+		$result = $this->db->get('charge_to_account', 10);
+		$json_data = array();
       
-		$gmtoffset=$this->common->get_timezone_offset();
-		if($result->num_rows()> 0 ){
-		$result=$result->result_array();
-		$charge_str=null;
-		$charges_arr=array();
-		foreach($result as $charges_data){
-			$charge_str.=$charges_data['charge_id'].",";
+		$gmtoffset = $this->common->get_timezone_offset();
+		if ($result->num_rows() > 0) {
+		$result = $result->result_array();
+		$charge_str = null;
+		$charges_arr = array();
+		foreach ($result as $charges_data) {
+			$charge_str .= $charges_data['charge_id'].",";
 		}
-		$charge_str=rtrim($charge_str,",");
+		$charge_str = rtrim($charge_str, ",");
 		$where = "id IN ($charge_str)";
 		$this->db->where($where);
 		$this->db->select('id,description,sweep_id');
-		$charge_result=$this->db->get('charges');
-		foreach($charge_result->result_array() as $data){
-			$charges_arr[$data['id']]['description']=$data['description'];
-			$charges_arr[$data['id']]['sweep_id']=$data['sweep_id'];
+		$charge_result = $this->db->get('charges');
+		foreach ($charge_result->result_array() as $data) {
+			$charges_arr[$data['id']]['description'] = $data['description'];
+			$charges_arr[$data['id']]['sweep_id'] = $data['sweep_id'];
 		}
-		$json_data[0]['charge_id']='Charge Name';
-		$json_data[0]['assign_date']='Assign Date';
-		$json_data[0]['sweep_id']='Billing Cycle';
-		$i=1;
-		foreach($result as $key=>$data){
-		if(isset($charges_arr[$data['charge_id']]['sweep_id'])){
-			$sweep_id= $charges_arr[$data['charge_id']]['sweep_id'];
+		$json_data[0]['charge_id'] = 'Charge Name';
+		$json_data[0]['assign_date'] = 'Assign Date';
+		$json_data[0]['sweep_id'] = 'Billing Cycle';
+		$i = 1;
+		foreach ($result as $key=>$data) {
+		if (isset($charges_arr[$data['charge_id']]['sweep_id'])) {
+			$sweep_id = $charges_arr[$data['charge_id']]['sweep_id'];
 		}
-		$data['charge_id'] =isset($charges_arr[$data['charge_id']]['description']) ? $charges_arr[$data['charge_id']]['description'] :"Anonymous";
-		$json_data[$i]['charge_id']=$data['charge_id'];
-		if($data['assign_date'] != '0000-00-00 00:00:00'){
-			$json_data[$i]['assign_date']=date('Y-m-d H:i:s',strtotime($data['assign_date'])+$gmtoffset);
-		}else{
-			$json_data[$i]['assign_date']=$data['assign_date'];
+		$data['charge_id'] = isset($charges_arr[$data['charge_id']]['description']) ? $charges_arr[$data['charge_id']]['description'] : "Anonymous";
+		$json_data[$i]['charge_id'] = $data['charge_id'];
+		if ($data['assign_date'] != '0000-00-00 00:00:00') {
+			$json_data[$i]['assign_date'] = date('Y-m-d H:i:s', strtotime($data['assign_date']) + $gmtoffset);
+		} else {
+			$json_data[$i]['assign_date'] = $data['assign_date'];
 		}
-		if(isset($sweep_id)){
-			if($sweep_id ==0){
-				$json_data[$i]['sweep_id']='Daily';
-			}else{
-				$json_data[$i]['sweep_id']='Monthly';			
+		if (isset($sweep_id)) {
+			if ($sweep_id == 0) {
+				$json_data[$i]['sweep_id'] = 'Daily';
+			} else {
+				$json_data[$i]['sweep_id'] = 'Monthly';			
 			}
-		}else{
-			$json_data[$i]['sweep_id']='Anonymous';
+		} else {
+			$json_data[$i]['sweep_id'] = 'Anonymous';
 		}
 		$i++;
 		}
@@ -194,7 +194,7 @@ 
     function user_edit_account() {
         if ($add_array['id'] != '') {
             $data['form'] = $this->form->build_form($this->accounts->accounts_form->get_user_form_fields($add_array['id']), $add_array);
-            $data['page_title'] = 'Edit ' . $entity_name;
+            $data['page_title'] = 'Edit '.$entity_name;
             if ($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
             } else {
@@ -203,14 +203,14 @@ 
                 $this->accounts->accounts_model->edit_account($add_array, $add_array['id']);
                 $accountinfo = $this->session->userdata('accountinfo');
                 if ($add_array['id'] == $accountinfo['id']) {
-                    $this->session->set_userdata('accountinfo',(array)$this->db->get_where('accounts', array('id' => $add_array['id']))->first_row());
+                    $this->session->set_userdata('accountinfo', (array)$this->db->get_where('accounts', array('id' => $add_array['id']))->first_row());
                 }
-                $this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name) . ' updated successfully!');
-                redirect(base_url() . 'user/user/');
+                $this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name).' updated successfully!');
+                redirect(base_url().'user/user/');
             }
             $this->load->view('view_user_details', $data);
         } else {
-            $data['page_title'] = 'Edit ' . $entity_name;
+            $data['page_title'] = 'Edit '.$entity_name;
             $where = array('id' => $account_data["id"]);
             $account = $this->db_model->getSelect("*", "accounts", $where);
             $data["account_data"] = $account->result_array();
@@ -227,52 +227,52 @@ 
     function user_did_edit($edit_id = '') {
         $data['page_title'] = 'Edit DIDs';
         $account_data = $this->session->userdata("accountinfo");
-        $this->db->where('id',$edit_id);
+        $this->db->where('id', $edit_id);
         $this->db->select('id,call_type,extensions,number');
-        $did_info=(array)$this->db->get('dids')->first_row();
-        $did_info['free_didlist']=$did_info['id'];
-        $data['form'] = $this->form->build_form($this->user_form->build_user_did_form(),$did_info);
+        $did_info = (array)$this->db->get('dids')->first_row();
+        $did_info['free_didlist'] = $did_info['id'];
+        $data['form'] = $this->form->build_form($this->user_form->build_user_did_form(), $did_info);
         $this->load->view('view_user_did_edit', $data);
     }
 
-    function user_dids_action($action,$did_id = "") {
+    function user_dids_action($action, $did_id = "") {
         $accountinfo = $this->session->userdata('accountinfo');
         $reseller_id = $accountinfo['reseller_id'];
         $did_id = empty($did_id) ? $this->input->post("free_didlist", true) : $did_id;
           
-        if($did_id !=''){
-            $account_query = $this->db_model->getSelect("*", "accounts",array('id' => $accountinfo['id']));
-            $account_arr = (array) $account_query->first_row();
+        if ($did_id != '') {
+            $account_query = $this->db_model->getSelect("*", "accounts", array('id' => $accountinfo['id']));
+            $account_arr = (array)$account_query->first_row();
             $did_query = $this->db_model->getSelect("*", "dids", array("id" => $did_id));
-            $did_arr = (array) $did_query->first_row();
-        if ($action == "add"){
-            if($did_arr['accountid'] == 0 && $did_arr['parent_id'] == $reseller_id ) {
-             $setup_cost=$did_arr['setup'];
+            $did_arr = (array)$did_query->first_row();
+        if ($action == "add") {
+            if ($did_arr['accountid'] == 0 && $did_arr['parent_id'] == $reseller_id) {
+             $setup_cost = $did_arr['setup'];
                 if ($accountinfo["reseller_id"] > 0) {
-                    $reseller_pricing_res = $this->db_model->getSelect("*", "reseller_pricing", array("note" => $did_arr['number'],"reseller_id"=>$accountinfo['reseller_id']));
+                    $reseller_pricing_res = $this->db_model->getSelect("*", "reseller_pricing", array("note" => $did_arr['number'], "reseller_id"=>$accountinfo['reseller_id']));
                     $reseller_pricing_arr = (array)$reseller_pricing_res->first_row();
-                    $setup_cost=$reseller_pricing_arr['setup'];
+                    $setup_cost = $reseller_pricing_arr['setup'];
                 }
                 $available_bal = $this->db_model->get_available_bal($account_arr);
                 if ($available_bal >= $setup_cost) {
-                    $available_bal = $this->db_model->update_balance($setup_cost,$accountinfo["id"], "debit");
-                    $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-                    $this->common->add_invoice_details($accountinfo,"DIDCHRG",$setup_cost,$did_arr['number']);
-                    $this->db_model->update("dids", array("accountid" => $accountinfo["id"],"assign_date" => gmdate('Y-m-d H:i:s')), array("id" => $did_id));
-                    $this->common->mail_to_users('email_add_did', $account_arr,"",$did_arr['number']);
+                    $available_bal = $this->db_model->update_balance($setup_cost, $accountinfo["id"], "debit");
+                    $accountinfo = (array)$this->db->get_where('accounts', array("id"=>$accountinfo['id']))->first_row();
+                    $this->common->add_invoice_details($accountinfo, "DIDCHRG", $setup_cost, $did_arr['number']);
+                    $this->db_model->update("dids", array("accountid" => $accountinfo["id"], "assign_date" => gmdate('Y-m-d H:i:s')), array("id" => $did_id));
+                    $this->common->mail_to_users('email_add_did', $account_arr, "", $did_arr['number']);
                     $this->session->set_flashdata('astpp_errormsg', 'Did added successfully.');
-                    redirect(base_url() . "user/user_didlist/");
+                    redirect(base_url()."user/user_didlist/");
                 } else {
                     $this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
-                    redirect(base_url() . "user/user_didlist/");
+                    redirect(base_url()."user/user_didlist/");
                 }
-        }else{
+        } else {
                 $this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
-                redirect(base_url() . "user/user_didlist/");
+                redirect(base_url()."user/user_didlist/");
         }
         }
         if ($action == "edit") {
-            $add_array=$this->input->post();
+            $add_array = $this->input->post();
 	    $data['form'] = $this->form->build_form($this->user_form->build_user_did_form($add_array['free_didlist']), $add_array);
 	    if ($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
@@ -280,27 +280,27 @@ 
                 exit;
             } else {
 	      $update_arr = array("call_type" => $add_array['call_type'],
-		  "extensions" => $add_array['extensions'],"last_modified_date"=>gmdate("Y-m-d H:i:s")
+		  "extensions" => $add_array['extensions'], "last_modified_date"=>gmdate("Y-m-d H:i:s")
 	      );
 	      $this->db->update("dids", $update_arr, array("id" => $did_id));
-	      if($accountinfo['reseller_id'] > 0 ){
+	      if ($accountinfo['reseller_id'] > 0) {
 		  
-		  $this->db->update('reseller_pricing',$update_arr,array('note'=>$did_arr['number']));
+		  $this->db->update('reseller_pricing', $update_arr, array('note'=>$did_arr['number']));
 	      }
-	      echo json_encode(array("SUCCESS" => $did_arr['number'] . " DID Updated Successfully!"));
+	      echo json_encode(array("SUCCESS" => $did_arr['number']." DID Updated Successfully!"));
 	      exit;
             }
             $this->load->view('view_user_did_edit', $data);
         }
         if ($action == "delete") {
-            $this->db->update("dids", array("accountid" =>0,"assign_date" =>"0000-00-00 00:00:00" , 'charge_upto'=>"0000-00-00 00:00:00"),array("id" => $did_id));
-            $this->common->mail_to_users('email_remove_did', $account_arr,"",$did_arr['number']);
+            $this->db->update("dids", array("accountid" =>0, "assign_date" =>"0000-00-00 00:00:00", 'charge_upto'=>"0000-00-00 00:00:00"), array("id" => $did_id));
+            $this->common->mail_to_users('email_remove_did', $account_arr, "", $did_arr['number']);
             $this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
-            redirect(base_url() . "user/user_didlist/");
+            redirect(base_url()."user/user_didlist/");
         }
-        }else{
+        } else {
 	  $this->session->set_flashdata('astpp_notification', 'DID not found.');
-	  redirect(base_url() . "user/user_didlist/");
+	  redirect(base_url()."user/user_didlist/");
         }
     }
 
@@ -326,13 +326,13 @@ 
         $query = $this->user_model->get_user_rates_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
         $grid_fields = json_decode($this->user_form->user_rates_list());
         foreach ($query->result_array() as $key => $value) {
-            $cost=$account_data['type']!=3 ? ($value['cost'] + (($value['cost']*$markup)/100)) : $value['cost'];
+            $cost = $account_data['type'] != 3 ? ($value['cost'] + (($value['cost'] * $markup) / 100)) : $value['cost'];
             $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,false),
+                    $this->common_model->calculate_currency($value['connectcost'], '', '', true, false),
                     $value['includedseconds'],
-                    $this->common_model->calculate_currency(($cost),'','',true,false),
+                    $this->common_model->calculate_currency(($cost), '', '', true, false),
                     $value['init_inc'],
                     $value['inc']                   
             ));
@@ -346,22 +346,22 @@ 
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
             $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
+            unset($action['action'], $action['advance_search']);
             if (isset($action['connectcost']['connectcost']) && $action['connectcost']['connectcost'] != '') {
                 $action['connectcost']['connectcost'] = $this->common_model->add_calculate_currency($action['connectcost']['connectcost'], "", '', true, false);
             }
             if (isset($action['cost']['cost']) && $action['cost']['cost'] != '') {
                 $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;
                 $action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-                if($account_data['type']!=3)
-                    $action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+                if ($account_data['type'] != 3)
+                    $action['cost']['cost'] = ($action['cost']['cost'] - ($action['cost']['cost'] * $markup) / 100);
             }
             $this->session->set_userdata('user_rates_list_search', $action);
         }
         if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_rates_list/');
+            redirect(base_url().'user/user_rates_list/');
         }
     }
 
@@ -371,34 +371,34 @@ 
     }
     
     function user_rates_list_export() {
-	$account_data=$this->session->userdata('accountinfo');
-        $currency_id=$account_data['currency_id'];
-        $currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+	$account_data = $this->session->userdata('accountinfo');
+        $currency_id = $account_data['currency_id'];
+        $currency = $this->common->get_field_name('currency', 'currency', $currency_id);
         $query = $this->user_model->get_user_rates_list(true, '', '', false);
         $markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
         ob_clean();
-        $inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)","Initital Increment","Increment");
+        $inbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initital Increment", "Increment");
         if ($query->num_rows() > 0) {
             foreach ($query->result_array() as $row) {
-		$cost=$account_data['type']!=3 ? ($row['cost'] + ($row['cost']*$markup)/100) :$row['cost'];
+		$cost = $account_data['type'] != 3 ? ($row['cost'] + ($row['cost'] * $markup) / 100) : $row['cost'];
 		$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($cost,'','',true,false),
+			$this->common_model->calculate_currency($cost, '', '', true, false),
 			$row['init_inc'],
                         $row['inc']
                     );
             }
         }
         $this->load->helper('csv');
-        array_to_csv($inbound_array, 'Rates_' . date("Y-m-d") . '.csv');
+        array_to_csv($inbound_array, 'Rates_'.date("Y-m-d").'.csv');
     } 
 
     function user_refill($action = "") {
         if (common_model::$global_config['system_config']['paypal_status'] == 1) {
-            redirect(base_url() . 'user/user/');
+            redirect(base_url().'user/user/');
         }
         $this->load->module("user/refill");
         if ($action == "GET_AMT") {
@@ -440,14 +440,14 @@ 
                 $this->load->model('user_model');
                 $this->user_model->change_db_password($update, $id);
                 $this->session->set_flashdata('astpp_errormsg', "Password changed Sucessfully....!!!");
-                redirect(base_url() . 'user/user/changepassword/');
+                redirect(base_url().'user/user/changepassword/');
             } else {
                 $this->session->set_flashdata('astpp_notification', "New Password & Conformpassword not match.");
-                redirect(base_url() . 'user/user/changepassword/');
+                redirect(base_url().'user/user/changepassword/');
             }
         } else {
             $this->session->set_flashdata('astpp_notification', "Invalid old passwword.");
-            redirect(base_url() . 'user/user/changepassword/');
+            redirect(base_url().'user/user/changepassword/');
         }
     }
 
@@ -473,7 +473,7 @@ 
         $acc_data = $this->session->userdata("accountinfo");
         $reseller_id = $acc_data['reseller_id'];
 
-        $drp_data = $this->db->query("SELECT id,CONCAT(number,'(',amount,')') as details,number FROM refill_coupon WHERE status = '0' and reseller_id='" . $reseller_id . "'");
+        $drp_data = $this->db->query("SELECT id,CONCAT(number,'(',amount,')') as details,number FROM refill_coupon WHERE status = '0' and reseller_id='".$reseller_id."'");
         $reseller_data = array();
         $data['refill_coupon_list'] = form_dropdown_all('refill_coupon_list', $reseller_data, '');
         $this->load->view('view_refill_coupon_list', $data);
@@ -503,11 +503,11 @@ 
                 echo json_encode(2);
             } else {
                 $this->db->select('balance');
-                $result = (array)$this->db->get_where('accounts',array('id'=>$customer_id))->first_row();
-                $user_balance=$this->db_model->get_available_bal($accountinfo);
-                $original_balance=$refill_coupon_result['amount'];
-                $refill_coupon_result['amount'] = $this->common_model->to_calculate_currency($original_balance,'','',TRUE,TRUE);
-                $refill_coupon_result['new_balance'] = $this->common_model->to_calculate_currency($user_balance+$original_balance,'','',TRUE,TRUE);
+                $result = (array)$this->db->get_where('accounts', array('id'=>$customer_id))->first_row();
+                $user_balance = $this->db_model->get_available_bal($accountinfo);
+                $original_balance = $refill_coupon_result['amount'];
+                $refill_coupon_result['amount'] = $this->common_model->to_calculate_currency($original_balance, '', '', TRUE, TRUE);
+                $refill_coupon_result['new_balance'] = $this->common_model->to_calculate_currency($user_balance + $original_balance, '', '', TRUE, TRUE);
                 echo json_encode($refill_coupon_result);
             }
         } else {
@@ -541,10 +541,10 @@ 
             $this->db->where('number', $refill_coupon_no);
             $refill_coupon_data = array('status' => 2, "account_id" => $customer_id, 'firstused' => $date);
             $this->db->update('refill_coupon', $refill_coupon_data);
-            $payment_arr = array("accountid" => $customer_id, 'type' => 'refill_coupon', 'credit' => $amount, 'payment_by' => $reseller_id, 'payment_date' => $date, 'refill_coupon_number' => $refill_coupon_no, 'notes' => 'Recharge using Refill coupon,Refill coupon No. ' . $refill_coupon_no . '');
+            $payment_arr = array("accountid" => $customer_id, 'type' => 'refill_coupon', 'credit' => $amount, 'payment_by' => $reseller_id, 'payment_date' => $date, 'refill_coupon_number' => $refill_coupon_no, 'notes' => 'Recharge using Refill coupon,Refill coupon No. '.$refill_coupon_no.'');
             $this->db->insert('payments', $payment_arr);
         }
-        redirect(base_url() . "user/user_refill_coupon_list/");
+        redirect(base_url()."user/user_refill_coupon_list/");
     }
 
     function user_packages() {
@@ -555,7 +555,7 @@ 
 
     function user_packages_json() {
         $json_data = array();
-        $count_all = $this->user_model->get_user_packages_list(false,'','');
+        $count_all = $this->user_model->get_user_packages_list(false, '', '');
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->get_user_packages_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -598,19 +598,19 @@ 
         $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
         echo json_encode($json_data);
     }
-    function user_emails_search(){
+    function user_emails_search() {
         $ajax_search = $this->input->post('ajax_search', 0);
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
             $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
+            unset($action['action'], $action['advance_search']);
             $this->session->set_userdata('user_emails_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_emails/');
+            redirect(base_url().'user/user_emails/');
         }
     }
-    function user_emails_clearsearchfilter(){
+    function user_emails_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('user_emails_search', "");
     }
@@ -622,30 +622,30 @@ 
         if (isset($add_array['submit'])) {
             if ($_FILES['file']['name'] == '') {
                 $invoiceconf = $this->user_model->get_invoiceconf();
-                $file_name=($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
+                $file_name = ($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
             }
             if (isset($_FILES['file']['name']) && $_FILES['file']['name'] != '') {
                 $files = $_FILES['file'];
                 if ($files['size'] < 0) {
                     $this->session->set_flashdata('astpp_notification', 'PLease upload maximum file');
-	            redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+	            redirect(base_url()."accounts/reseller_invoice_config/".$add_array['accountid']."/");
                 }
                 $file = $_FILES['file'];
                 $uploadedFile = $file["tmp_name"];
                 $file_name = $file['name'];
                 $file_type = $file['type'];
                 if ($file_type == 'image/jpg' || $file_type == 'image/png' || $file_type == 'image/jpeg') {
-                    $dir_path = FCPATH. "upload/";
-                    $path = $dir_path . $add_array['accountid']."_".$file['name'];
+                    $dir_path = FCPATH."upload/";
+                    $path = $dir_path.$add_array['accountid']."_".$file['name'];
                     if (move_uploaded_file($uploadedFile, $path)) {
                         $this->session->set_flashdata('astpp_errormsg', gettext('files added successfully!'));
                     } else {
                         $this->session->set_flashdata('astpp_notification', "File Uploading Fail Please Try Again");
-                        redirect(base_url() . 'user/user_invoice_config/');
+                        redirect(base_url().'user/user_invoice_config/');
                     }
                 } else {
                     $this->session->set_flashdata('astpp_notification', 'Please upload only image!');
-                    redirect(base_url() . 'user/user_invoice_config/');
+                    redirect(base_url().'user/user_invoice_config/');
                 }
             }
             $add_array['logo'] = $file_name;
@@ -657,24 +657,24 @@ 
                 $this->user_model->edit_invoice_config($add_array, $add_array['id']);
             }
             $this->session->set_flashdata('astpp_errormsg', 'Invoice config updated successfully!');
-            redirect(base_url() . 'user/user_invoice_config/');
+            redirect(base_url().'user/user_invoice_config/');
         } else {
-            $data["account_data"] =(array)$this->db->get_where('invoice_conf',array("accountid"=>$accountinfo['id']))->first_row();
-            if(isset($data["account_data"]['logo'])){
-	            $data["account_data"]['file']=$accountinfo['id']."_".$data["account_data"]['logo'];
+            $data["account_data"] = (array)$this->db->get_where('invoice_conf', array("accountid"=>$accountinfo['id']))->first_row();
+            if (isset($data["account_data"]['logo'])) {
+	            $data["account_data"]['file'] = $accountinfo['id']."_".$data["account_data"]['logo'];
 	    }
             $this->load->view('view_user_invoices_config', $data);
         }
     }
 
-     function user_invoice_logo_delete($accountid){
-	$invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
-	$result=$invoiceconf->result_array();
-	$logo=$result[0]['logo'];
-	$post_arr=array('logo'=>'');
-	$where_arr=array('logo'=>$logo);
+     function user_invoice_logo_delete($accountid) {
+	$invoiceconf = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
+	$result = $invoiceconf->result_array();
+	$logo = $result[0]['logo'];
+	$post_arr = array('logo'=>'');
+	$where_arr = array('logo'=>$logo);
 	$this->db->where($where_arr);
-	$this->db->update('invoice_conf',$post_arr);
+	$this->db->update('invoice_conf', $post_arr);
      }
     
     function user_myprofile() {
@@ -693,9 +693,9 @@ 
                     $result = $this->db->get_where('accounts', array('id' => $add_array['id']));
                     $result = $result->result_array();
                     $this->session->set_userdata('accountinfo', $result[0]);
-                    $this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
-                    redirect(base_url() . 'user/user_myprofile/');
-                }else{
+                    $this->session->set_flashdata('astpp_errormsg', ' Your profile updated successfully!');
+                    redirect(base_url().'user/user_myprofile/');
+                } else {
                     $this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
                 }
             }
@@ -717,35 +717,35 @@ 
         $accountinfo = $this->session->userdata("accountinfo");
         $data['page_title'] = "Change Password";
         $add_array = $this->input->post();    
-        if(!empty($add_array)) {
+        if ( ! empty($add_array)) {
             $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(), $add_array);
             if ($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
             } else {
                 $password_encode = $this->common->encode($add_array['new_password']);
                 $data = array('password' => $password_encode);
-                $this->db->where('id',$add_array['id']);
+                $this->db->where('id', $add_array['id']);
                 $this->db->update('accounts', $data);
                 $this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
-                redirect(base_url() . 'user/user_change_password/');
+                redirect(base_url().'user/user_change_password/');
             }
-        }else{
-            $data_array['id']=$accountinfo['id'];
-            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
+        } else {
+            $data_array['id'] = $accountinfo['id'];
+            $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(), $data_array);
         }
         $this->load->view('view_user_change_password', $data);
     }
 
     function user_refill_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $data['page_title'] = 'Refill Report';
         $data['search_flag'] = true;
         $this->session->set_userdata('advance_search', 0);
         $data['grid_fields'] = $this->user_form->build_user_refill_report();
         $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
-        if($accountinfo['type'] == 1){
+        if ($accountinfo['type'] == 1) {
             $this->load->view('view_reseller_refill_report', $data);
-        }else{
+        } else {
             $this->load->view('view_user_refill_report', $data);
         }
     }
@@ -753,7 +753,7 @@ 
     function user_refill_report_json() {
         $json_data = array();
         $count_all = $this->user_model->get_user_refill_list(false);
-        $paging_data = $this->form->load_grid_config($count_all,$_GET['rp'], $_GET['page']);
+        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->get_user_refill_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
         $grid_fields = json_decode($this->user_form->build_user_refill_report());
@@ -766,14 +766,14 @@ 
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
             $action = $this->input->post();
-            unset($action['action'],$action['advance_search']);
+            unset($action['action'], $action['advance_search']);
             if (isset($action['credit']['credit']) && $action['credit']['credit'] != '') {
              $action['credit']['credit'] = $this->common_model->add_calculate_currency($action['credit']['credit'], "", '', true, false);
             }
             $this->session->set_userdata('user_refill_report_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_refill_report/');
+            redirect(base_url().'user/user_refill_report/');
         }
     }
     
@@ -796,7 +796,7 @@ 
         $count_all = $this->user_model->get_user_invoice_list(false, '', '', $where);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        $user_currency=$this->common->get_field_name('currency','currency',$accountinfo['currency_id']);
+        $user_currency = $this->common->get_field_name('currency', 'currency', $accountinfo['currency_id']);
         $invoices_query = $this->user_model->get_user_invoice_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $where);
         $invoices_result = $invoices_query->result_array();
         $ountstanding_value = 0;
@@ -807,7 +807,7 @@ 
         $total_credit = (array)$invoice_details_result->first_row();
         $total_credit = $total_credit['total_credit'];
         foreach ($invoices_result as $key => $value) {
-            $total_amount+=$value['amount'];
+            $total_amount += $value['amount'];
             $invoice_date = date("Y-m-d", strtotime($value['invoice_date']));
             $from_date = date("Y-m-d", strtotime($value['from_date']));
             $due_date = date("Y-m-d", strtotime($value['due_date']));
@@ -822,23 +822,23 @@ 
             if ($invoice_total_query->num_rows() > 0) {
                 $invoice_total_result = $invoice_total_query->result_array();
             }
-            $download = '<a href="' . base_url() . '/user/user_invoice_download/' . $value['id'] . '/00' . $value['invoice_prefix'] . $value['invoiceid'] . '" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp';
-          if($value['type'] == 'I'){
+            $download = '<a href="'.base_url().'/user/user_invoice_download/'.$value['id'].'/00'.$value['invoice_prefix'].$value['invoiceid'].'" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp';
+          if ($value['type'] == 'I') {
             if ($outstanding > 0) {
-                $payment = ' <a style="padding: 0 8px;" href="' . base_url() . 'user/user_invoice_payment/' . $value['id'] . '" class="btn btn-warning"  title="Payment">Unpaid</a>';
+                $payment = ' <a style="padding: 0 8px;" href="'.base_url().'user/user_invoice_payment/'.$value['id'].'" class="btn btn-warning"  title="Payment">Unpaid</a>';
             } else {
                 $payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
             }
-	   }else{
+	   } else {
                 $payment = '';
 	   }
-            if($value['generate_type'] == 1){
-		$invoice_type='Manually';
-	   }else{
-		$invoice_type='Automatically';
+            if ($value['generate_type'] == 1) {
+		$invoice_type = 'Manually';
+	   } else {
+		$invoice_type = 'Automatically';
 	   } 
 	   
-	   if($value['type'] == 'R'){
+	   if ($value['type'] == 'R') {
 		$icon = '<div class="flx_font flx_magenta">R</div>';
 		}
 		else
@@ -856,7 +856,7 @@ 
 			$payment_last,
 			$this->common->currency_decimal($this->common_model->calculate_currency($value['amount'])),
 			$this->common->currency_decimal($this->common_model->calculate_currency($outstanding)),
-			$download . $payment,
+			$download.$payment,
 			));
 			$ountstanding_value = $ountstanding_value + $outstanding;
         }
@@ -871,13 +871,13 @@ 
 			print_r($action);
             unset($action['action']);
             unset($action['advance_search']);
-            $action['from_date'][0] = $action['from_date'][0] ? $action['from_date'][0] . " 00:00:00" : '';
-            $action['to_date'][1] = $action['to_date'][1] ? $action['to_date'][1] . " 23:59:59" : '';
-            $action['invoice_date'][0] = $action['invoice_date'][0] ? $action['invoice_date'][0] . " 00:00:00" : '';
+            $action['from_date'][0] = $action['from_date'][0] ? $action['from_date'][0]." 00:00:00" : '';
+            $action['to_date'][1] = $action['to_date'][1] ? $action['to_date'][1]." 23:59:59" : '';
+            $action['invoice_date'][0] = $action['invoice_date'][0] ? $action['invoice_date'][0]." 00:00:00" : '';
             $this->session->set_userdata('user_invoice_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_invoice_list/');
+            redirect(base_url().'user/user_invoice_list/');
         }
     }
 
@@ -890,25 +890,25 @@ 
         $this->load->module('invoices/invoices');
         $this->invoices->invoice_main_download($invoiceid);
     }
-    function user_list_responce(){
+    function user_list_responce() {
 	$this->load->module('invoices/invoices');
         $this->invoices->invoice_list_responce();
     }
-     function user_invoice_payment($invoiceid){
+     function user_invoice_payment($invoiceid) {
 	$this->load->module('invoices/invoices');
         $this->invoices->invoice_summary($invoiceid);
     }	
-    function user_invoice_payment_pay($action=""){
+    function user_invoice_payment_pay($action = "") {
         $this->load->module("user/payment");
-        if($action=="GET_AMT"){
-            $amount = $this->input->post("value",true);
-       $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
-       echo number_format($amount,2);
-        }else{
+        if ($action == "GET_AMT") {
+            $amount = $this->input->post("value", true);
+       $amount = $this->common_model->add_calculate_currency($amount, "", "", true, false);
+       echo number_format($amount, 2);
+        } else {
             $this->payment->index();
         }
     }
-    function user_invoice_download($invoiceid){
+    function user_invoice_download($invoiceid) {
 	$this->load->module('invoices/invoices');
         $this->invoices->invoice_download($invoiceid);
     }    
@@ -927,43 +927,43 @@ 
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->get_user_charge_history(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 
-	$result= $query->result_array();
-        $query1 = $this->user_model->get_user_charge_history(true,'','');
-	$res= $query1->result_array();
-	$debit=0;
-	$credit=0;
-	$before_balance=0;
-	$after_balance=0;
-	$i=0;
+	$result = $query->result_array();
+        $query1 = $this->user_model->get_user_charge_history(true, '', '');
+	$res = $query1->result_array();
+	$debit = 0;
+	$credit = 0;
+	$before_balance = 0;
+	$after_balance = 0;
+	$i = 0;
         foreach ($result as $key => $value) {
-   	     $date=$this->common->convert_GMT_to('','',$value['created_date']);
+   	     $date = $this->common->convert_GMT_to('', '', $value['created_date']);
  	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
-	        $invoice_prefix= $entity_type =$this->common->get_field_name('invoice_prefix','invoices',array('id'=>$value['invoiceid']));
-	        $invoiceid= $entity_type =$this->common->get_field_name('invoiceid','invoices',array('id'=>$value['invoiceid']));
-		$invoice_num=$invoice_prefix.$invoiceid;
-		$account=$this->common->get_field_name_coma_new('first_name,last_name,number','accounts',$value['accountid']);
-		$reseller=$this->common->reseller_select_value('first_name,last_name,number','accounts',$value['reseller_id']);
-		$item_type=$value['item_type'];
-		if($value['before_balance'] == '-'){
-			$before_balance='-';
-		}else{		
-			$before_balance=$this->common->convert_to_currency('','',$value['before_balance']);
+	        $invoice_prefix = $entity_type = $this->common->get_field_name('invoice_prefix', 'invoices', array('id'=>$value['invoiceid']));
+	        $invoiceid = $entity_type = $this->common->get_field_name('invoiceid', 'invoices', array('id'=>$value['invoiceid']));
+		$invoice_num = $invoice_prefix.$invoiceid;
+		$account = $this->common->get_field_name_coma_new('first_name,last_name,number', 'accounts', $value['accountid']);
+		$reseller = $this->common->reseller_select_value('first_name,last_name,number', 'accounts', $value['reseller_id']);
+		$item_type = $value['item_type'];
+		if ($value['before_balance'] == '-') {
+			$before_balance = '-';
+		} else {		
+			$before_balance = $this->common->convert_to_currency('', '', $value['before_balance']);
 		}
-		if($value['debit'] == '-'){
-			$debit='-';
-		}else{		
-			$debit=$this->common->convert_to_currency('','',$value['debit']);
+		if ($value['debit'] == '-') {
+			$debit = '-';
+		} else {		
+			$debit = $this->common->convert_to_currency('', '', $value['debit']);
 		}
-		$credit=$this->common->convert_to_currency('','',$value['credit']);
-    	     if($cust_type == 0 && $value['item_type'] == 'INVPAY'){
+		$credit = $this->common->convert_to_currency('', '', $value['credit']);
+    	     if ($cust_type == 0 && $value['item_type'] == 'INVPAY') {
 		$credit = '(-) '.$credit;
 	     }
-		if($value['after_balance'] == '-'){
-			$after_balance='-';
-		}else{		
-			$after_balance=$this->common->convert_to_currency('','',$value['after_balance']);
+		if ($value['after_balance'] == '-') {
+			$after_balance = '-';
+		} else {		
+			$after_balance = $this->common->convert_to_currency('', '', $value['after_balance']);
 		}
-		$description=$value['description'];
+		$description = $value['description'];
 	        $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
             $json_data['rows'][] = array('cell' => array(
 							$date,
@@ -979,7 +979,7 @@ 
         }
 	$debit_sum = 0;
 	$credit_sum = 0;
-	foreach($res as $value){
+	foreach ($res as $value) {
  	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
  	     $cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value['accountid']);	    
 		$debit_sum += $value['debit'];
@@ -987,7 +987,7 @@ 
 		$before_balance += $value['before_balance'];
 		$after_balance += $value['after_balance'];
 	}
-	        $json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
+	        $json_data['rows'][$count_all]['cell'] = array('<b>Total</b>', '-', '-', '-', '<b>'.$this->common->convert_to_currency('', '', $debit_sum).'</b>', '<b>'.$this->common->convert_to_currency('', '', $credit_sum).'</b>', '-', '-');
       echo json_encode($json_data);
 
 
@@ -999,8 +999,8 @@ 
             $action = $this->input->post();
             unset($action['action']);
             unset($action['advance_search']);
-            $action['created_date'][0] = $action['created_date'][0] ? $action['created_date'][0] . " 00:00:00" : '';
-            $action['created_date'][1] = $action['created_date'][1] ? $action['created_date'][1] . " 23:59:59" : '';
+            $action['created_date'][0] = $action['created_date'][0] ? $action['created_date'][0]." 00:00:00" : '';
+            $action['created_date'][1] = $action['created_date'][1] ? $action['created_date'][1]." 23:59:59" : '';
             if (isset($action['debit']['debit']) && $action['debit']['debit'] != '') {
                 $action['debit']['debit'] = $this->common_model->add_calculate_currency($action['debit']['debit'], "", '', true, false);
             }
@@ -1010,7 +1010,7 @@ 
             $this->session->set_userdata('user_charge_history_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_charges_history/');
+            redirect(base_url().'user/user_charges_history/');
         }
     }
 
@@ -1028,7 +1028,7 @@ 
 
     function user_subscriptions_json() {
         
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $json_data = array();
         $select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id";
         $table = "charges";
@@ -1059,14 +1059,14 @@ 
             if (isset($action['charge']['charge']) && $action['charge']['charge'] != '') {
                 $action['charge']['charge'] = $this->common_model->add_calculate_currency($action['charge']['charge'], "", '', true, false);
             }
-            if(isset($action['sweep_id']) && $action['sweep_id'] != ''){
-                $action['charges.sweep_id']=$action['sweep_id'];
+            if (isset($action['sweep_id']) && $action['sweep_id'] != '') {
+                $action['charges.sweep_id'] = $action['sweep_id'];
                 unset($action['sweep_id']);
             }
             $this->session->set_userdata('user_subscription_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_subscriptions/');
+            redirect(base_url().'user/user_subscriptions/');
         }
     }
 
@@ -1076,7 +1076,7 @@ 
     }
 
     function user_didlist() {
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $data['page_title'] = 'Purchase DIDs';
         $data['search_flag'] = true;
         $data['grid_fields'] = $this->user_form->build_user_didlist();
@@ -1084,38 +1084,38 @@ 
         $data["grid_buttons"] = array();
         $acc_data = $this->session->userdata("accountinfo");
         $data['accountid'] = $acc_data['id'];
-        $data['country_id']=$acc_data['country_id'];
+        $data['country_id'] = $acc_data['country_id'];
         $result_did_final = array();
-        if($accountinfo['reseller_id'] > 0){
+        if ($accountinfo['reseller_id'] > 0) {
 	  $this->db->select('dids.id, dids.number, reseller_pricing.setup, reseller_pricing.monthlycost');
-	  $this->db->where('dids.accountid',0);
-	  $this->db->where('reseller_pricing.note','dids.number',false);
-	  $this->db->where('reseller_pricing.reseller_id',$accountinfo['reseller_id']);
+	  $this->db->where('dids.accountid', 0);
+	  $this->db->where('reseller_pricing.note', 'dids.number', false);
+	  $this->db->where('reseller_pricing.reseller_id', $accountinfo['reseller_id']);
 	  $this->db->from('dids,reseller_pricing');
-        }else{
-	  $this->db->where('parent_id',0);
-	  $this->db->where('accountid',0);
+        } else {
+	  $this->db->where('parent_id', 0);
+	  $this->db->where('accountid', 0);
 	  $this->db->select('id,number,setup,monthlycost');
 	  $this->db->from('dids');
         }
-        $dids_array=(array)$this->db->get()->result_array();
-        $drp_list=array();
-        if(!empty($dids_array)){
+        $dids_array = (array)$this->db->get()->result_array();
+        $drp_list = array();
+        if ( ! empty($dids_array)) {
 	  foreach ($dids_array as $drp_value) {
-	    if (!empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
-	      $did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'],'','',true,true);
+	    if ( ! empty($drp_value['monthlycost']) && $drp_value['monthlycost'] != 0) {
+	      $did_cost = $this->common_model->to_calculate_currency($drp_value['monthlycost'], '', '', true, true);
 	    } else {
 		$did_cost = 0;
 	    }
-	    if (!empty($drp_value['setup']) && $drp_value['setup'] != 0) {
-		$did_setup = $this->common_model->to_calculate_currency($drp_value['setup'],'','',true,true);
+	    if ( ! empty($drp_value['setup']) && $drp_value['setup'] != 0) {
+		$did_setup = $this->common_model->to_calculate_currency($drp_value['setup'], '', '', true, true);
 	    } else {
 		$did_setup = 0;
 	    }
-	    $drp_list[$drp_value['id']] = $drp_value['number'] . ' ( Setup : ' . $did_setup . ')' . '( Monthly : ' . $did_cost . ' )';
+	    $drp_list[$drp_value['id']] = $drp_value['number'].' ( Setup : '.$did_setup.')'.'( Monthly : '.$did_cost.' )';
 	  }
         }
-        $data['didlist'] = form_dropdown_all(array("name"=>"free_didlist","id"=>"free_didlist","class"=>"did_dropdown"), $drp_list, '');
+        $data['didlist'] = form_dropdown_all(array("name"=>"free_didlist", "id"=>"free_didlist", "class"=>"did_dropdown"), $drp_list, '');
         $this->load->view('view_user_did_list', $data);
     }
 
@@ -1155,9 +1155,9 @@ 
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
             $action = $this->input->post();
-            $accountinfo=$this->session->userdata('accountinfo');
-            if($accountinfo['reseller_id'] > 0 && $action['call_type'] > 0){
-	      $action['dids.call_type']=$action['call_type'];
+            $accountinfo = $this->session->userdata('accountinfo');
+            if ($accountinfo['reseller_id'] > 0 && $action['call_type'] > 0) {
+	      $action['dids.call_type'] = $action['call_type'];
 	      unset($action['call_type']);
             }
             unset($action['action']);
@@ -1165,7 +1165,7 @@ 
             $this->session->set_userdata('user_did_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_didlist/');
+            redirect(base_url().'user/user_didlist/');
         }
     }
 
@@ -1174,14 +1174,14 @@ 
         $this->session->set_userdata('user_did_search', "");
     }
     
-    function user_ipmap(){
+    function user_ipmap() {
         $this->session->set_userdata('advance_search', 0);
         $data['grid_fields'] = $this->user_form->build_user_ipmap();
         $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_ipmap_search());
         $this->load->view('view_user_ipmap_list', $data);
     }
     
-    function user_ipmap_json(){
+    function user_ipmap_json() {
         $json_data = array();
         $account_data = $this->session->userdata("accountinfo");
         $count_all = $this->user_model->user_ipmap_list(false);
@@ -1193,7 +1193,7 @@ 
         echo json_encode($json_data);
     }
 
-    function user_ipmap_search(){
+    function user_ipmap_search() {
         $ajax_search = $this->input->post('ajax_search', 0);
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
@@ -1203,24 +1203,24 @@ 
             $this->session->set_userdata('user_ipmap_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_ipmap/');
+            redirect(base_url().'user/user_ipmap/');
         }
     }
     
-    function user_ipmap_clearsearchfilter(){
+    function user_ipmap_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('user_ipmap_search', "");
     }
     
-    function user_ipmap_action($action='delete',$id=false){
-        $add_array=$this->input->post();
-        $accountinfo=$this->session->userdata('accountinfo');
-        if($action == 'add'){
+    function user_ipmap_action($action = 'delete', $id = false) {
+        $add_array = $this->input->post();
+        $accountinfo = $this->session->userdata('accountinfo');
+        if ($action == 'add') {
               $ip = $add_array['ip'];
               if (strpos($ip, '/') !== false) {
                  $add_array['ip'] = $add_array['ip'];
               } else {
-                $add_array['ip'] = $add_array['ip'] . '/32';
+                $add_array['ip'] = $add_array['ip'].'/32';
               }
               $where = array("ip" => trim($add_array['ip']), "prefix" => trim($add_array['prefix']));
               $getdata = $this->db_model->countQuery("*", "ip_map", $where);
@@ -1241,8 +1241,8 @@ 
                 $this->session->set_flashdata('astpp_errormsg', 'IP Added Sucessfully.');
             }
             }
-        if($action =='delete'){
-            $this->db->delete('ip_map',array('id'=>$id));
+        if ($action == 'delete') {
+            $this->db->delete('ip_map', array('id'=>$id));
             $this->session->set_flashdata('astpp_notification', 'IP Removed Sucessfully.');
         }
         redirect(base_url()."user/user_ipmap/");
@@ -1263,23 +1263,23 @@ 
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $devices_result = array();
-        $query = $this->user_model->user_sipdevices_list(true,$account_data['id'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+        $query = $this->user_model->user_sipdevices_list(true, $account_data['id'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
         foreach ($query as $key => $value) {
 	$path_true = base_url().'/assets/images/true.png';
 	$path_false = base_url().'/assets/images/false.png';
-	$voicemail_enabled = $value['voicemail_enabled'] == 'true'? '<img src='.$path_true.' style="height:20px;width:20px;" title="Enable">' : '<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
+	$voicemail_enabled = $value['voicemail_enabled'] == 'true' ? '<img src='.$path_true.' style="height:20px;width:20px;" title="Enable">' : '<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
         $json_data['rows'][] = array('cell' => array(
-		    '<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value=' .$value['id'].'><lable class="lbl"></lable>',
+		    '<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value='.$value['id'].'><lable class="lbl"></lable>',
                     $value['username'],
                     $value['password'],
                     $value['effective_caller_id_name'],
                     $value['effective_caller_id_number'],
-                    $this->common->get_status('status', 'sip_devices',$value),
-                    $this->common->convert_GMT_to('','',$value['creation_date']),
-                    $this->common->convert_GMT_to('','',$value['last_modified_date']),
+                    $this->common->get_status('status', 'sip_devices', $value),
+                    $this->common->convert_GMT_to('', '', $value['creation_date']),
+                    $this->common->convert_GMT_to('', '', $value['last_modified_date']),
                     $voicemail_enabled,
-                    '<a href="'. base_url() .'user/user_sipdevices_edit/' . $value['id'] . '/" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;'.
-                    '<a href="'. base_url() .'user/user_sipdevices_delete/' .$value['id']. '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>'
+                    '<a href="'.base_url().'user/user_sipdevices_edit/'.$value['id'].'/" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;'.
+                    '<a href="'.base_url().'user/user_sipdevices_delete/'.$value['id'].'/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>'
                     ));
         }
         echo json_encode($json_data);
@@ -1294,7 +1294,7 @@ 
             $this->session->set_userdata('user_sipdevices_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_sipdevices/');
+            redirect(base_url().'user/user_sipdevices/');
         }
     }
     
@@ -1303,12 +1303,12 @@ 
         $this->session->set_userdata('user_sipdevices_search', "");
     }
         
-    function user_sipdevices_add(){
+    function user_sipdevices_add() {
         $data['page_title'] = 'Create SIP Device';
-        $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form(),"");
+        $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form(), "");
         $this->load->view('view_user_sipdevices_add_edit', $data);
     }
-    function user_sipdevices_edit($edit_id=''){
+    function user_sipdevices_edit($edit_id = '') {
         $account_data = $this->session->userdata("accountinfo");
         $data['page_title'] = 'Edit SIP Device';
         $where = array('id' => $edit_id);
@@ -1316,7 +1316,7 @@ 
         $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($edit_id), $sipdevice_info);
         $this->load->view('view_user_sipdevices_add_edit', $data);
     }
-    function user_sipdevices_save(){
+    function user_sipdevices_save() {
         $add_array = $this->input->post();
         $data['form'] = $this->form->build_form($this->user_form->build_user_sipdevices_form($add_array['id']), $add_array);
         if ($add_array['id'] != '') {
@@ -1344,15 +1344,15 @@ 
         }
     }
     function user_sipdevices_delete($id) {
-        $this->db->delete('sip_devices',array('id'=>$id));
+        $this->db->delete('sip_devices', array('id'=>$id));
         $this->session->set_flashdata('astpp_notification', 'SIP Device Removed Sucessfully!');
-        redirect(base_url() . "user/user_sipdevices/");
+        redirect(base_url()."user/user_sipdevices/");
     }
     
-    function user_sipdevices_delete_multiple(){
+    function user_sipdevices_delete_multiple() {
         $ids = $this->input->post("selected_ids", true);
         $where = "id IN ($ids)";
-        $this->db->delete("sip_devices",$where);
+        $this->db->delete("sip_devices", $where);
         echo TRUE;    
     }
     
@@ -1385,7 +1385,7 @@ 
             $cnt_result = $cnt_result->result_array();
             $count = $cnt_result[0]['count'];
             if ($count == 0) {
-				if($add_array['number'] != ""){
+				if ($add_array['number'] != "") {
                 $accountinfo = $this->session->userdata("accountinfo");
                 $insert_arr = array("number" => $add_array['number'],
                                     "accountid" => $accountinfo['id'],
@@ -1393,7 +1393,7 @@ 
                                     );
                 $this->db->insert("ani_map", $insert_arr);
                 $this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
-				}else{
+				} else {
 					 $this->session->set_flashdata('astpp_notification', 'Please Enter Caller ID value.');
 				}
             } else {
@@ -1405,28 +1405,28 @@ 
             $this->db_model->delete("ani_map", array("id" => $aniid));
             
         }
-        redirect(base_url() . "user/user_animap_list/");
+        redirect(base_url()."user/user_animap_list/");
     }
     
     function user_alert_threshold() {
         $data['page_title'] = 'Alert Threshold';
         $accountinfo = $this->session->userdata("accountinfo");
         $add_array = $this->input->post();
-        if (!empty($add_array)) {
-            unset($add_array['action'],$add_array['id']);
+        if ( ! empty($add_array)) {
+            unset($add_array['action'], $add_array['id']);
             $this->user_model->edit_alert_threshold($add_array, $accountinfo['id']);
             $this->session->set_flashdata('astpp_errormsg', 'Alert Threshold updated successfully!');
-            redirect(base_url() . 'user/user_alert_threshold/');
+            redirect(base_url().'user/user_alert_threshold/');
         } else {
             $where = array('id' => $accountinfo["id"]);
             $account = $this->db_model->getSelect("notify_credit_limit,notify_flag,notify_email", "accounts", $where);
-            $data['form'] = $this->form->build_form($this->user_form->user_alert_threshold(),(array)$account->first_row());
+            $data['form'] = $this->form->build_form($this->user_form->user_alert_threshold(), (array)$account->first_row());
             $this->load->view('view_user_alert_threshold', $data);
         }
     }
     
     function user_cdrs_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $data['page_title'] = 'CDRs';
         $data['search_flag'] = true;
         $data["grid_buttons"] = $this->user_form->build_cdrs_report_buttons();
@@ -1436,10 +1436,10 @@ 
     }
 
     function user_cdrs_report_json() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
+        $accountinfo = $this->session->userdata('accountinfo');
+        $variable = $accountinfo['type'] != 3 ? 'total_debit' : 'total_cost';
         $count_res = $this->user_model->getuser_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
+        $count_all = (array)$count_res->first_row();
         $paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->getuser_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
@@ -1447,16 +1447,16 @@ 
         $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
         if ($count_all['count'] > 0) {
             $search_arr = $this->session->userdata('user_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+            $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0) ?
+            floor($count_all['billseconds'] / 60).":".sprintf("%02d", $count_all['billseconds'] % 60) : "00:00" : $count_all['billseconds'];
             $json_data['rows'][] = array("cell" => array(
                     "<b>Grand Total</b>",
                     "",
                     "",
                     "",
                     $duration,
-                    "<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
+                    "<b>".$this->common_model->calculate_currency($count_all[$variable], "", "", true, false)."</b>",
                     "",
                     "",
                     ));
@@ -1477,7 +1477,7 @@ 
             $this->session->set_userdata('user_cdrs_report_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_cdrs_report/');
+            redirect(base_url().'user/user_cdrs_report/');
         }
     }
 
@@ -1488,20 +1488,20 @@ 
 
     function user_cdrreport_export() {
 		$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);
         $count_res = $this->user_model->getuser_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
+        $count_all = (array)$count_res->first_row();
         ob_clean();
-        $customer_array[] = array("Date", "CallerID", "Called Number","Code", "Destination", "Duration", "Debit($currency)", "Disposition", "Call Type");
+        $customer_array[] = array("Date", "CallerID", "Called Number", "Code", "Destination", "Duration", "Debit($currency)", "Disposition", "Call Type");
         if ($count_all['count'] > 0) {
             $query = $this->user_model->getuser_cdrs_list(true, '', '', true);
             $currency_info = $this->common->get_currency_info();
             $search_arr = $this->session->userdata('user_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+            $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
             foreach ($query->result_array() as $value) {
-                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
-                                floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
+                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0) ?
+                                floor($value['billseconds'] / 60).":".sprintf("%02d", $value['billseconds'] % 60) : "00:00" : $value['billseconds'];
                 $customer_array[] = array(
                     $this->common->convert_GMT_to('', '', $value['callstart']),
                     $value['callerid'],
@@ -1509,13 +1509,13 @@ 
                     filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
                     $value['notes'],
                     $duration,
-                    $this->common->calculate_currency_manually($currency_info, $value['debit'],false),
+                    $this->common->calculate_currency_manually($currency_info, $value['debit'], false),
                     $value['disposition'],
                     $value['calltype']
                 );
             }
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-                            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0) ?
+                            floor($count_all['billseconds'] / 60).":".sprintf("%02d", $count_all['billseconds'] % 60) : "00:00" : $count_all['billseconds'];
             $customer_array[] = array("Grand Total",
                 "",
                 "",
@@ -1528,26 +1528,26 @@ 
             );
         }
         $this->load->helper('csv');
-        array_to_csv($customer_array, 'Customer_CDR_' . date("Y-m-d") . '.csv');
+        array_to_csv($customer_array, 'Customer_CDR_'.date("Y-m-d").'.csv');
     }
-    function user_payment($action=""){
-      if(common_model::$global_config['system_config']['paypal_status'] == 1){
-        redirect(base_url() . 'user/user/');  
+    function user_payment($action = "") {
+      if (common_model::$global_config['system_config']['paypal_status'] == 1) {
+        redirect(base_url().'user/user/');  
       }
         $this->load->module("user/payment");
-        if($action=="GET_AMT"){
-            $amount = $this->input->post("value",true);
+        if ($action == "GET_AMT") {
+            $amount = $this->input->post("value", true);
             $this->payment->convert_amount($amount);
-        }else{
+        } else {
             $this->payment->index();
         }
     }
     
-    function user_fund_transfer(){
+    function user_fund_transfer() {
         $data['page_title'] = 'Fund Transfer';
         $accountinfo = $this->session->userdata('accountinfo');
-        $account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-        $currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
+        $account = (array)$this->db->get_where('accounts', array("id"=>$accountinfo['id']))->first_row();
+        $currency = (array)$this->db->get_where('currency', array("id"=>$account['currency_id']))->first_row();
         $data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), '');
         $this->load->view('view_user_fund_transfer', $data);
     }
@@ -1556,8 +1556,8 @@ 
         $data['page_title'] = 'Fund Transfer';
         $post_array = $this->input->post();
         $accountinfo = $this->session->userdata('accountinfo');
-        $account=(array)$this->db->get_where('accounts',array("id"=>$accountinfo['id']))->first_row();
-        $currency = (array)$this->db->get_where('currency',array("id"=>$account['currency_id']))->first_row();
+        $account = (array)$this->db->get_where('accounts', array("id"=>$accountinfo['id']))->first_row();
+        $currency = (array)$this->db->get_where('currency', array("id"=>$account['currency_id']))->first_row();
         $data['form'] = $this->form->build_form($this->user_form->build_user_fund_transfer_form($account['number'], $currency['currency'], $accountinfo['id']), $post_array);
         if ($this->form_validation->run() == FALSE) {
             $data['validation_errors'] = validation_errors();
@@ -1566,11 +1566,11 @@ 
                 $account_info = $this->session->userdata('accountinfo');
                 $balance = $this->common->get_field_name('balance', 'accounts', array('id' => $account_info['id'], 'status' => 0, 'type' => 0, 'deleted' => 0));                
                 $toid = $this->common->get_field_name('id', 'accounts', array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0));
-                $toaccountinfo=(array)$this->db->get_where('accounts',array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0),1)->first_row();
-                if($toaccountinfo){
+                $toaccountinfo = (array)$this->db->get_where('accounts', array('number' => $post_array['toaccountid'], 'status' => 0, 'type' => 0, 'deleted' => 0), 1)->first_row();
+                if ($toaccountinfo) {
                 $reseller_id = $toaccountinfo['reseller_id'];
                 $post_array['credit'] = $this->common_model->add_calculate_currency($post_array['credit'], '', '', false, false);
-                $minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
+                $minimum_fund = (array)$this->db->get_where('system', array("name"=>"minimum_fund_transfer"), 1)->first_row();
                 if ($post_array['toaccountid'] == $account_info['number']) {
                     $this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
                 }
@@ -1586,21 +1586,21 @@ 
                 elseif ($post_array['credit'] > $balance) {
                     $this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
                 }
-                elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
+                elseif ($toid <= 0 || ! isset($post_array['toaccountid'])) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
                 }
                 elseif ($post_array['credit'] < 0) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
                 }
                 elseif ($minimum_fund['value'] >= $post_array['credit']) {
-                    $this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
+                    $this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer '.$minimum_fund['value'].' .');
                 }
-                elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
+                elseif ( ! isset($toid) || ! isset($post_array['toaccountid'])) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
                 }
                 elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
                     $this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
-                }else{
+                } else {
                     $from['id'] = $post_array['id'];
                     $from['account_currency'] = $post_array['account_currency'];
                     $from['accountid'] = $post_array['fromaccountid'];
@@ -1635,13 +1635,13 @@ 
                         $this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
                     }
                 }
-            }else{
+            } else {
 		$this->session->set_flashdata('astpp_notification', 'Account number not found.');
             }
             } else {
                 $this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
             }
-            redirect(base_url() . 'user/user_fund_transfer/');
+            redirect(base_url().'user/user_fund_transfer/');
         }
         $this->load->view('view_user_fund_transfer', $data);
     }
@@ -1659,7 +1659,7 @@ 
         $accountinfo = $this->session->userdata("accountinfo");
         $json_data = array();
         $count_all = $this->user_model->get_user_opensips(false, $accountinfo['number']);
-        $paging_data = $this->form->load_grid_config($count_all,$_GET['rp'],$_GET['page']);
+        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->get_user_opensips(true, $accountinfo['number'], $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
         $grid_fields = json_decode($this->user_form->build_user_opensips());
@@ -1683,7 +1683,7 @@ 
             $this->session->set_userdata('user_opensips_search', $action);
         }
         if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_opensips/');
+            redirect(base_url().'user/user_opensips/');
         }
     }
 
@@ -1696,10 +1696,10 @@ 
         $this->load->view('view_opensips_add_edit', $data);
     }
     
-    function user_opensips_edit($edit_id){
+    function user_opensips_edit($edit_id) {
 	$data['page_title'] = 'Edit Opensips';
         $db_config = Common_model::$global_config['system_config'];
-        $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+        $opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
         $this->opensips_db = $this->load->database($opensipdsn, true);
         $where = array('id' => $edit_id);
         $this->opensips_db->where($where);
@@ -1712,7 +1712,7 @@ 
     
     }
     
-    function user_opensips_save(){
+    function user_opensips_save() {
 	$add_array = $this->input->post();
         $data['form'] = $this->form->build_form($this->user_form->build_user_opensips_form(), $add_array);
         if ($add_array['id'] != '') {
@@ -1723,11 +1723,11 @@ 
                 exit;
             } else {
                 $auth_flag = $this->validate_device_data($add_array);
-                if($auth_flag == "TRUE"){
+                if ($auth_flag == "TRUE") {
                         $this->user_model->user_opensips_edit($add_array, $add_array['id']);
                         echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
                         exit;
-                }else{
+                } else {
                        echo json_encode($auth_flag);
                        exit;
                 }
@@ -1740,48 +1740,48 @@ 
                 exit;
             } else {
                 $auth_flag = $this->validate_device_data($add_array);
-                if($auth_flag == "TRUE"){
+                if ($auth_flag == "TRUE") {
                         $this->user_model->user_opensips_add($add_array);
                         echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
                         exit;
-                }else{
+                } else {
                        echo json_encode($auth_flag);
                         exit;
                 }
             }
         }
     }
-    function validate_device_data($data){
-        if(isset($data["username"]) && $data["username"] != ""){
+    function validate_device_data($data) {
+        if (isset($data["username"]) && $data["username"] != "") {
                 $db_config = Common_model::$global_config['system_config'];
-                $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+                $opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
                 $this->opensips_db = $this->load->database($opensipdsn, true);
                 $where = array("username"=>$data["username"]);
-                if($data['id'] != ""){
-                    $this->opensips_db->where("id <>",$data['id']);
+                if ($data['id'] != "") {
+                    $this->opensips_db->where("id <>", $data['id']);
                 }
                 $this->opensips_db->where($where);
                 $auth_flag = $this->opensips_db->get("subscriber");
                 $auth_flag = $auth_flag->num_rows();
-                if($auth_flag == 0){
+                if ($auth_flag == 0) {
                     return "TRUE";
-                }else{
+                } else {
                     return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
                 }
-        }else{
+        } else {
           return array("username_error"=>"User name is required field.");
         }
         return "0";
     }
     
-    function user_opensips_delete($id){
+    function user_opensips_delete($id) {
       $this->user_model->user_opensips_delete($id);
       $this->session->set_flashdata('astpp_errormsg', 'Opensips Device Removed Successfully!.');
-      redirect(base_url() . "user/user_opensips/");
+      redirect(base_url()."user/user_opensips/");
     }
-    function user_opensips_delete_multiple(){
+    function user_opensips_delete_multiple() {
       $db_config = Common_model::$global_config['system_config'];
-      $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+      $opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
       $this->opensips_db = $this->load->database($opensipdsn, true);
       $ids = $this->input->post("selected_ids", true);
       $where = "id IN ($ids)";
@@ -1790,27 +1790,27 @@ 
       echo TRUE;
     }
     
-    function user_cdrs(){
+    function user_cdrs() {
       $data['username'] = $this->session->userdata('user_name');
-      $accountinfo=$this->session->userdata('accountinfo');
+      $accountinfo = $this->session->userdata('accountinfo');
       $data['page_title'] = 'CDRs';
       $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
       $this->load->module('reports/reports');
       $data['grid_fields'] = $this->reports->reports_form->build_report_list_for_user($accounttype);
       $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_opensips_search());
-      $data['accounttype']=$accounttype;
+      $data['accounttype'] = $accounttype;
       $this->load->view('view_user_cdrs', $data);    
     }
-    function user_cdrs_json(){
-      $accountinfo=$this->session->userdata('accountinfo');
+    function user_cdrs_json() {
+      $accountinfo = $this->session->userdata('accountinfo');
       $accounttype = strtolower($this->common->get_entity_type('', '', $accountinfo['type']));
       $this->load->module('reports/reports');
       $this->reports->customer_cdrreport($accountinfo['id'], $accounttype);     
     }
-    function user_details_search($module_name){
+    function user_details_search($module_name) {
         $action = $this->input->post();
-        $this->session->set_userdata('left_panel_search_'.$module_name,"");
-        if(!empty($action['left_panel_search'])){
+        $this->session->set_userdata('left_panel_search_'.$module_name, "");
+        if ( ! empty($action['left_panel_search'])) {
             $this->session->set_userdata('left_panel_search_'.$module_name, $action['left_panel_search']);
 	}
     }
@@ -1822,7 +1822,7 @@ 
     
     
     function user_provider_cdrs_report() {
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $data['page_title'] = 'Provider CDRs Report';
         $data['search_flag'] = true;
         $data["grid_buttons"] = $this->user_form->build_provider_report_buttons();
@@ -1832,10 +1832,10 @@ 
     }
 
     function user_provider_cdrs_report_json() {
-        $accountinfo=$this->session->userdata('accountinfo');
-        $variable=$accountinfo['type'] != 3 ?'total_debit':'total_cost';
+        $accountinfo = $this->session->userdata('accountinfo');
+        $variable = $accountinfo['type'] != 3 ? 'total_debit' : 'total_cost';
         $count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
+        $count_all = (array)$count_res->first_row();
         $paging_data = $this->form->load_grid_config($count_all['count'], $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->user_model->getprovider_cdrs_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], false);
@@ -1843,16 +1843,16 @@ 
         $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
         if ($count_all['count'] > 0) {
             $search_arr = $this->session->userdata('user_provider_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+            $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0) ?
+            floor($count_all['billseconds'] / 60).":".sprintf("%02d", $count_all['billseconds'] % 60) : "00:00" : $count_all['billseconds'];
             $json_data['rows'][] = array("cell" => array(
                     "<b>Grand Total</b>",
                     "",
                     "",
                     "",
                     $duration,
-                    "<b>".$this->common_model->calculate_currency($count_all[$variable],"","",true,false)."</b>",
+                    "<b>".$this->common_model->calculate_currency($count_all[$variable], "", "", true, false)."</b>",
                     "",
                     "",
                     ));
@@ -1873,7 +1873,7 @@ 
             $this->session->set_userdata('user_provider_cdrs_report_search', $action);
         }
         if ($ajax_search != 1) {
-            redirect(base_url() . 'user/user_provider_cdrs_report/');
+            redirect(base_url().'user/user_provider_cdrs_report/');
         }
     }
 
@@ -1884,53 +1884,53 @@ 
 
     function user_provider_cdrreport_export() {
 	$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);
         $count_res = $this->user_model->getprovider_cdrs_list(false, "", "");
-        $count_all = (array) $count_res->first_row();
+        $count_all = (array)$count_res->first_row();
         ob_clean();
         $customer_array[] = array("Date", "CallerID", "Called Number", "Destination", "Duration", "Cost($currency)", "Disposition", "Call Type");
         if ($count_all['count'] > 0) {
             $query = $this->user_model->getuser_cdrs_list(true, '', '', true);
             $currency_info = $this->common->get_currency_info();
             $search_arr = $this->session->userdata('user_provider_cdrs_report_search');
-            $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+            $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
             foreach ($query->result_array() as $value) {
-                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
-                floor($value['billseconds'] / 60) . ":" . sprintf("%02d", $value['billseconds'] % 60) : "00:00"  : $value['billseconds'];
+                $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0) ?
+                floor($value['billseconds'] / 60).":".sprintf("%02d", $value['billseconds'] % 60) : "00:00" : $value['billseconds'];
                 $customer_array[] = array(
                     $this->common->convert_GMT_to('', '', $value['callstart']),
                     $value['callerid'],
                     $value['callednum'],
                     filter_var($value['pattern'], FILTER_SANITIZE_NUMBER_INT),
                     $duration,
-                    $this->common->calculate_currency_manually($currency_info, $value['cost'],false),
+                    $this->common->calculate_currency_manually($currency_info, $value['cost'], false),
                     $value['disposition'],
                     $value['calltype']
                 );
             }
-            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0 ) ?
-            floor($count_all['billseconds'] / 60) . ":" . sprintf("%02d", $count_all['billseconds'] % 60) : "00:00"  : $count_all['billseconds'];
+            $duration = ($show_seconds == 'minutes') ? ($count_all['billseconds'] > 0) ?
+            floor($count_all['billseconds'] / 60).":".sprintf("%02d", $count_all['billseconds'] % 60) : "00:00" : $count_all['billseconds'];
             $customer_array[] = array("Grand Total",
                 "",
                 "",
                 "",
                 $duration,
-                $this->common->calculate_currency_manually($currency_info, $count_all['total_cost'],false,true),
+                $this->common->calculate_currency_manually($currency_info, $count_all['total_cost'], false, true),
                 "",
                 ""
             );
         }
         $this->load->helper('csv');
-        array_to_csv($customer_array, 'Provider_CDR_' . date("Y-m-d") . '.csv');
+        array_to_csv($customer_array, 'Provider_CDR_'.date("Y-m-d").'.csv');
     }
-    function user_speeddial(){
+    function user_speeddial() {
         $data['page_title'] = "Speed Dial";
         $accountinfo = $this->session->userdata('accountinfo');
         $where = array('id' => $accountinfo['id'], "reseller_id" => $accountinfo['reseller_id']);
         $account = $this->db_model->getSelect("*", "accounts", $where);
 	if ($account->num_rows() > 0) {
-	$account_data = (array) $account->first_row();
+	$account_data = (array)$account->first_row();
 	$speeddial_res = $this->db->get_where("speed_dial", array("accountid" => $accountinfo['id']));
 	$speeddial_info = array();
         if ($speeddial_res->num_rows() > 0) {
@@ -1941,14 +1941,14 @@ 
         }
         $data['speeddial'] = $speeddial_info;
 	$this->load->view('view_user_speeddial', $data);
-	}else{
+	} else {
 	 redirect(base_url.'user/user/');
 	}
       }
       
-      function user_speeddial_save(){
-          $add_array= $this->input->post();
-          $accountinfo=$this->session->userdata('accountinfo');
+      function user_speeddial_save() {
+          $add_array = $this->input->post();
+          $accountinfo = $this->session->userdata('accountinfo');
           $where = array("accountid" => $accountinfo['id']);
 	  $this->db->select('count(id) as count');
 	  $this->db->where($where);
@@ -1966,8 +1966,8 @@ 
 	  }
     }
     function user_speeddial_remove() {
-	$accountinfo=$this->session->userdata('accountinfo');
-	$add_array=$this->input->post();
+	$accountinfo = $this->session->userdata('accountinfo');
+	$add_array = $this->input->post();
         $updateinfo = array('number' => '');
         $this->db->where('speed_num', $add_array['number']);
         $this->db->where('accountid', $accountinfo['id']);

Braces +40 added lines, -48 removed lines

@@ -36,8 +36,9 @@ 
     }
 
     function index() {
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . 'login/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . 'login/login');
+        }
         $data['page_title'] = 'Dashboard';
         $this->load->view('view_user_dashboard', $data);
     }
@@ -173,16 +174,16 @@ 
 		$json_data[$i]['charge_id']=$data['charge_id'];
 		if($data['assign_date'] != '0000-00-00 00:00:00'){
 			$json_data[$i]['assign_date']=date('Y-m-d H:i:s',strtotime($data['assign_date'])+$gmtoffset);
-		}else{
+		} else{
 			$json_data[$i]['assign_date']=$data['assign_date'];
 		}
 		if(isset($sweep_id)){
 			if($sweep_id ==0){
 				$json_data[$i]['sweep_id']='Daily';
-			}else{
+			} else{
 				$json_data[$i]['sweep_id']='Monthly';			
 			}
-		}else{
+		} else{
 			$json_data[$i]['sweep_id']='Anonymous';
 		}
 		$i++;
@@ -266,7 +267,7 @@ 
                     $this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
                     redirect(base_url() . "user/user_didlist/");
                 }
-        }else{
+        } else{
                 $this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
                 redirect(base_url() . "user/user_didlist/");
         }
@@ -298,7 +299,7 @@ 
             $this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
             redirect(base_url() . "user/user_didlist/");
         }
-        }else{
+        } else{
 	  $this->session->set_flashdata('astpp_notification', 'DID not found.');
 	  redirect(base_url() . "user/user_didlist/");
         }
@@ -355,8 +356,9 @@ 
                 $markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
                 $markup = ($markup > 0)?$markup:1;
                 $action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-                if($account_data['type']!=3)
-                    $action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+                if($account_data['type']!=3) {
+                                    $action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+                }
             }
             $this->session->set_userdata('user_rates_list_search', $action);
         }
@@ -695,7 +697,7 @@ 
                     $this->session->set_userdata('accountinfo', $result[0]);
                     $this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
                     redirect(base_url() . 'user/user_myprofile/');
-                }else{
+                } else{
                     $this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
                 }
             }
@@ -729,7 +731,7 @@ 
                 $this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
                 redirect(base_url() . 'user/user_change_password/');
             }
-        }else{
+        } else{
             $data_array['id']=$accountinfo['id'];
             $data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
         }
@@ -745,7 +747,7 @@ 
         $data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
         if($accountinfo['type'] == 1){
             $this->load->view('view_reseller_refill_report', $data);
-        }else{
+        } else{
             $this->load->view('view_user_refill_report', $data);
         }
     }
@@ -829,19 +831,18 @@ 
             } else {
                 $payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
             }
-	   }else{
+	   } else{
                 $payment = '';
 	   }
             if($value['generate_type'] == 1){
 		$invoice_type='Manually';
-	   }else{
+	   } else{
 		$invoice_type='Automatically';
 	   } 
 	   
 	   if($value['type'] == 'R'){
 		$icon = '<div class="flx_font flx_magenta">R</div>';
-		}
-		else
+		} else
 		{		
 			$icon = '<div class="flx_font flx_drk_pink">I</div>';
 			
@@ -904,7 +905,7 @@ 
             $amount = $this->input->post("value",true);
        $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
        echo number_format($amount,2);
-        }else{
+        } else{
             $this->payment->index();
         }
     }
@@ -946,12 +947,12 @@ 
 		$item_type=$value['item_type'];
 		if($value['before_balance'] == '-'){
 			$before_balance='-';
-		}else{		
+		} else{		
 			$before_balance=$this->common->convert_to_currency('','',$value['before_balance']);
 		}
 		if($value['debit'] == '-'){
 			$debit='-';
-		}else{		
+		} else{		
 			$debit=$this->common->convert_to_currency('','',$value['debit']);
 		}
 		$credit=$this->common->convert_to_currency('','',$value['credit']);
@@ -960,7 +961,7 @@ 
 	     }
 		if($value['after_balance'] == '-'){
 			$after_balance='-';
-		}else{		
+		} else{		
 			$after_balance=$this->common->convert_to_currency('','',$value['after_balance']);
 		}
 		$description=$value['description'];
@@ -1092,7 +1093,7 @@ 
 	  $this->db->where('reseller_pricing.note','dids.number',false);
 	  $this->db->where('reseller_pricing.reseller_id',$accountinfo['reseller_id']);
 	  $this->db->from('dids,reseller_pricing');
-        }else{
+        } else{
 	  $this->db->where('parent_id',0);
 	  $this->db->where('accountid',0);
 	  $this->db->select('id,number,setup,monthlycost');
@@ -1393,7 +1394,7 @@ 
                                     );
                 $this->db->insert("ani_map", $insert_arr);
                 $this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
-				}else{
+				} else{
 					 $this->session->set_flashdata('astpp_notification', 'Please Enter Caller ID value.');
 				}
             } else {
@@ -1538,7 +1539,7 @@ 
         if($action=="GET_AMT"){
             $amount = $this->input->post("value",true);
             $this->payment->convert_amount($amount);
-        }else{
+        } else{
             $this->payment->index();
         }
     }
@@ -1573,34 +1574,25 @@ 
                 $minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
                 if ($post_array['toaccountid'] == $account_info['number']) {
                     $this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
-                }
-                elseif ($reseller_id != $account_info['reseller_id']) {
+                } elseif ($reseller_id != $account_info['reseller_id']) {
                     $this->session->set_flashdata('astpp_notification', 'You can only transfer fund in same level account.');
-                }
-                elseif ($post_array['toaccountid'] == '') {
+                } elseif ($post_array['toaccountid'] == '') {
                     $this->session->set_flashdata('astpp_notification', 'Please enter To account number.');
-                }
-                elseif (empty($post_array['credit'])) {
+                } elseif (empty($post_array['credit'])) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter a amount.');
-                }
-                elseif ($post_array['credit'] > $balance) {
+                } elseif ($post_array['credit'] > $balance) {
                     $this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
-                }
-                elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
+                } elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
-                }
-                elseif ($post_array['credit'] < 0) {
+                } elseif ($post_array['credit'] < 0) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
-                }
-                elseif ($minimum_fund['value'] >= $post_array['credit']) {
+                } elseif ($minimum_fund['value'] >= $post_array['credit']) {
                     $this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
-                }
-                elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
+                } elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
                     $this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
-                }
-                elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
+                } elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
                     $this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
-                }else{
+                } else{
                     $from['id'] = $post_array['id'];
                     $from['account_currency'] = $post_array['account_currency'];
                     $from['accountid'] = $post_array['fromaccountid'];
@@ -1635,7 +1627,7 @@ 
                         $this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
                     }
                 }
-            }else{
+            } else{
 		$this->session->set_flashdata('astpp_notification', 'Account number not found.');
             }
             } else {
@@ -1727,7 +1719,7 @@ 
                         $this->user_model->user_opensips_edit($add_array, $add_array['id']);
                         echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
                         exit;
-                }else{
+                } else{
                        echo json_encode($auth_flag);
                        exit;
                 }
@@ -1744,7 +1736,7 @@ 
                         $this->user_model->user_opensips_add($add_array);
                         echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
                         exit;
-                }else{
+                } else{
                        echo json_encode($auth_flag);
                         exit;
                 }
@@ -1765,10 +1757,10 @@ 
                 $auth_flag = $auth_flag->num_rows();
                 if($auth_flag == 0){
                     return "TRUE";
-                }else{
+                } else{
                     return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
                 }
-        }else{
+        } else{
           return array("username_error"=>"User name is required field.");
         }
         return "0";
@@ -1941,7 +1933,7 @@ 
         }
         $data['speeddial'] = $speeddial_info;
 	$this->load->view('view_user_speeddial', $data);
-	}else{
+	} else{
 	 redirect(base_url.'user/user/');
 	}
       }