iNextrix / ASTPP

web_interface/astpp/application/modules/rates/views/view_import_termination_rate_mapper.php

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
+                     			} else {
                      				echo "<td class='portlet-content'>" . $field_val . "</td>";
                      				$cnt++;
                      			}

Indentation +55 added lines, -55 removed lines

@@ -9,26 +9,26 @@ 
   //  echo 'alert(csv_tmp_data);';
    echo '</script>';
    }
-    ?>
+	?>
 <script type="text/javascript" language="javascript">
    $(document).ready(function() {
    });
 </script> <script type="text/javascript" language="javascript"><?
    if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
+	foreach($mapto_fields as $csv_key => $csv_value) {
+	echo '$("#'.$csv_value .'-prefix").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
+	echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	echo '$("#'.$csv_value .'-select").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
    
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    }
-    }
+	echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	}
+	}
    ?></script>
 
 <?php
@@ -53,9 +53,9 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
-                        	echo $error;
-                        } ?>
+						if (isset($error) && !empty($error)) {
+							echo $error;
+						} ?>
                      </span>
                      <h3 class="padding-l-16">You must either select a field from your file OR provide a default value for the following fields:</h3>
                      <p>Code,Destination,Connect Cost,Included Seconds,Per Minute Cost,Increment,Precedence,Strip,Prepend.</p>
@@ -69,10 +69,10 @@ 
                            <label class="col-md-3">Trunk List:</label>
                            <div class="">
                               <?php
-                                 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
-                                 	"status " => "0"
-                                 )) , '');
-                                 echo $trunklist; ?>
+								 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
+								 	"status " => "0"
+								 )) , '');
+								 echo $trunklist; ?>
                            </div>
                         </div>
 
@@ -137,28 +137,28 @@ 
                   </thead>
                   <tbody>
                      <?php  //echo "<pre>";	print_R($mapto_fields);exit;
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+						foreach($mapto_fields as $csv_key => $csv_value) {
 
-                        		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
-                        		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
-                        		?>
+								echo "<tr>";
+								echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
+								echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+								echo "<td>";
+								echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+								?>
                      <option value=""></option>
                      <?php
-                        $keys = array_keys($file_data);
-                        for ($i = 0; $i < count($file_data); $i++) { ?>
+						$keys = array_keys($file_data);
+						for ($i = 0; $i < count($file_data); $i++) { ?>
                      <option value="<?php
-                        echo $file_data[$i]; ?>"><?php
-                        echo $file_data[$i]; ?></option>
+						echo $file_data[$i]; ?>"><?php
+						echo $file_data[$i]; ?></option>
                      <?php
-                        }
-                        echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
-                        echo "</tr>";
+						}
+						echo "</td>";
+						echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+						echo "</tr>";
 
-                        } ?>
+						} ?>
                   </tbody>
                </table>
                <input type="hidden" name="trunkid" value="<?php echo $trunkid ?>" />
@@ -170,32 +170,32 @@ 
                <H2> Import File Data..</H2>
                <table width="100%" border="1"  class="details_table">
                   <?php
-                     $cnt = 1;  //echo "<pre>";print_r($csv_tmp_data);exit;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
+					 $cnt = 1;  //echo "<pre>";print_r($csv_tmp_data);exit;
+					 foreach($csv_tmp_data as $csv_key => $csv_value) {
                    
-                     	if ($csv_key < 15) {
-                     		echo "<tr>";
+					 	if ($csv_key < 15) {
+					 		echo "<tr>";
                      		
-                     		foreach($csv_value as $field_name => $field_val) {
-                     			if ($csv_key == 0) {
+					 		foreach($csv_value as $field_name => $field_val) {
+					 			if ($csv_key == 0) {
 
-                     				 echo "<th>".ucfirst($field_val)."</th>";
+					 				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
-                     				$cnt++;
-                     			}
-                     		}
+					 			}
+					 			else {
+					 				echo "<td class='portlet-content'>" . $field_val . "</td>";
+					 				$cnt++;
+					 			}
+					 		}
 
-                     		echo "</tr>";
-                     	}
-                     }
+					 		echo "</tr>";
+					 	}
+					 }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
+					 echo "<tr><td colspan='" . $cnt . "'>
                                             <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
-                     ?>
+					 ?>
                </table>
             </form>
          </div>

Spacing +26 added lines, -26 removed lines

