iNextrix / ASTPP

web_interface/astpp/system/libraries/Xmlrpc.php

Spacing +2 added lines, -2 removed lines

@@ -1234,11 +1234,11 @@
 	/**
 	 * @param integer $val
 	 */
-	function addScalar($val, $type='string')
+	function addScalar($val, $type = 'string')
 	{
 		$typeof = $this->xmlrpcTypes[$type];
 
-		if ($this->mytype==1)
+		if ($this->mytype == 1)
 		{
 			echo '<strong>XML_RPC_Values</strong>: scalar can have only one value<br />';
 			return 0;

web_interface/astpp/system/database/DB_active_rec.php

Spacing +1 added lines, -1 removed lines

@@ -2132,7 +2132,7 @@
 	 */
 		 function _insert_on_duplicate_update_batch($table, $keys, $values)
 		 {
-				  foreach($keys as $key)
+				  foreach ($keys as $key)
 				  $update_fields[] = $key.'=VALUES('.$key.')';
            
 				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);

web_interface/astpp/system/helpers/template_inheritance_helper.php

Spacing +3 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
 */
-	if (! defined('TI_VIEWS_DIR') ) {
+	if ( ! defined('TI_VIEWS_DIR')) {
 		if (defined('APPPATH')) {
 			define('TI_VIEWS_DIR', APPPATH.'views/');
 		} else {
@@ -285,7 +285,7 @@ 
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 		else {
-			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+			include realpath(TI_VIEWS_DIR.$GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	function block_rendering_neccessary() {
 		// check if no child did override this block
-		if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
+		if ( ! array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
 			return true;
 		}
 		// check if there is an extension marker in the child blocks data. If so, the

web_interface/astpp/system/helpers/form_helper.php

Spacing +47 added lines, -47 removed lines

@@ -80,11 +80,11 @@ 
 		return $form;

 	}

 }

-if(!function_exists('form_breadcrumb')){

-	function form_breadcrumb($info=''){

-	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+if ( ! function_exists('form_breadcrumb')) {

+	function form_breadcrumb($info = '') {

+	 $form = false;

+	 if ( ! empty($info))

+ 	$form .= "<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

 		</div>";

 	return $form;

@@ -212,7 +212,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else {

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -226,7 +226,7 @@ 
 	{

 				//  echo '<pre>'; print_r($data); exit;

 			//$data["class"] = "col-md-5 form-control";

-			$data['value']='Delete';

+			$data['value'] = 'Delete';

 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');

 

 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";

@@ -377,21 +377,21 @@ 
 

 		if ($extra != '') $extra = ' '.$extra;

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-				if(is_array($name)){

-					 $str=null;

-					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+				if (is_array($name)) {

+					 $str = null;

+					 foreach ($name as $key=>$value) {

+					  if ($key != 'class' && $key != 'disabled')

+					  $str .= $key."='$value' ";

 					 }

-					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

-					  $str.='disabled = "disabled"';

+					 if (isset($name['disabled']) && $name['disabled'] == 'disabled') {

+					  $str .= 'disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

-					if(!empty($extra)){

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

+				} else {

+					if ( ! empty($extra)) {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

+					} else {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

 //                if($extra != '' ){

@@ -418,12 +418,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 //echo $form; exit;

@@ -449,21 +449,21 @@ 
 			}

 		}

 		if ($extra != '') $extra = ' '.$extra;

-				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+				$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

 				}

-				else{

-					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

+				else {

+					$form = '<select name="'.$name.'"'.$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

 		$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -481,12 +481,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 

@@ -517,35 +517,35 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && ! is_array($extra)) $extra = ' '.$extra;

 			/**********************************************************/

 

-		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+		$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				/*

 		  ASTPP  3.0  For Search Display In

 		*/

-				if(empty($extra)){

+				if (empty($extra)) {

 				/*********************************/

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

-					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				} else {

+					$form = '<select name="'.$name.'"'.$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else {

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

 		//$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -685,13 +685,13 @@ 
 		{

 			unset($defaults['checked']);

 		}

-		$class=NULL;

+		$class = NULL;

 

 //echo "<pre>".$value; print_r($extra); exit;

-		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

-		$class='onoffswitch-inner';

-		}else{

-		$class='onoffswitch-inner';

+		if (isset($extra[$value]) && ! empty($extra) && $extra[$value] == '0') {

+		$class = 'onoffswitch-inner';

+		} else {

+		$class = 'onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){

 	      if(isset($extra[0])){

freeswitch/fs/lib/astpp.logger.php

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 		$this->config = $lib->config;
 		$this->config['log_path'] = "/var/log/astpp/";
 		if ($this->config['debug'] == '0')
-			$this->fp = fopen($this->config['log_path'] . 'astpp_' . date('Y-m-d') . '.txt', 'a');
+			$this->fp = fopen($this->config['log_path'].'astpp_'.date('Y-m-d').'.txt', 'a');
 	}
 
 	function log($log) {
 		if ($this->config['debug'] == '0') {
 			if (is_array($log))
-				fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . print_r($log, TRUE));
+				fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".print_r($log, TRUE));
 			else
-				fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . $log . "\n");
+				fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".$log."\n");
 		}
 	}
 

freeswitch/fs/scripts/astpp.configuration.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	header('Content-Type: text/xml');
 	echo $xml;
 } elseif ($_REQUEST['key_value'] == 'acl.conf') {
-	$xml = load_acl($logger, $db,$config);
+	$xml = load_acl($logger, $db, $config);
 	header('Content-Type: text/xml');
 	echo $xml;
 } else {

freeswitch/fs/lib/astpp.xml.php

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 //Build acl xml
-function load_acl($logger, $db,$config) {
+function load_acl($logger, $db, $config) {
 	$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 	$xml .= "<document type=\"freeswitch/xml\">\n";
 	$xml .= "   <section name=\"Configuration\" description=\"Configuration\">\n";
@@ -46,29 +46,29 @@ 
 	
 	//For customer and provider ips
 	$query = "SELECT ip FROM ip_map,accounts WHERE ip_map.accountid=accounts.id AND accounts.status=0 AND deleted=0";
-	$logger->log("ACL Query : " . $query);
+	$logger->log("ACL Query : ".$query);
 	$res_acl = $db->run($query);
 	$logger->log($res_acl);
 
 	foreach ($res_acl as $res_acl_key => $res_acl_value) {
-		$xml .= "       <node type=\"allow\" cidr=\"" . $res_acl_value['ip'] . "\"/>\n";
+		$xml .= "       <node type=\"allow\" cidr=\"".$res_acl_value['ip']."\"/>\n";
 	}
 
 	//For gateways
 	$query = "SELECT * FROM gateways WHERE status=0";
-	$logger->log("Sofia Gateway Query : " . $query);
+	$logger->log("Sofia Gateway Query : ".$query);
 	$sp_gw = $db->run($query);
 	$logger->log($sp_gw);
 
 	foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
 
-			$sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+			$sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
 			foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
 				if ($sp_gw_settings_value != "" && $sp_gw_settings_key == "proxy")
 				{
-					$tmp_ip_arr = explode(":",$sp_gw_settings_value);
-					if (!filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
-						$xml .= "   <node type=\"allow\" cidr=\"" . $tmp_ip_arr[0] . "/32\"/>\n";
+					$tmp_ip_arr = explode(":", $sp_gw_settings_value);
+					if ( ! filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
+						$xml .= "   <node type=\"allow\" cidr=\"".$tmp_ip_arr[0]."/32\"/>\n";
 					}
 				}
 	   	}
@@ -77,7 +77,7 @@ 
 
 
 	//For opensips
-	if($config['opensips'] == '0')
+	if ($config['opensips'] == '0')
 	{
 		$xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";     
 	}
@@ -85,7 +85,7 @@ 
 	$xml .= "       </list>\n";
 
 	//For loopback 
-	if($config['opensips'] == '0')
+	if ($config['opensips'] == '0')
 	{
 		$xml .= "<list name=\"loopback.auto\" default=\"allow\">\n";
 			$xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";
@@ -94,7 +94,7 @@ 
 
 	//For event handing
 	$xml .= "<list name=\"event\" default=\"deny\">\n";
-		$xml .= ($config['opensips'] == "0")?"<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n":"\n";
+		$xml .= ($config['opensips'] == "0") ? "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n" : "\n";
 		$xml .= "<node type=\"allow\" cidr=\"127.0.0.0/8\"/>\n";
 	$xml .= "</list>\n";
 	$xml .= "           </network-lists>\n";
@@ -114,7 +114,7 @@ 
 	$xml .= "   <profiles>\n";
 
 	$query = "SELECT * FROM sip_profiles WHERE status=0";
-	$logger->log("Sofia Query : " . $query);
+	$logger->log("Sofia Query : ".$query);
 	$res_sp = $db->run($query);
 	//$logger->log($res_sp);
 
@@ -122,40 +122,40 @@ 
 
 		$settings = json_decode($sp_value['profile_data'], true);
 		//$logger->log(print_r($settings,true));
-		$xml .= "   <profile name=\"" . $sp_value['name'] . "\">\n";
+		$xml .= "   <profile name=\"".$sp_value['name']."\">\n";
 
 		$xml .= "   <domains>\n";
-			$xml .= "       <domain name=\"" . $sp_value['sip_ip'] . "\" alias=\"true\" parse=\"true\"/>\n";
+			$xml .= "       <domain name=\"".$sp_value['sip_ip']."\" alias=\"true\" parse=\"true\"/>\n";
 		$xml .= "   </domains>\n";
 		/*$xml .= "   <aliases>\n";
             $xml .= "       <alias name=\"" . $sp_value['sip_ip'] . "\"/>\n";
         $xml .= "   </aliases>\n";*/
 
 	$xml .= "   <settings>\n";
-	$xml .= "       <param name=\"sip-ip\" value=\"" . $sp_value['sip_ip'] . "\"/>\n";
-	$xml .= "       <param name=\"sip-port\" value=\"" . $sp_value['sip_port'] . "\"/>\n";    
-	foreach($settings as $set_key => $set_val)
+	$xml .= "       <param name=\"sip-ip\" value=\"".$sp_value['sip_ip']."\"/>\n";
+	$xml .= "       <param name=\"sip-port\" value=\"".$sp_value['sip_port']."\"/>\n";    
+	foreach ($settings as $set_key => $set_val)
 	{
-			$xml .= "       <param name=\"" . $set_key . "\" value=\"" . $set_val . "\"/>\n";
+			$xml .= "       <param name=\"".$set_key."\" value=\"".$set_val."\"/>\n";
 	}
 		$xml .= "   </settings>\n";
 	
 
 		//Gateway block start 
 		$xml .= "   <gateways>\n";
-		$query = "SELECT * FROM gateways WHERE sip_profile_id=" . $sp_value['id'] . " AND status=0";
-		$logger->log("Sofia Gateway Query : " . $query);
+		$query = "SELECT * FROM gateways WHERE sip_profile_id=".$sp_value['id']." AND status=0";
+		$logger->log("Sofia Gateway Query : ".$query);
 		$sp_gw = $db->run($query);
 		$logger->log($sp_gw);
 		foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
-			$xml .= "       <gateway name=\"" . $sp_gw_value['name'] . "\">\n";
+			$xml .= "       <gateway name=\"".$sp_gw_value['name']."\">\n";
 
 
 
-		$sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+		$sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
 			foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
 				if ($sp_gw_settings_value != "")
-					$xml .= "           <param name=\"" . $sp_gw_settings_key . "\" value=\"" . $sp_gw_settings_value . "\"/>\n";
+					$xml .= "           <param name=\"".$sp_gw_settings_key."\" value=\"".$sp_gw_settings_value."\"/>\n";
 			}
 			$xml .= "       </gateway>\n";
 		}
@@ -177,9 +177,9 @@ 
 function load_directory($logger, $db) {
 	$xml = "";
 
-  $query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE sip_devices.status=0 AND accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='" . $_REQUEST['user']."' limit 1";
+  $query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE sip_devices.status=0 AND accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='".$_REQUEST['user']."' limit 1";
 	
-	$logger->log("Directory Query : " . $query);
+	$logger->log("Directory Query : ".$query);
 	$res_dir = $db->run($query);
 	$logger->log($res_dir);
 
@@ -187,21 +187,21 @@ 
 		$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 		$xml .= "<document type=\"freeswitch/xml\">\n";
 		$xml .= "   <section name=\"Directory\" description=\"Directory\">\n";
-		$xml .= "       <domain name=\"" . $_REQUEST['domain'] . "\" alias=\"true\">\n";
-		$xml .= "           <user id=\"" . $_REQUEST['user'] . "\">\n";
+		$xml .= "       <domain name=\"".$_REQUEST['domain']."\" alias=\"true\">\n";
+		$xml .= "           <user id=\"".$_REQUEST['user']."\">\n";
 
 	$params = json_decode($res_dir_value['dir_params'], true);
 
 	$vars   = json_decode($res_dir_value['dir_vars'], true);
 	$param_xml = $var_xml = "";
-	foreach($params as $parms_key => $res_dir_params)
+	foreach ($params as $parms_key => $res_dir_params)
 	{	
-						$param_xml .= "<param name=\"" . $parms_key . "\" value=\"" . $res_dir_params . "\"/>\n";
+						$param_xml .= "<param name=\"".$parms_key."\" value=\"".$res_dir_params."\"/>\n";
 	}
 
-	foreach($vars as $var_key => $res_dir_vars)
+	foreach ($vars as $var_key => $res_dir_vars)
 	{	
-						$var_xml .= "<variable name=\"" . $var_key . "\" value=\"" . $res_dir_vars . "\"/>\n";
+						$var_xml .= "<variable name=\"".$var_key."\" value=\"".$res_dir_vars."\"/>\n";
 	}		
 
 
@@ -214,8 +214,8 @@ 
 		$xml .= "               <variables>\n";
 		$xml .= $var_xml;
 		$xml .= "<variable name=\"sipcall\" value=\"true\"/>\n";
-		$xml .= "<variable name=\"accountcode\" value=\"" . $res_dir_value['accountcode'] . "\"/>\n";
-		$xml .= "<variable name=\"domain_name\" value=\"" . $_REQUEST['domain'] . "\"/>\n";
+		$xml .= "<variable name=\"accountcode\" value=\"".$res_dir_value['accountcode']."\"/>\n";
+		$xml .= "<variable name=\"domain_name\" value=\"".$_REQUEST['domain']."\"/>\n";
 		$xml .= "               </variables>\n";
 
 		$xml .= "           </user>\n";

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

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
@@ -54,9 +54,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></div> <br/>
@@ -70,16 +70,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" title='ASTPP - Open Source Voip Billing Solution' alt='login' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+									<img style="height:53px;width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='login' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>
                             	<div class="clear"></div>
                             

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

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>