iNextrix / ASTPP

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

Braces +20 added lines, -4 removed lines

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

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

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

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

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/models/signup_model.php

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

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/');
 	}
       }

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

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
        if($system_config["paypal_mode"]==0){
            $data["paypal_url"] = $system_config["paypal_url"];
            $data["paypal_email_id"] = $system_config["paypal_id"];
-       }else{
+       } else{
            $data["paypal_url"] = $system_config["paypal_sandbox_url"];
            $data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
        }

web_interface/astpp/application/modules/user/libraries/user_form.php

Braces +8 added lines, -5 removed lines

@@ -21,7 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 
+if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 class User_form{
     function __construct($library_name = '') {
         $this->CI = & get_instance();
@@ -76,10 +78,11 @@ 
     }
    
     function get_userprofile_form_fields($dataArr = false) {
-        if ($dataArr['id'] > 0)
-            $val = 'accounts.email.' . $dataArr['id'];
-        else
-            $val = 'accounts.email';
+        if ($dataArr['id'] > 0) {
+                    $val = 'accounts.email.' . $dataArr['id'];
+        } else {
+                    $val = 'accounts.email';
+        }
 			$uname = $this->CI->common->find_uniq_rendno(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
 			$password = $this->CI->common->generate_password();
 			$logintype=$this->CI->session->userdata('logintype');

web_interface/astpp/application/modules/user/views/user_payment.php

Braces +4 added lines, -1 removed lines

@@ -68,7 +68,10 @@
 				
             <div class="col-md-12" style='margin-top:15px;' > 
 		    <div style="color:red;text-align:center;">
-			<?php if (isset($validation_errors)) echo $validation_errors; ?> 
+			<?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 
 		    </div>
       
 			<div class='col-md-12'>