@@ -3,9 +3,9 @@ 
 <?php
    startblock('extra_head') ?>
    <? //echo "<pre>";print_r($csv_tmp_data);exit;
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) {
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) {
    echo '<script>';
-   echo 'var csv_tmp_data = ' . json_encode($csv_tmp_data) . ';';
+   echo 'var csv_tmp_data = '.json_encode($csv_tmp_data).';';
   //  echo 'alert(csv_tmp_data);';
    echo '</script>';
    }
@@ -14,18 +14,18 @@ 
    $(document).ready(function() {
    });
 </script> <script type="text/javascript" language="javascript"><?
-   if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+   if (isset($mapto_fields) && ! empty($mapto_fields)) {
+    foreach ($mapto_fields as $csv_key => $csv_value) {
+    echo '$("#'.$csv_value.'-prefix").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value =  (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+    echo '$("#'.$csv_value.'-select").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
    
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value = (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
     }
     }
@@ -43,7 +43,7 @@ 
 <?php
    startblock('content') ?>
 <?php
-   if (!isset($csv_tmp_data)) { ?>
+   if ( ! isset($csv_tmp_data)) { ?>
 <section class="slice color-three padding-t-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -53,7 +53,7 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
+                        if (isset($error) && ! empty($error)) {
                         	echo $error;
                         } ?>
                      </span>
@@ -71,7 +71,7 @@ 
                               <?php
                                  $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
                                  	"status " => "0"
-                                 )) , '');
+                                 )), '');
                                  echo $trunklist; ?>
                            </div>
                         </div>
@@ -103,7 +103,7 @@ 
             <div class="col-md-12 padding-b-10">
                <div class="pull-right">
                   <input class="btn btn-line-parrot" id="import_terminationrate" type="submit" name="action" value="Import" />
-                  <a href="<?php echo base_url() . 'rates/termination_rates_list/' ?>" >
+                  <a href="<?php echo base_url().'rates/termination_rates_list/' ?>" >
                   <input class="btn btn-line-sky margin-x-10" id="ok" type="button" name="action" value="Cancel"/>
                   </a>
                </div>
@@ -116,7 +116,7 @@ 
 <?php
    } ?>
 <?php // echo "<pre>";	print_R($csv_tmp_data);exit;
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) { ?>
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 <section class="slice color-three padding-b-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -137,13 +137,13 @@ 
                   </thead>
                   <tbody>
                      <?php  //echo "<pre>";	print_R($mapto_fields);exit;
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+                        foreach ($mapto_fields as $csv_key => $csv_value) {
 
                         		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+                        		echo "<td>".$csv_key.'('.$csv_value.")</td>";
+                        		echo "<td><input type='text' name='".$csv_value."-prefix' id='".$csv_value."-prefix'></td>";
                         		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+                        		echo "<select name='".$csv_value."-select' id='".$csv_value."-select'>";
                         		?>
                      <option value=""></option>
                      <?php
@@ -155,7 +155,7 @@ 
                      <?php
                         }
                         echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+                        echo "<td><input type='text' name='".$csv_value."-display' id='".$csv_value."-display'></td>";
                         echo "</tr>";
 
                         } ?>
@@ -170,20 +170,20 @@ 
                <H2> Import File Data..</H2>
                <table width="100%" border="1"  class="details_table">
                   <?php
-                     $cnt = 1;  //echo "<pre>";print_r($csv_tmp_data);exit;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
+                     $cnt = 1; //echo "<pre>";print_r($csv_tmp_data);exit;
+                     foreach ($csv_tmp_data as $csv_key => $csv_value) {
                    
                      	if ($csv_key < 15) {
                      		echo "<tr>";
                      		
-                     		foreach($csv_value as $field_name => $field_val) {
+                     		foreach ($csv_value as $field_name => $field_val) {
                      			if ($csv_key == 0) {
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
                      			}
                      			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
+                     				echo "<td class='portlet-content'>".$field_val."</td>";
                      				$cnt++;
                      			}
                      		}
@@ -192,8 +192,8 @@ 
                      	}
                      }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
-                                            <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
+                     echo "<tr><td colspan='".$cnt."'>
+                                            <a href='" . base_url()."rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
                      ?>
                </table>

web_interface/astpp/application/modules/login/views/view_login.php

