iNextrix / ASTPP

web_interface/astpp/application/libraries/global_locale.php

Spacing +8 added lines, -8 removed lines

@@ -20,20 +20,20 @@
 // You should have received a copy of the GNU Affero General Public License
 // 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');
 
 /**
  * Dynamically build forms for display
  */
 class Global_locale {
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
-		header ( "Expires: Tue, 01 Jan 2000 00:00:00 GMT" );
-		header ( "Last-Modified: " . gmdate ( "D, d M Y H:i:s" ) . " GMT" );
-		header ( "Cache-Control: no-store, no-cache, must-revalidate, max-age=0" );
-		header ( "Cache-Control: post-check=0, pre-check=0", false );
-		header ( "Pragma: no-cache" );
+		$this->CI = & get_instance();
+		header("Expires: Tue, 01 Jan 2000 00:00:00 GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+		header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
+		header("Cache-Control: post-check=0, pre-check=0", false);
+		header("Pragma: no-cache");
 	}
 }
 ?>

Braces +2 added lines, -1 removed lines

@@ -20,8 +20,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 
 /**
  * Dynamically build forms for display

web_interface/astpp/application/libraries/freeswitch_lib.php

Indentation +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 				}
 				
 				if ($contentlength > 0) { // is contentlength set
-				                          // stop reading if all content has been read.
+										  // stop reading if all content has been read.
 					if (strlen ( $response ) >= $contentlength) {
 						break;
 					}

Spacing +19 added lines, -19 removed lines

@@ -20,22 +20,22 @@ 
 // You should have received a copy of the GNU Affero General Public License
 // 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 freeswitch_lib {
 	function event_socket_create($host = '127.0.0.1', $port = '8021', $password = 'ClueCon') {
-		$fp = @fsockopen ( $host, $port, $errno, $errdesc );
+		$fp = @fsockopen($host, $port, $errno, $errdesc);
 		// or die("Connection to $host failed");
 		// socket_set_blocking($fp,false);
 		
 		if ($fp) {
-			socket_set_blocking ( $fp, false );
-			while ( ! feof ( $fp ) ) {
-				$buffer = fgets ( $fp, 1024 );
-				usleep ( 100 ); // allow time for reponse
-				if (trim ( $buffer ) == "Content-Type: auth/request") {
-					fputs ( $fp, "auth $password\n\n" );
+			socket_set_blocking($fp, false);
+			while ( ! feof($fp)) {
+				$buffer = fgets($fp, 1024);
+				usleep(100); // allow time for reponse
+				if (trim($buffer) == "Content-Type: auth/request") {
+					fputs($fp, "auth $password\n\n");
 					break;
 				}
 			}
@@ -46,28 +46,28 @@ 
 	}
 	function event_socket_request($fp, $cmd) {
 		if ($fp) {
-			fputs ( $fp, $cmd . "\n\n" );
-			usleep ( 100 ); // allow time for reponse
+			fputs($fp, $cmd."\n\n");
+			usleep(100); // allow time for reponse
 			
 			$response = "";
 			$i = 0;
 			$contentlength = 0;
-			while ( ! feof ( $fp ) ) {
-				$buffer = fgets ( $fp, 4096 );
+			while ( ! feof($fp)) {
+				$buffer = fgets($fp, 4096);
 				if ($contentlength > 0) {
 					$response .= $buffer;
 				}
 				
 				if ($contentlength == 0) { // if contentlenght is already don't process again
-					if (strlen ( trim ( $buffer ) ) > 0) { // run only if buffer has content
-						$temparray = explode ( ":", trim ( $buffer ) );
+					if (strlen(trim($buffer)) > 0) { // run only if buffer has content
+						$temparray = explode(":", trim($buffer));
 						if ($temparray [0] == "Content-Length") {
-							$contentlength = trim ( $temparray [1] );
+							$contentlength = trim($temparray [1]);
 						}
 					}
 				}
 				
-				usleep ( 100 ); // allow time for reponse
+				usleep(100); // allow time for reponse
 				             
 				// optional because of script timeout //don't let while loop become endless
 				if ($i > 10000) {
@@ -76,11 +76,11 @@ 
 				
 				if ($contentlength > 0) { // is contentlength set
 				                          // stop reading if all content has been read.
-					if (strlen ( $response ) >= $contentlength) {
+					if (strlen($response) >= $contentlength) {
 						break;
 					}
 				}
-				$i ++;
+				$i++;
 			}
 			
 			return $response;

web_interface/astpp/application/libraries/locale_menu.php

Spacing +12 added lines, -12 removed lines

@@ -20,24 +20,24 @@
 // You should have received a copy of the GNU Affero General Public License
 // 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');
 
 /**
  * Dynamically build forms for display
  */
 class locale_Menu {
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
-		$this->CI->load->model ( 'db_model' );
-		$this->CI->load->library ( 'email' );
-		$this->CI->load->library ( 'session' );
-		$current_locale = $this->CI->session->userdata ( 'user_language' );
-		putenv ( "LC_ALL=$current_locale" );
-		setlocale ( LC_ALL, $current_locale );
-		bindtextdomain ( WEBSITE_DOMAIN, FCPATH . '/application/modules/dashboard/language' );
-		bind_textdomain_codeset ( WEBSITE_DOMAIN, 'UTF-8' );
-		textdomain ( WEBSITE_DOMAIN );
+		$this->CI = & get_instance();
+		$this->CI->load->model('db_model');
+		$this->CI->load->library('email');
+		$this->CI->load->library('session');
+		$current_locale = $this->CI->session->userdata('user_language');
+		putenv("LC_ALL=$current_locale");
+		setlocale(LC_ALL, $current_locale);
+		bindtextdomain(WEBSITE_DOMAIN, FCPATH.'/application/modules/dashboard/language');
+		bind_textdomain_codeset(WEBSITE_DOMAIN, 'UTF-8');
+		textdomain(WEBSITE_DOMAIN);
 	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -20,8 +20,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 
 /**
  * Dynamically build forms for display

web_interface/astpp/application/libraries/csvreader.php

Indentation +11 added lines, -11 removed lines

@@ -3,17 +3,17 @@
 if (! defined ( 'BASEPATH' ))
 	exit ( 'No direct script access allowed' );
 /**
- * CSVReader Class
- *
- * $Id: csvreader.php 147 2007-07-09 23:12:45Z Pierre-Jean $
- *
- * Allows to retrieve a CSV file content as a two dimensional array.
- * The first text line shall contains the column names.
- *
- * @author Pierre-Jean Turpeau
- * @link http://www.codeigniter.com/wiki/CSVReader
- *      
- */
+	 * CSVReader Class
+	 *
+	 * $Id: csvreader.php 147 2007-07-09 23:12:45Z Pierre-Jean $
+	 *
+	 * Allows to retrieve a CSV file content as a two dimensional array.
+	 * The first text line shall contains the column names.
+	 *
+	 * @author Pierre-Jean Turpeau
+	 * @link http://www.codeigniter.com/wiki/CSVReader
+	 *      
+	 */
 class CSVReader {
 	var $fields;
 	/**

Spacing +30 added lines, -30 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! defined ( 'BASEPATH' ))
-	exit ( 'No direct script access allowed' );
+if ( ! defined('BASEPATH'))
+	exit ('No direct script access allowed');
 /**
  * CSVReader Class
  *
@@ -33,8 +33,8 @@ 
 	 * @return array
 	 */
 	function parse_text($p_Text) {
-		$lines = explode ( "\n", $p_Text );
-		return $this->parse_lines ( $lines );
+		$lines = explode("\n", $p_Text);
+		return $this->parse_lines($lines);
 	}
 	
 	/**
@@ -46,19 +46,19 @@ 
 	 * @return array
 	 */
 	function parse_file($p_Filepath, $config_variable, $check_header_flag = false) {
-		$lines = file ( $p_Filepath );
+		$lines = file($p_Filepath);
 		// Giving line numbers
-		for($i = 0; $i < sizeof ( $lines ); $i ++) {
+		for ($i = 0; $i < sizeof($lines); $i++) {
 			
-			if (trim ( $lines [$i] ) != "") {
-				$columnname = explode ( $this->separator, $lines [$i] );
-				for($i = 0; $i < sizeof ( $columnname ); $i ++) {
+			if (trim($lines [$i]) != "") {
+				$columnname = explode($this->separator, $lines [$i]);
+				for ($i = 0; $i < sizeof($columnname); $i++) {
 					$columnname [$i] = $columnname [$i];
 				}
 				break;
 			}
 		}
-		return $this->parse_lines ( $lines, $config_variable, $check_header_flag );
+		return $this->parse_lines($lines, $config_variable, $check_header_flag);
 	}
 	/**
 	 * Parse an array of text lines containing CSV formatted data.
@@ -71,40 +71,40 @@ 
 	function parse_lines($p_CSVLines, $config_variable, $check_header_flag = false) {
 		// echo "<pre>";
 		$t = 0;
-		$content = array ();
-		$custom_array = array ();
+		$content = array();
+		$custom_array = array();
 		$i = 0;
 		$flag_data = false;
 		$data_arr [0] = $config_variable;
-		$field_name_arr = array_keys ( $config_variable );
-		foreach ( $p_CSVLines as $line_num => $line ) {
-			$line = trim ( $line );
-			if (! empty ( $line )) {
+		$field_name_arr = array_keys($config_variable);
+		foreach ($p_CSVLines as $line_num => $line) {
+			$line = trim($line);
+			if ( ! empty ($line)) {
 				// skip empty lines
-				$elements = explode ( $this->separator, $line );
+				$elements = explode($this->separator, $line);
 				
-				if (array_filter ( $elements, 'trim' )) {
+				if (array_filter($elements, 'trim')) {
 					$custom_array [] = $elements;
 				}
-				$i ++;
+				$i++;
 			}
 		}
 		
 		if ($check_header_flag == 'on') {
-			unset ( $custom_array [0] );
+			unset ($custom_array [0]);
 		}
-		foreach ( $custom_array as $data ) {
+		foreach ($custom_array as $data) {
 			$j = 0;
-			foreach ( $data as $key => $value ) {
-				$value = str_replace ( '"', '', $value );
-				$value = str_replace ( "'", '', $value );
-				if (isset ( $field_name_arr [$j] )) {
+			foreach ($data as $key => $value) {
+				$value = str_replace('"', '', $value);
+				$value = str_replace("'", '', $value);
+				if (isset ($field_name_arr [$j])) {
 					$field_key_value = $config_variable [$field_name_arr [$j]];
-					$value = strip_slashes ( trim ( $value ) );
-					$value = preg_replace ( '#<script.*</script>#is', '', $value );
-					if (isset ( $field_key_value ) && ! empty ( $field_key_value ))
-						$content [$field_key_value] = strip_tags ( filter_var ( $value, FILTER_SANITIZE_STRING ) );
-					$j ++;
+					$value = strip_slashes(trim($value));
+					$value = preg_replace('#<script.*</script>#is', '', $value);
+					if (isset ($field_key_value) && ! empty ($field_key_value))
+						$content [$field_key_value] = strip_tags(filter_var($value, FILTER_SANITIZE_STRING));
+					$j++;
 				}
 			}
 			$data_arr [] = $content;

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 /**
  * CSVReader Class
  *
@@ -102,8 +103,9 @@ 
 					$field_key_value = $config_variable [$field_name_arr [$j]];
 					$value = strip_slashes ( trim ( $value ) );
 					$value = preg_replace ( '#<script.*</script>#is', '', $value );
-					if (isset ( $field_key_value ) && ! empty ( $field_key_value ))
-						$content [$field_key_value] = strip_tags ( filter_var ( $value, FILTER_SANITIZE_STRING ) );
+					if (isset ( $field_key_value ) && ! empty ( $field_key_value )) {
+											$content [$field_key_value] = strip_tags ( filter_var ( $value, FILTER_SANITIZE_STRING ) );
+					}
 					$j ++;
 				}
 			}

web_interface/astpp/application/libraries/Api_log.php

Spacing +14 added lines, -14 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! defined ( 'BASEPATH' )) {
-	exit ( 'No direct script access allowed' );
+if ( ! defined('BASEPATH')) {
+	exit ('No direct script access allowed');
 }
 /**
  *
@@ -16,9 +16,9 @@ 
 	// --------------------------------------------------------------------
 	var $CI;
 	function __construct() {
-		parent::__construct ();
-		$this->CI = & get_instance ();
-		$this->CI->load->library ( 'user_agent' );
+		parent::__construct();
+		$this->CI = & get_instance();
+		$this->CI->load->library('user_agent');
 	}
 	
 	/**
@@ -35,7 +35,7 @@ 
 	 * @return bool
 	 */
 	public function write_log($level = 'info', $msg, $php_error = FALSE) {
-		$level = strtoupper ( $level );
+		$level = strtoupper($level);
 		
 		// if ( ! isset($this->_levels[$level]) OR ($this->_levels[$level] > $this->_threshold))
 		// if($this->CI->config->item('api_debug_log') == FALSE)
@@ -43,21 +43,21 @@ 
 			return FALSE;
 		}
 		
-		$filepath = Common_model::$global_config ['system_config'] ['log_path'] . 'api_' . date ( 'Y-m-d' ) . '.log';
+		$filepath = Common_model::$global_config ['system_config'] ['log_path'].'api_'.date('Y-m-d').'.log';
 		$message = '';
 		
-		if (! $fp = @fopen ( $filepath, FOPEN_WRITE_CREATE )) {
+		if ( ! $fp = @fopen($filepath, FOPEN_WRITE_CREATE)) {
 			return FALSE;
 		}
 		
-		$message .= "[" . date ( $this->_date_fmt ) . "] [" . $this->CI->input->ip_address () . "] [" . $_SERVER ['HTTP_USER_AGENT'] . "] [" . $level . "] " . $msg . "\n";
+		$message .= "[".date($this->_date_fmt)."] [".$this->CI->input->ip_address()."] [".$_SERVER ['HTTP_USER_AGENT']."] [".$level."] ".$msg."\n";
 		
-		flock ( $fp, LOCK_EX );
-		fwrite ( $fp, $message );
-		flock ( $fp, LOCK_UN );
-		fclose ( $fp );
+		flock($fp, LOCK_EX);
+		fwrite($fp, $message);
+		flock($fp, LOCK_UN);
+		fclose($fp);
 		
-		@chmod ( $filepath, FILE_WRITE_MODE );
+		@chmod($filepath, FILE_WRITE_MODE);
 		return TRUE;
 	}
 }

web_interface/astpp/application/views/footer.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
    <div class="padding-b-10 col-md-12 no-padding">
 	
   <?php
-    $this->db->select('*');
+	$this->db->select('*');
 	$this->db->where('domain',$_SERVER['HTTP_HOST']);
 	$result=$this->db->get('invoice_conf');
 	if($result->num_rows() > 0){

Spacing +8 added lines, -8 removed lines

@@ -7,15 +7,15 @@ 
 	
   <?php
     $this->db->select('*');
-	$this->db->where('domain',$_SERVER['HTTP_HOST']);
-	$result=$this->db->get('invoice_conf');
-	if($result->num_rows() > 0){
-		$result=$result->result_array();
+	$this->db->where('domain', $_SERVER['HTTP_HOST']);
+	$result = $this->db->get('invoice_conf');
+	if ($result->num_rows() > 0) {
+		$result = $result->result_array();
 		$footer = $result[0]['website_footer'];
-	}else{
+	} else {
 		$footer = '';
 	}
-  	if($footer != '' && ($this->session->userdata['logintype'] == 2 || $this->session->userdata['logintype'] ==-1)){ ?>
+  	if ($footer != '' && ($this->session->userdata['logintype'] == 2 || $this->session->userdata['logintype'] == -1)) { ?>
 			 <div  class="pull-left col-md-3">
 			<span><?php echo gettext("Powered by")?> </span>
 			<a href="http://www.astppbilling.org" target="_blank">
@@ -40,7 +40,7 @@ 
 	
 			<a href="mailto:sales@inextrix.com?subject=Feedback :&body=ASTPP" style=" margin-left: 7%; font-weight: bold; color: #216397;text-shadow: 0px 1px 1px #FFF;">FEEDBACK</a>-->
 	</span>
-	<?php	} else  if($this->session->userdata['logintype'] ==0 || $this->session->userdata['logintype'] == 1){
+	<?php	} else  if ($this->session->userdata['logintype'] == 0 || $this->session->userdata['logintype'] == 1) {
 		
 		$user_footer = $this->session->userdata('user_footer');	
 		if ($user_footer != '') { 
@@ -52,7 +52,7 @@ 
 	    
 	    </div>
 	    
-	<? } } else{ ?>
+	<? } } else { ?>
 			 <div  class="pull-left col-md-3">
 			<span><?php echo gettext('Powered by')?> </span>
 			<a href="http://www.astppbilling.org" target="_blank">

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	if($result->num_rows() > 0){
 		$result=$result->result_array();
 		$footer = $result[0]['website_footer'];
-	}else{
+	} else{
 		$footer = '';
 	}
   	if($footer != '' && ($this->session->userdata['logintype'] == 2 || $this->session->userdata['logintype'] ==-1)){ ?>

web_interface/astpp/application/views/left_panel_master.php

Spacing +62 added lines, -63 removed lines

@@ -61,92 +61,91 @@
 <div class="sidebar collapse">

 	

              <?php 

-			 $uri_string= uri_string();

-			 $uri_arr=explode("/",$uri_string);

-			 $entity_name=false;

-			 if(isset($uri_arr[1]) && !empty($uri_arr[1])){

-					$function_explode=explode("_",$uri_arr[1]);

-				   $entity_name = isset($function_explode[1]) && !empty($function_explode[1]) ? $function_explode[0] : false;

+			 $uri_string = uri_string();

+			 $uri_arr = explode("/", $uri_string);

+			 $entity_name = false;

+			 if (isset($uri_arr[1]) && ! empty($uri_arr[1])) {

+					$function_explode = explode("_", $uri_arr[1]);

+				   $entity_name = isset($function_explode[1]) && ! empty($function_explode[1]) ? $function_explode[0] : false;

 			 }

              

-			 $accountinfo=$this->session->userdata('accountinfo');

-			 if($accountinfo['type'] != 0  && $accountinfo['type'] !=3){

-			  $menu_info= ($uri_arr[0]=="user"

-							? unserialize(RESELLERPROFILE_ARRAY):($uri_arr[0]=="accounts"&& $entity_name =='customer'

-							? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

-							? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

-							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-			 }else{

-			   $menu_info=null;

-			   $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

-			   $new_menu_info=array();

-				$menus=  unserialize($this->session->userdata('menuinfo'));

-				foreach($menus as $entity_key=>$entity_menu){

-					foreach($entity_menu as $entity_subkey=>$entity_submenu){

-						 foreach($entity_submenu as $subkey=>$submenus){

-							 if($submenus['module_url']==$current_menu_url){

-								 $new_menu_info=$entity_menu;

+			 $accountinfo = $this->session->userdata('accountinfo');

+			 if ($accountinfo['type'] != 0 && $accountinfo['type'] != 3) {

+			  $menu_info = ($uri_arr[0] == "user"

+							? unserialize(RESELLERPROFILE_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'customer'

+							? unserialize(CUSTOMEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'provider'

+							? unserialize(PROVIDEREDIT_ARRAY) : ($uri_arr[0] == "accounts" && $entity_name == 'reseller' 

+							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] == "package" ? unserialize(PACKAGEEDIT_ARRAY) : false)))));

+			 } else {

+			   $menu_info = null;

+			   $current_menu_url = $uri_arr[0]."/".$uri_arr[1]."/";

+			   $new_menu_info = array();

+				$menus = unserialize($this->session->userdata('menuinfo'));

+				foreach ($menus as $entity_key=>$entity_menu) {

+					foreach ($entity_menu as $entity_subkey=>$entity_submenu) {

+						 foreach ($entity_submenu as $subkey=>$submenus) {

+							 if ($submenus['module_url'] == $current_menu_url) {

+								 $new_menu_info = $entity_menu;

 							 }

 						 }

 					}

 				}

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

-					foreach($value as $subvalue){

-						$menu_info[$subvalue['menu_label']]=$subvalue['module_url'];

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

+					foreach ($value as $subvalue) {

+						$menu_info[$subvalue['menu_label']] = $subvalue['module_url'];

 					}

 				}

 			 }

-			 if($accountinfo['type']==0 || $accountinfo['type']==3){

-		  if($uri_arr[0]=='user' && $uri_arr[1] =='user_myprofile' || $uri_arr[0]=='user' && $uri_arr[1]=='user_change_password'){

-		$menu_info=unserialize(CUSTOMERPROFILE_ARRAY);

+			 if ($accountinfo['type'] == 0 || $accountinfo['type'] == 3) {

+		  if ($uri_arr[0] == 'user' && $uri_arr[1] == 'user_myprofile' || $uri_arr[0] == 'user' && $uri_arr[1] == 'user_change_password') {

+		$menu_info = unserialize(CUSTOMERPROFILE_ARRAY);

 		  }

 			 }

-			 if(!empty($menu_info)){

+			 if ( ! empty($menu_info)) {

 				echo "<ul class='sidemenu'>";

-				$i=0;

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

-				$url=($entity_name=='provider'||$entity_name =='customer' || $entity_name =='reseller' || $uri_arr[0] =="package") && isset($uri_arr[2]) && !empty($uri_arr[2])

+				$i = 0;

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

+				$url = ($entity_name == 'provider' || $entity_name == 'customer' || $entity_name == 'reseller' || $uri_arr[0] == "package") && isset($uri_arr[2]) && ! empty($uri_arr[2])

 					?

-				base_url().$value.$uri_arr[2]."/" : 

-				base_url().$value;

-				$value_flag=false;

-		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

-		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

-			$value_flag=false;

-		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

-			$value_flag=false;

-		  }else{

-			$value_flag=true;

+				base_url().$value.$uri_arr[2]."/" : base_url().$value;

+				$value_flag = false;

+		if ($acc_info['type'] == '3' || $acc_info['type'] == '0') {

+		  if ($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1') {

+			$value_flag = false;

+		  }elseif (in_array('user/user_sipdevices/', $menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips'] == 0) {

+			$value_flag = false;

+		  } else {

+			$value_flag = true;

 		  }

-				}else{

-		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

-			  if($value != "accounts/".$entity_name."_opensips/"){

-			  $value_flag=true;

-			  }else{

-			$value_flag=false;

+				} else {

+		  if (common_model::$global_config['system_config']['opensips'] == 1) {

+			  if ($value != "accounts/".$entity_name."_opensips/") {

+			  $value_flag = true;

+			  } else {

+			$value_flag = false;

 			  }

 		  }

-		  if(common_model::$global_config['system_config']['opensips']== 0 ){

-			  if($value != "accounts/".$entity_name."_sipdevices/"){

-			  $value_flag=true;

-			  }else{

-			$value_flag=false;

+		  if (common_model::$global_config['system_config']['opensips'] == 0) {

+			  if ($value != "accounts/".$entity_name."_sipdevices/") {

+			  $value_flag = true;

+			  } else {

+			$value_flag = false;

 			  }

 		  }

-		  if(common_model::$global_config['system_config']['enterprise'] == 0 ){

-			  if(common_model::$global_config['system_config']['opensips']== 0 && $value == "accounts/".$entity_name."_sipdevices/"){

-						  $value_flag=true;	

+		  if (common_model::$global_config['system_config']['enterprise'] == 0) {

+			  if (common_model::$global_config['system_config']['opensips'] == 0 && $value == "accounts/".$entity_name."_sipdevices/") {

+						  $value_flag = true;	

 			  }

-			  if(common_model::$global_config['system_config']['opensips']== 0 && $value == "accounts/".$entity_name."_opensips/"){

-						  $value_flag=false;	

+			  if (common_model::$global_config['system_config']['opensips'] == 0 && $value == "accounts/".$entity_name."_opensips/") {

+						  $value_flag = false;	

 			  }

 		  }

 				}

 

-				if($value_flag){

-					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-					if($i==0)

-						$class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+				if ($value_flag) {

+					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/") ? 'active' : '';

+					if ($i == 0)

+						$class = ($uri_arr[1] == $entity_name."_save") ? 'active' : $class;

                     

 					echo "<li class='$class'><a href ='$url'>".gettext($key)."</a></li>";

 				}

Braces +9 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
 							? unserialize(CUSTOMEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='provider'

 							? unserialize(PROVIDEREDIT_ARRAY)   :($uri_arr[0]=="accounts"&& $entity_name =='reseller' 

 							? unserialize(RESELLEREDIT_ARRAY) : ($uri_arr[0] =="package" ? unserialize(PACKAGEEDIT_ARRAY):false) ))));

-			 }else{

+			 } else{

 			   $menu_info=null;

 			   $current_menu_url=$uri_arr[0]."/".$uri_arr[1]."/";

 			   $new_menu_info=array();

@@ -113,23 +113,23 @@ 
 		if($acc_info['type'] == '3' || $acc_info['type'] == '0'){

 		  if($value == "user/user_ipmap/" && $acc_info['allow_ip_management'] == '1'){

 			$value_flag=false;

-		  }elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

+		  } elseif(in_array('user/user_sipdevices/',$menu_info) && $value == "user/user_sipdevices/" && common_model::$global_config['system_config']['opensips']== 0){

 			$value_flag=false;

-		  }else{

+		  } else{

 			$value_flag=true;

 		  }

-				}else{

+				} else{

 		  if(common_model::$global_config['system_config']['opensips'] == 1 ){

 			  if($value != "accounts/".$entity_name."_opensips/"){

 			  $value_flag=true;

-			  }else{

+			  } else{

 			$value_flag=false;

 			  }

 		  }

 		  if(common_model::$global_config['system_config']['opensips']== 0 ){

 			  if($value != "accounts/".$entity_name."_sipdevices/"){

 			  $value_flag=true;

-			  }else{

+			  } else{

 			$value_flag=false;

 			  }

 		  }

@@ -145,8 +145,9 @@ 
 

 				if($value_flag){

 					$class = ($value == $uri_arr[0]."/".$uri_arr[1]."/" ) ? 'active' : '';

-					if($i==0)

-						$class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;

+					if($i==0) {
+											$class=($uri_arr[1]== $entity_name."_save") ? 'active': $class;
+					}
                     

 					echo "<li class='$class'><a href ='$url'>".gettext($key)."</a></li>";

 				}

web_interface/astpp/application/views/header.php

Spacing +50 added lines, -50 removed lines

@@ -17,7 +17,7 @@ 
 	?>
 </title>
 <?php  $user_favicon = $this->session->userdata('user_favicon'); ?>
-<?php if($user_favicon) {  ?>
+<?php if ($user_favicon) {  ?>
         <link rel="icon" href="<? echo base_url(); ?>upload/<? echo $user_favicon ?>"/>
 <?php } else { ?>
     <link rel="icon" href="<? echo base_url(); ?>assets/images/favicon.ico"/>
@@ -137,65 +137,65 @@ 
          	 <li>
          	 
          	 <?php
-		 	 $acc_info=$this->session->userdata('accountinfo');
-		 	 if($this->session->userdata('userlevel_logintype') != '0'){?>
-		      <a href="<?php echo base_url();?>dashboard/" class=""> <? } else{?>    
-		    <a href="<?php echo base_url();?>user/user/" class="">	
+		 	 $acc_info = $this->session->userdata('accountinfo');
+		 	 if ($this->session->userdata('userlevel_logintype') != '0') {?>
+		      <a href="<?php echo base_url(); ?>dashboard/" class=""> <? } else {?>    
+		    <a href="<?php echo base_url(); ?>user/user/" class="">	
 		<? }
-				if($this->session->userdata('logintype')!=2 && $this->session->userdata('logintype')!=4){
-					$result=(array)$this->db->get_where('accounts',array("id"=>$acc_info['id']),1)->first_row();
-			$variable =$result['posttoexternal']==1 ? 'Credit' : gettext('Bal');  
-			$amount=$result['posttoexternal']==1 ? $result['credit_limit']-$result['balance'] :$result['balance'];
+				if ($this->session->userdata('logintype') != 2 && $this->session->userdata('logintype') != 4) {
+					$result = (array)$this->db->get_where('accounts', array("id"=>$acc_info['id']), 1)->first_row();
+			$variable = $result['posttoexternal'] == 1 ? 'Credit' : gettext('Bal');  
+			$amount = $result['posttoexternal'] == 1 ? $result['credit_limit'] - $result['balance'] : $result['balance'];
 
 			
-						$value= $this->common_model->calculate_currency($amount,'','',true);
-						if($value >0){
-							$color='#397A13';
+						$value = $this->common_model->calculate_currency($amount, '', '', true);
+						if ($value > 0) {
+							$color = '#397A13';
 						}
-						if($value < 0){
-							$color='#EE0E43';
+						if ($value < 0) {
+							$color = '#EE0E43';
 						}
-						if($value == 0){
-							$color='#1A1919';
+						if ($value == 0) {
+							$color = '#1A1919';
 						}
 						$balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
-				 }else{
+				 } else {
 					$balance_str = '';
 				}
                 
-		$logged_user=$acc_info['first_name']." ".$acc_info['last_name'];
+		$logged_user = $acc_info['first_name']." ".$acc_info['last_name'];
 					?>
                 	<span>
                             <span class="profile_name">
                                 <?= $logged_user?>
                             </span>
-                            <label class="profile_label no-margin"><?php echo $balance_str;?>
+                            <label class="profile_label no-margin"><?php echo $balance_str; ?>
                             </label>
                         </span>                          
                  </a>
                 <ul class="dropdown-box">
-		    <? if($this->session->userdata('userlevel_logintype') != '0' && $this->session->userdata('userlevel_logintype') != '3'){?>
-		      <li><a href="<?php echo base_url();?>dashboard/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
-		    <? } else{?>    
-		      <li><a href="<?php echo base_url();?>user/user/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
+		    <? if ($this->session->userdata('userlevel_logintype') != '0' && $this->session->userdata('userlevel_logintype') != '3') {?>
+		      <li><a href="<?php echo base_url(); ?>dashboard/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
+		    <? } else {?>    
+		      <li><a href="<?php echo base_url(); ?>user/user/"><i class="fa fa-home"></i> &nbsp;<?php echo gettext('Dashboard'); ?></a></li>
 		    <? }?>
 		   
-<? if($this->session->userdata('userlevel_logintype') != '-1'){
+<? if ($this->session->userdata('userlevel_logintype') != '-1') {
 ?>
-		    <li><a href="<?php echo base_url();?>user/user_myprofile/"><i class= "fa fa-user"></i> &nbsp;
+		    <li><a href="<?php echo base_url(); ?>user/user_myprofile/"><i class= "fa fa-user"></i> &nbsp;
 		    <?php echo gettext('My Profile'); ?></a></li>
 		      <?
 }?>
 	    
-		    <? if($this->session->userdata('userlevel_logintype') == '-1'){?>
+		    <? if ($this->session->userdata('userlevel_logintype') == '-1') {?>
 		      <li style="-moz-border-radius: 5px 5px 5px 5px;-webkit-border-radius: 5px 5px 5px 5px;border-radius: 5px 5px 5px 5px;"><a href="https://github.com/iNextrix/ASTPP/issues" target="_blank"><i class= "fa fa-bug"></i> &nbsp;<?php echo gettext('Report a Bug'); ?></a></li>
 		    <?}?>
-		    <? if($this->session->userdata('userlevel_logintype') == '-1'){?>
+		    <? if ($this->session->userdata('userlevel_logintype') == '-1') {?>
 		    <li><a href="https://astppdoc.atlassian.net/wiki/display/ASTPP/Welcome+to+ASTPP" target="_blank"><i class="fa fa-file-text"></i> &nbsp;Documentation</a></li>
 		    <li><a href="http://www.astppbilling.org/mobile-dialers/" target="_blank"><i class="fa fa-mobile fa-lg" aria-hidden="true"></i> &nbsp;Get App</a></li>
 		    <?}?>
 				
-                <li><a href="<?php echo base_url();?>logout"><i class="fa fa-power-off"></i> &nbsp;Log out</a></li>
+                <li><a href="<?php echo base_url(); ?>logout"><i class="fa fa-power-off"></i> &nbsp;Log out</a></li>
                 </ul>
                </li>
               </ul>    	
@@ -211,47 +211,47 @@ 
 
 	  <?php 
 			$menu_info = unserialize($this->session->userdata("menuinfo"));
-			foreach($menu_info as $menu_key => $menu_values){
+			foreach ($menu_info as $menu_key => $menu_values) {
 	  ?>
                 
      <?php
-		  if(common_model::$global_config['system_config']['opensips']== 0 &&  $menu_key !='SIP Devices'){
+		  if (common_model::$global_config['system_config']['opensips'] == 0 && $menu_key != 'SIP Devices') {
 			  echo '<li><a href="#">'.gettext($menu_key).'<b class="caret"></b></a>';
 		  }
-		  if(common_model::$global_config['system_config']['opensips']== 1 &&  $menu_key != 'Opensips'){
+		  if (common_model::$global_config['system_config']['opensips'] == 1 && $menu_key != 'Opensips') {
 			  echo '<li><a href="#">'.gettext($menu_key).'<b class="caret"></b></a>';  
 		  }
 	?>
                 
                          <ul class="dropdown-menu">
-                    <? foreach($menu_values as $sub_menu_key => $sub_menu_values){?>
+                    <? foreach ($menu_values as $sub_menu_key => $sub_menu_values) {?>
                        
-                           <?  if($sub_menu_key === 0){ ?>
-                            <? foreach($sub_menu_values as $sub_key => $sub_menu_lables){
-				if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge')|| (common_model::$global_config['system_config']['enterprise']== 0 &&  $sub_menu_lables["menu_label"] =='Opensips devices')  || (common_model::$global_config['system_config']['enterprise']== 0 &&  $sub_menu_lables["menu_label"] =='Opensips')  || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Dispatcher list') || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips devices')  || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips') || (common_model::$global_config['system_config']['enterprise']== 1 && common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') || (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
-								}else{?>
-                                <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
+                           <?  if ($sub_menu_key === 0) { ?>
+                            <? foreach ($sub_menu_values as $sub_key => $sub_menu_lables) {
+				if ((common_model::$global_config['system_config']['paypal_status'] == 1 && strtolower($sub_menu_lables["menu_label"]) == 'recharge') || (common_model::$global_config['system_config']['enterprise'] == 0 && $sub_menu_lables["menu_label"] == 'Opensips devices') || (common_model::$global_config['system_config']['enterprise'] == 0 && $sub_menu_lables["menu_label"] == 'Opensips') || (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_lables["menu_label"] == 'Dispatcher list') || (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_lables["menu_label"] == 'Opensips devices') || (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_lables["menu_label"] == 'Opensips') || (common_model::$global_config['system_config']['enterprise'] == 1 && common_model::$global_config['system_config']['opensips'] == 0 && $sub_menu_lables["menu_label"] == 'SIP Devices') || (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')) {
+								} else {?>
+                                <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?php echo gettext($sub_menu_lables["menu_label"]); ?></a></li>
 				<?}?>
 				<?} ?>
-                            <?php }else{
-				if(common_model::$global_config['system_config']['opensips']==0 && $menu_key !='System Configuration'){ ?>    
-				    <li><a href="#"><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
-				<? } if(common_model::$global_config['system_config']['opensips']==1) {?>
-				    <li><a href="#"><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
-				<?php }if(($acc_info['type']==3 || $acc_info['type']== 0) && $acc_info['allow_ip_management']== 1 && strtolower($sub_menu_lables["menu_label"]) !='ip settings'){ ?>
-				    <li><a href="#"><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
+                            <?php } else {
+				if (common_model::$global_config['system_config']['opensips'] == 0 && $menu_key != 'System Configuration') { ?>    
+				    <li><a href="#"><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
+				<? } if (common_model::$global_config['system_config']['opensips'] == 1) {?>
+				    <li><a href="#"><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
+				<?php }if (($acc_info['type'] == 3 || $acc_info['type'] == 0) && $acc_info['allow_ip_management'] == 1 && strtolower($sub_menu_lables["menu_label"]) != 'ip settings') { ?>
+				    <li><a href="#"><span><?=$sub_menu_key; ?></span><i class="fa fa-caret-right pull-right"></i></a>
 				<? }
 							?>
                                  <div class="col-4"><div class="col-md-6 no-padding">
 									 <ul class="col-12 padding-x-8">
-                                <? foreach($sub_menu_values as $sub_menu_lables){ 
-					 if($sub_menu_lables['menu_label'] != 'Configuration'){
-				  if(common_model::$global_config['system_config']['opensips']==0 &&  $sub_menu_lables["menu_label"] !='SIP Devices'){
+                                <? foreach ($sub_menu_values as $sub_menu_lables) { 
+					 if ($sub_menu_lables['menu_label'] != 'Configuration') {
+				  if (common_model::$global_config['system_config']['opensips'] == 0 && $sub_menu_lables["menu_label"] != 'SIP Devices') {
 					  ?>
-				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
+				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?php echo gettext($sub_menu_lables["menu_label"]); ?></a></li>
 				  <? }
-				  if(common_model::$global_config['system_config']['opensips']== 1 && $sub_menu_key !='opensips'){ ?>
-				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?=$sub_menu_lables["menu_label"];?></a></li>
+				  if (common_model::$global_config['system_config']['opensips'] == 1 && $sub_menu_key != 'opensips') { ?>
+				      <li><a href="<?php echo base_url().$sub_menu_lables["module_url"]; ?>"><?=$sub_menu_lables["menu_label"]; ?></a></li>
 				  <? } 
 				}
 				} ?>

Braces +3 added lines, -3 removed lines

@@ -159,7 +159,7 @@ 
 							$color='#1A1919';
 						}
 						$balance_str = '<span style="color:'.$color.'; font-size: 10px;"><b>('.$variable.' : '.$value.')</b></span>';
-				 }else{
+				 } else{
 					$balance_str = '';
 				}
                 
@@ -229,11 +229,11 @@ 
                            <?  if($sub_menu_key === 0){ ?>
                             <? foreach($sub_menu_values as $sub_key => $sub_menu_lables){
 				if((common_model::$global_config['system_config']['paypal_status']== 1 && strtolower($sub_menu_lables["menu_label"]) =='recharge')|| (common_model::$global_config['system_config']['enterprise']== 0 &&  $sub_menu_lables["menu_label"] =='Opensips devices')  || (common_model::$global_config['system_config']['enterprise']== 0 &&  $sub_menu_lables["menu_label"] =='Opensips')  || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Dispatcher list') || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips devices')  || (common_model::$global_config['system_config']['opensips']== 1 &&  $sub_menu_lables["menu_label"] =='Opensips') || (common_model::$global_config['system_config']['enterprise']== 1 && common_model::$global_config['system_config']['opensips']== 0 &&  $sub_menu_lables["menu_label"] =='SIP Devices') || (($acc_info['type'] == '3' || $acc_info['type'] == '0') && $acc_info['allow_ip_management'] == '1' && strtolower($sub_menu_lables["menu_label"]) == 'ip settings')){
-								}else{?>
+								} else{?>
                                 <li><a href="<?php echo base_url().$sub_menu_lables["module_url"];?>"><?php echo gettext($sub_menu_lables["menu_label"]);?></a></li>
 				<?}?>
 				<?} ?>
-                            <?php }else{
+                            <?php } else{
 				if(common_model::$global_config['system_config']['opensips']==0 && $menu_key !='System Configuration'){ ?>    
 				    <li><a href="#"><span><?=$sub_menu_key;?></span><i class="fa fa-caret-right pull-right"></i></a>
 				<? } if(common_model::$global_config['system_config']['opensips']==1) {?>

web_interface/astpp/system/language/english/form_validation_lang.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 $lang['currency_decimal'] = 'The %s Field may contain only numeric and decimals EX(99999.99999)';
 $lang['password_check'] = "The %s field is not match with your old password.";
 $lang['did_account_checking'] = "This %s have not sufficient amount to purchase this DID";
-$lang['phn_number']	= "The %s field is Invalid.";
+$lang['phn_number'] = "The %s field is Invalid.";
 
 /* End of file form_validation_lang.php */
 /* Location: ./system/language/english/form_validation_lang.php */