Indentation +6 added lines, -6 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Log In | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Log In | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -91,9 +91,9 @@ 
             <div class="row">
                    
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error" style="color:white !important;">
-                        <?php if (isset($astpp_notification)){
+                        <?php if (isset($astpp_notification)) {
 							echo $astpp_notification;
-						}else{
+						} else {
 						 echo "&nbsp;";
 					} ?>
                     </span></div> <br/>
@@ -107,16 +107,16 @@ 
                         	<h2 class="text-center">
                           
 							<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 								$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 								$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
-									<img style="height:53px;width:216px;" id="logo" alt="login" src="<?php echo base_url(); ?>upload/<?php echo $logo;?>">
+									<img style="height:53px;width:216px;" id="logo" alt="login" src="<?php echo base_url(); ?>upload/<?php echo $logo; ?>">
 							<? } else {?> 
-									<img style="height:53px;width:216px;" id="logo"  alt='login' src="<?php echo base_url(); ?>upload/<?php echo $logo;?>">
+									<img style="height:53px;width:216px;" id="logo"  alt='login' src="<?php echo base_url(); ?>upload/<?php echo $logo; ?>">
 							<? }?>
                             	<div class="clear"></div>
                             

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Log In | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Log In | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -93,7 +93,7 @@ 
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error" style="color:white !important;">
                         <?php if (isset($astpp_notification)){
 							echo $astpp_notification;
-						}else{
+						} else{
 						 echo "&nbsp;";
 					} ?>
                     </span></div> <br/>
@@ -109,7 +109,7 @@ 
 							<?php
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 								$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else{
 								$logo = 'logo.png';
 							}
 

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

Indentation +6 added lines, -6 removed lines

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

Spacing +9 added lines, -9 removed lines

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

Braces +13 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -59,7 +59,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>
@@ -77,7 +77,7 @@ 
 													  <?php
 														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 															$logo = $this->session->userdata['user_logo'];
-														}else{
+														} else{
 															$logo = 'logo.png';
 														}
 														
@@ -104,10 +104,18 @@ 
 										<div class="input-group col-md-12 margin-t-15 padding-r-32 padding-l-32">
 												<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
 
-												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) echo  $value['email']; else ''; ?>" style="height:40px;">
+												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) {
+	echo  $value['email'];
+} else {
+	'';
+}
+?>" style="height:40px;">
 										</div> 
 
-												<?php if (isset($error['email'])) echo $error['email']; ?>              
+												<?php if (isset($error['email'])) {
+	echo $error['email'];
+}
+?>              
 											<div style="width: 97.67%; float: left;text-align: left; margin: 2% 22%;">
 													<span id="e_name" style="color:red;"> </span>
 											</div>

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

Spacing +7 added lines, -7 removed lines

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

Braces +2 added lines, -2 removed lines

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

Indentation +6 added lines, -6 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

Spacing +7 added lines, -7 removed lines

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

Braces +22 added lines, -6 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

Spacing +7 added lines, -7 removed lines

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

Braces +2 added lines, -2 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

Spacing +9 added lines, -9 removed lines

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

Braces +3 added lines, -3 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

 <title>

 	<?php       

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

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

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

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

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

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

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

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

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

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

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

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

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

 	?>

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

Braces +3 added lines, -3 removed lines

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

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

 	<?php

-		}else{ 

+		} else{ 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

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

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

-						<?php }else{

+						<?php } else{

 						 echo "&nbsp;";

 						} ?>

                     </span>

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

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

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

-														}else{

+														} else{

 															$logo = 'logo.png';

 														}

 														

Spacing +9 added lines, -9 removed lines

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

 <title>

 	<?php       

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

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

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

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

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

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

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

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

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

 	?>

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

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

@@ -127,9 +127,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>

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

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

 													 <?php

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

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

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

-														}else{

+														} else {

 															$logo = 'logo.png';

 														}

 														

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

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

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

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

 														<? } else {?> 

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

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

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

 														<? }?>

 															</a>

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

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

Indentation +6 added lines, -6 removed lines

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

    <title>

 	<?php       

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

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

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

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

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

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

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

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

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

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

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

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

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

 	?>

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

Spacing +9 added lines, -9 removed lines

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

    <title>

 	<?php       

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

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

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

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

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

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

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

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

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

 	?>

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

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

 

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

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

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

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

-                    <?php }else{

+                    <?php } else {

 						 echo "&nbsp;";

 					} 

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

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

                             	

                             	<?php

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

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

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

-							}else{

+							} else {

 							$logo = 'logo.png';

 							}

 

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

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

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

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

 							<? } else {?> 

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

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

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

 							<? }?>	

                             	</a>

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

Braces +3 added lines, -3 removed lines

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

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

 	<?php

-		}else{ 

+		} else{ 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

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

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

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

-                    <?php }else{

+                    <?php } else{

 						 echo "&nbsp;";

 					} 

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

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

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

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

-							}else{

+							} else{

 							$logo = 'logo.png';

 							}