iNextrix / ASTPP

web_interface/astpp/application/config/foreign_chars.php

Spacing +3 added lines, -3 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');
 }
 /*
  * | -------------------------------------------------------------------
@@ -11,7 +11,7 @@ 
  * | conversion used by the Text helper
  * |
  */
-$foreign_characters = array (
+$foreign_characters = array(
 		'/ä|æ|ǽ/' => 'ae',
 		'/ö|œ/' => 'oe',
 		'/ü/' => 'ue',

web_interface/astpp/application/config/autoload.php

Spacing +8 added lines, -8 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');
 }
 /*
  * | -------------------------------------------------------------------
@@ -41,7 +41,7 @@ 
  * |
  */
 
-$autoload ['packages'] = array ();
+$autoload ['packages'] = array();
 
 /*
  * | -------------------------------------------------------------------
@@ -56,7 +56,7 @@ 
  */
 
 // $autoload['libraries'] = array('database','session');
-$autoload ['libraries'] = array (
+$autoload ['libraries'] = array(
 		'database',
 		'session',
 		'locale',
@@ -72,7 +72,7 @@ 
  * | $autoload['helper'] = array('url', 'file');
  */
 
-$autoload ['helper'] = array (
+$autoload ['helper'] = array(
 		'url',
 		'template_inheritance',
 		'form' 
@@ -91,7 +91,7 @@ 
  * |
  */
 
-$autoload ['config'] = array ();
+$autoload ['config'] = array();
 
 /*
  * | -------------------------------------------------------------------
@@ -106,7 +106,7 @@ 
  * |
  */
 
-$autoload ['language'] = array ();
+$autoload ['language'] = array();
 
 /*
  * | -------------------------------------------------------------------
@@ -118,7 +118,7 @@ 
  * |
  */
 
-$autoload ['model'] = array (
+$autoload ['model'] = array(
 		'common_model',
 		'db_model' 
 );

web_interface/astpp/application/hooks/router.php

Indentation +9 added lines, -9 removed lines

@@ -2,8 +2,8 @@ 
 if(!defined( 'BASEPATH' ) ) exit( 'No direct script access allowed' );
 
 class Router {
-      public static $_domain	= '';
-      public function route() {
+	  public static $_domain	= '';
+	  public function route() {
 	if(isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != ''){
 	  require_once(BASEPATH.'database/DB.php');
 	  $db = DB(); // getting hold of a DAO instance
@@ -12,17 +12,17 @@ 
 	  $res = $db->get("invoice_conf");
 	  $domain = $res->result(); 
 	  if(!empty($domain) && $domain[0]->domain != ""){
-	    self::$_domain = "http://".$domain[0]->domain."/";
+		self::$_domain = "http://".$domain[0]->domain."/";
 	  }
 	}
-      }
+	  }
 
-      public function config() {
+	  public function config() {
 	  if(self::$_domain != ""){
-	    $RTR = load_class('Router','core');
-	    $RTR->config->config['base_url'] = self::$_domain;
-	    return true;
+		$RTR = load_class('Router','core');
+		$RTR->config->config['base_url'] = self::$_domain;
+		return true;
+	  }
 	  }
-      }
 }
 ?> 

Spacing +6 added lines, -6 removed lines

@@ -1,25 +1,25 @@
 <?php
-if(!defined( 'BASEPATH' ) ) exit( 'No direct script access allowed' );
+if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Router {
-      public static $_domain	= '';
+      public static $_domain = '';
       public function route() {
-	if(isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != ''){
+	if (isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != '') {
 	  require_once(BASEPATH.'database/DB.php');
 	  $db = DB(); // getting hold of a DAO instance
 	  $db->select("domain");
  	  $db->where(array("domain"=>$_SERVER["HTTP_HOST"]));
 	  $res = $db->get("invoice_conf");
 	  $domain = $res->result(); 
-	  if(!empty($domain) && $domain[0]->domain != ""){
+	  if ( ! empty($domain) && $domain[0]->domain != "") {
 	    self::$_domain = "http://".$domain[0]->domain."/";
 	  }
 	}
       }
 
       public function config() {
-	  if(self::$_domain != ""){
-	    $RTR = load_class('Router','core');
+	  if (self::$_domain != "") {
+	    $RTR = load_class('Router', 'core');
 	    $RTR->config->config['base_url'] = self::$_domain;
 	    return true;
 	  }

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined( 'BASEPATH' ) ) exit( 'No direct script access allowed' );
+if(!defined( 'BASEPATH' ) ) {
+	exit( 'No direct script access allowed' );
+}
 
 class Router {
       public static $_domain	= '';

web_interface/astpp/application/libraries/Timezone.php

Spacing +20 added lines, -20 removed lines

@@ -20,30 +20,30 @@ 
 // 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 Timezone {
 	function __construct() {
-		$this->CI = & get_instance ();
-		$this->CI->load->library ( 'session' );
-		$this->CI->load->database ();
+		$this->CI = & get_instance();
+		$this->CI->load->library('session');
+		$this->CI->load->database();
 	}
 	function uset_timezone() {
-		$account_data = $this->CI->session->userdata ( 'accountinfo' );
+		$account_data = $this->CI->session->userdata('accountinfo');
 		return $account_data ['timezone_id'];
 	}
 	function display_GMT($currDate, $fulldate = 1, $timezone_id = "") {
 		// Added condition
-		$number = ($timezone_id == "") ? $this->uset_timezone () : $timezone_id;
+		$number = ($timezone_id == "") ? $this->uset_timezone() : $timezone_id;
 		$SERVER_GMT = '0';
 		
-		$result = $this->CI->db->query ( "select gmtoffset from timezone where id =" . $number );
-		$timezone_offset = $result->result ();
+		$result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
+		$timezone_offset = $result->result();
 		
 		$USER_GMT = $timezone_offset ['0']->gmtoffset;
 		
-		$date_time_array = getdate ( strtotime ( $currDate ) );
+		$date_time_array = getdate(strtotime($currDate));
 		
 		$hours = $date_time_array ['hours'];
 		$minutes = $date_time_array ['minutes'];
@@ -51,13 +51,13 @@ 
 		$month = $date_time_array ['mon'];
 		$day = $date_time_array ['mday'];
 		$year = $date_time_array ['year'];
-		$timestamp = mktime ( $hours, $minutes, $seconds, $month, $day, $year );
+		$timestamp = mktime($hours, $minutes, $seconds, $month, $day, $year);
 		
 		$timestamp = $timestamp + ($USER_GMT - $SERVER_GMT);
 		if ($fulldate == 1) {
-			$date = date ( "Y-m-d H:i:s", $timestamp );
+			$date = date("Y-m-d H:i:s", $timestamp);
 		} else {
-			$date = date ( "Y-m-d", $timestamp );
+			$date = date("Y-m-d", $timestamp);
 		}
 		
 		return $date;
@@ -65,28 +65,28 @@ 
 	function convert_to_GMT($currDate, $fulldate = 1, $timezone_id = '') {
 		
 		// Added condition
-		$number = ($timezone_id == "") ? $this->uset_timezone () : $timezone_id;
+		$number = ($timezone_id == "") ? $this->uset_timezone() : $timezone_id;
 		$SERVER_GMT = '0';
 		
-		$result = $this->CI->db->query ( "select gmtoffset from timezone where id =" . $number );
-		$timezone_offset = $result->result ();
+		$result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
+		$timezone_offset = $result->result();
 		
 		$USER_GMT = $timezone_offset ['0']->gmtoffset;
 		
-		$date_time_array = getdate ( strtotime ( $currDate ) );
+		$date_time_array = getdate(strtotime($currDate));
 		$hours = $date_time_array ['hours'];
 		$minutes = $date_time_array ['minutes'];
 		$seconds = $date_time_array ['seconds'];
 		$month = $date_time_array ['mon'];
 		$day = $date_time_array ['mday'];
 		$year = $date_time_array ['year'];
-		$timestamp = mktime ( $hours, $minutes, $seconds, $month, $day, $year );
+		$timestamp = mktime($hours, $minutes, $seconds, $month, $day, $year);
 		
 		$timestamp = $timestamp - ($SERVER_GMT - $USER_GMT);
 		if ($fulldate == 1) {
-			$date = date ( "Y-m-d H:i:s", $timestamp );
+			$date = date("Y-m-d H:i:s", $timestamp);
 		} else {
-			$date = date ( "Y-m-d", $timestamp );
+			$date = date("Y-m-d", $timestamp);
 		}
 		return $date;
 	}

web_interface/astpp/application/libraries/astpp/email_lib.php

Spacing +119 added lines, -119 removed lines

@@ -20,8 +20,8 @@ 
 // 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
@@ -42,46 +42,46 @@ 
 	public $company_website = '';
 	public $account_id = '';
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
-		$this->CI->load->model ( 'db_model' );
-		$this->CI->load->library ( 'email' );
-		$this->CI->load->library ( 'session' );
+		$this->CI = & get_instance();
+		$this->CI->load->model('db_model');
+		$this->CI->load->library('email');
+		$this->CI->load->library('session');
 	}
 	function get_email_settings() {
-		$where = array (
+		$where = array(
 				'group_title' => 'email' 
 		);
-		$query = $this->CI->db_model->getSelect ( "*", "system", $where );
-		$query = $query->result_array ();
-		foreach ( $query as $key => $val ) {
-			$tempvar = strtolower ( $val ['name'] );
+		$query = $this->CI->db_model->getSelect("*", "system", $where);
+		$query = $query->result_array();
+		foreach ($query as $key => $val) {
+			$tempvar = strtolower($val ['name']);
 			$this->$tempvar = $val ['value'];
 		}
 	}
 	function get_template($type) {
-		$where = array (
+		$where = array(
 				'name' => $type 
 		);
-		$query = $this->CI->db_model->getSelect ( "*", "default_templates", $where );
-		$query = $query->result ();
+		$query = $this->CI->db_model->getSelect("*", "default_templates", $where);
+		$query = $query->result();
 		$this->message = $query [0]->template;
 		$this->subject = $query [0]->subject;
 	}
 	function get_account_info($accountid) {
-		$where = array (
+		$where = array(
 				'id' => $accountid 
 		);
-		$query = $this->CI->db_model->getSelect ( "*", "accounts", $where );
-		$query = $query->result_array ();
-		if (isset ( $query [0] ['email'] ) && $query [0] ['email'] != '') {
-			$query [0] ['currency_name'] = $this->CI->common->get_field_name ( 'currency', 'currency', $query [0] ['currency_id'] );
-			$query [0] ['timezone_name'] = $this->CI->common->get_field_name ( 'gmtzone', 'timezone', $query [0] ['timezone_id'] );
-			$query [0] ['country_name'] = $this->CI->common->get_field_name ( 'country', 'countrycode', $query [0] ['country_id'] );
+		$query = $this->CI->db_model->getSelect("*", "accounts", $where);
+		$query = $query->result_array();
+		if (isset ($query [0] ['email']) && $query [0] ['email'] != '') {
+			$query [0] ['currency_name'] = $this->CI->common->get_field_name('currency', 'currency', $query [0] ['currency_id']);
+			$query [0] ['timezone_name'] = $this->CI->common->get_field_name('gmtzone', 'timezone', $query [0] ['timezone_id']);
+			$query [0] ['country_name'] = $this->CI->common->get_field_name('country', 'countrycode', $query [0] ['country_id']);
 			$this->to = $query [0] ['email'];
 			$this->account_id = $query [0] ['id'];
-			unset ( $query [0] ['id'] );
+			unset ($query [0] ['id']);
 			$query [0] ['username'] = $query [0] ['number'];
-			unset ( $query [0] ['number'] );
+			unset ($query [0] ['number']);
 			return $query [0];
 		}
 		return false;
@@ -92,22 +92,22 @@ 
 	 * @param string $detail_type        	
 	 */
 	function get_info($id, $detail_type) {
-		$where = array (
+		$where = array(
 				'id' => $id 
 		);
-		$query = $this->CI->db_model->getSelect ( "*", $detail_type, $where );
-		$query = $query->result_array ();
-		if (isset ( $query [0] ['accountid'] )) {
-			$query = $this->get_account_info ( $query [0] ['accountid'] );
+		$query = $this->CI->db_model->getSelect("*", $detail_type, $where);
+		$query = $query->result_array();
+		if (isset ($query [0] ['accountid'])) {
+			$query = $this->get_account_info($query [0] ['accountid']);
 			return $query [0];
 		}
 		return false;
 	}
 	function get_admin_details() {
-		$where = array ();
-		$query = $this->CI->db_model->getSelect ( "*", "invoice_conf", $where );
-		$query = $query->result ();
-		if (isset ( $query [0]->emailaddress ) && $query [0]->emailaddress != '') {
+		$where = array();
+		$query = $this->CI->db_model->getSelect("*", "invoice_conf", $where);
+		$query = $query->result();
+		if (isset ($query [0]->emailaddress) && $query [0]->emailaddress != '') {
 			$this->company_website = $query [0]->website;
 			$this->from = $query [0]->emailaddress;
 			$this->company_name = $query [0]->company_name;
@@ -116,16 +116,16 @@ 
 		return false;
 	}
 	function build_template($template_type, $detail, $detail_type = '') {
-		if (! is_array ( $template_type ))
-			$this->get_template ( $template_type );
+		if ( ! is_array($template_type))
+			$this->get_template($template_type);
 		else {
 			$this->message = $template_type ['message'];
 			$this->subject = $template_type ['subject'];
 			$template_type = '';
 		}
-		if (is_array ( $detail )) {
+		if (is_array($detail)) {
 			$templateinfo = $detail;
-			if (isset ( $detail ['email'] )) {
+			if (isset ($detail ['email'])) {
 				$this->to = $detail ['email'];
 			}
 			/**
@@ -134,7 +134,7 @@ 
 			 * Email test
 			 * ***
 			 */
-			if (isset ( $templateinfo ['number'] )) {
+			if (isset ($templateinfo ['number'])) {
 				$templateinfo ['username'] = $templateinfo ['number'];
 			}
 			
@@ -142,44 +142,44 @@ 
 			 * **********
 			 */
 			$this->account_id = $templateinfo ['accountid'];
-			unset ( $templateinfo ['number'] );
-		} else if (! is_array ( $detail ) && $detail_type == '') {
-			$templateinfo = $this->get_account_info ( $detail );
+			unset ($templateinfo ['number']);
+		} else if ( ! is_array($detail) && $detail_type == '') {
+			$templateinfo = $this->get_account_info($detail);
 		} else {
-			$templateinfo = $this->get_info ( $detail, $detail_type );
+			$templateinfo = $this->get_info($detail, $detail_type);
 		}
 		
-		if ($this->get_admin_details () && is_array ( $templateinfo ) && isset ( $templateinfo ['first_name'] ) && $templateinfo ['first_name'] != '') {
-			$this->message = html_entity_decode ( $this->message );
-			$this->message = str_replace ( "#COMPANY_EMAIL#", $this->from, $this->message );
-			$this->message = str_replace ( "#COMPANY_NAME#", $this->company_name, $this->message );
-			$this->message = str_replace ( "#COMPANY_WEBSITE#", $this->company_website, $this->message );
-			$this->message = str_replace ( '#NAME#', $templateinfo ['first_name'] . " " . $templateinfo ['last_name'], $this->message );
-			$this->message = str_replace ( '#USERNAME#', $templateinfo ['username'], $this->message );
-			$this->message = str_replace ( '#PIN#', $templateinfo ['pin'], $this->message );
-			$this->message = str_replace ( '#BALANCE#', $templateinfo ['balance'], $this->message );
-			$this->message = str_replace ( '#PASSWORD#', $templateinfo ['password'], $this->message );
-			$this->subject = str_replace ( "#NAME#", $templateinfo ['first_name'] . " " . $templateinfo ['last_name'], $this->subject );
-			$this->subject = str_replace ( "#COMPANY_NAME#", $this->company_name, $this->subject );
+		if ($this->get_admin_details() && is_array($templateinfo) && isset ($templateinfo ['first_name']) && $templateinfo ['first_name'] != '') {
+			$this->message = html_entity_decode($this->message);
+			$this->message = str_replace("#COMPANY_EMAIL#", $this->from, $this->message);
+			$this->message = str_replace("#COMPANY_NAME#", $this->company_name, $this->message);
+			$this->message = str_replace("#COMPANY_WEBSITE#", $this->company_website, $this->message);
+			$this->message = str_replace('#NAME#', $templateinfo ['first_name']." ".$templateinfo ['last_name'], $this->message);
+			$this->message = str_replace('#USERNAME#', $templateinfo ['username'], $this->message);
+			$this->message = str_replace('#PIN#', $templateinfo ['pin'], $this->message);
+			$this->message = str_replace('#BALANCE#', $templateinfo ['balance'], $this->message);
+			$this->message = str_replace('#PASSWORD#', $templateinfo ['password'], $this->message);
+			$this->subject = str_replace("#NAME#", $templateinfo ['first_name']." ".$templateinfo ['last_name'], $this->subject);
+			$this->subject = str_replace("#COMPANY_NAME#", $this->company_name, $this->subject);
 			switch ($template_type) {
 				case 'email_add_user' :
-					$this->message = str_replace ( '#NUMBER#', $templateinfo ['username'], $this->message );
+					$this->message = str_replace('#NUMBER#', $templateinfo ['username'], $this->message);
 					break;
 				case 'email_calling_card' :
-					$this->message = str_replace ( '#CARDNUMBER#', $templateinfo ['cardnumber'], $this->message );
+					$this->message = str_replace('#CARDNUMBER#', $templateinfo ['cardnumber'], $this->message);
 					break;
 				case 'email_new_invoice' :
-					$this->message = str_replace ( '#AMOUNT#', $templateinfo ['amount'], $this->message );
-					$this->message = str_replace ( '#INVOICE_NUMBER#', $templateinfo ['id'], $this->message );
-					$this->subject = str_replace ( "#INVOICE_NUMBER#", $templateinfo ['id'], $this->subject );
+					$this->message = str_replace('#AMOUNT#', $templateinfo ['amount'], $this->message);
+					$this->message = str_replace('#INVOICE_NUMBER#', $templateinfo ['id'], $this->message);
+					$this->subject = str_replace("#INVOICE_NUMBER#", $templateinfo ['id'], $this->subject);
 					break;
 				case 'email_add_did' :
-					$this->message = str_replace ( '#NUNBER#', $templateinfo ['number'], $this->message );
-					$this->subject = str_replace ( "#NUNBER#", $templateinfo ['number'], $this->subject );
+					$this->message = str_replace('#NUNBER#', $templateinfo ['number'], $this->message);
+					$this->subject = str_replace("#NUNBER#", $templateinfo ['number'], $this->subject);
 					break;
 				case 'email_remove_did' :
-					$this->message = str_replace ( '#NUNBER#', $templateinfo ['number'], $this->message );
-					$this->subject = str_replace ( "#NUNBER#", $templateinfo ['number'], $this->subject );
+					$this->message = str_replace('#NUNBER#', $templateinfo ['number'], $this->message);
+					$this->subject = str_replace("#NUNBER#", $templateinfo ['number'], $this->subject);
 					break;
 			}
 		}
@@ -190,7 +190,7 @@ 
 	 * @param string $attachment        	
 	 */
 	function mail_history($attachment) {
-		$send_mail_details = array (
+		$send_mail_details = array(
 				'from' => $this->from,
 				'to' => $this->to,
 				'subject' => $this->subject,
@@ -199,26 +199,26 @@ 
 				'status' => '1',
 				'attachment' => $attachment 
 		);
-		$this->CI->db->insert ( 'mail_details', $send_mail_details );
-		return $this->CI->db->insert_id ();
+		$this->CI->db->insert('mail_details', $send_mail_details);
+		return $this->CI->db->insert_id();
 	}
 	function update_mail_history($id) {
-		$this->CI->db->where ( array (
+		$this->CI->db->where(array(
 				'id' => $id 
-		) );
-		$send_mail_details = array (
+		));
+		$send_mail_details = array(
 				'status' => '0' 
 		);
-		$this->CI->db->update ( 'mail_details', $send_mail_details );
+		$this->CI->db->update('mail_details', $send_mail_details);
 	}
 	function set_email_paramenters($details) {
-		if (! is_array ( $details )) {
-			$this->get_admin_details ();
-			$where = array (
+		if ( ! is_array($details)) {
+			$this->get_admin_details();
+			$where = array(
 					'id' => $details 
 			);
-			$query = $this->CI->db_model->getSelect ( "*", "mail_details", $where );
-			$query = $query->result_array ();
+			$query = $this->CI->db_model->getSelect("*", "mail_details", $where);
+			$query = $query->result_array();
 			$details = $query [0];
 		}
 		$this->message = $details ['body'];
@@ -238,50 +238,50 @@ 
 		$config ['charset'] = "utf-8";
 		$config ['mailtype'] = "html";
 		$config ['newline'] = "\r\n";
-		$this->CI->email->initialize ( $config );
+		$this->CI->email->initialize($config);
 	}
 	function send_email($template_type, $details, $detail_type = '', $attachment = '', $resend = 0, $mass_mail = 0, $brodcast = 0) {
-		$this->get_email_settings ();
-		if (! $this->email) {
-			if (! $resend) {
-				$this->build_template ( $template_type, $details, $detail_type );
+		$this->get_email_settings();
+		if ( ! $this->email) {
+			if ( ! $resend) {
+				$this->build_template($template_type, $details, $detail_type);
 			} else {
-				$this->set_email_paramenters ( $details );
+				$this->set_email_paramenters($details);
 			}
 			
-			if (! $brodcast)
-				$history_id = $this->mail_history ( $attachment );
+			if ( ! $brodcast)
+				$history_id = $this->mail_history($attachment);
 			else
 				$history_id = $details ['history_id'];
-			if (isset ( $this->from ) && $this->from != '' && isset ( $this->to ) && $this->to != '' && ! $mass_mail) {
-				if (! $this->smtp) {
-					$this->get_smtp_details ();
+			if (isset ($this->from) && $this->from != '' && isset ($this->to) && $this->to != '' && ! $mass_mail) {
+				if ( ! $this->smtp) {
+					$this->get_smtp_details();
 				}
-				$this->CI->email->from ( $this->from, $this->company_name );
-				$this->CI->email->to ( $this->to );
-				$this->CI->email->subject ( $this->subject );
-				$this->CI->email->set_mailtype ( "html" );
-				eval ( "\$message = \"" . $this->message . "\";" );
-				$this->CI->email->message ( $this->message );
+				$this->CI->email->from($this->from, $this->company_name);
+				$this->CI->email->to($this->to);
+				$this->CI->email->subject($this->subject);
+				$this->CI->email->set_mailtype("html");
+				eval ("\$message = \"".$this->message."\";");
+				$this->CI->email->message($this->message);
 				
 				if ($attachment != "") {
-					$attac_exp = explode ( ",", $attachment );
-					foreach ( $attac_exp as $key => $value ) {
+					$attac_exp = explode(",", $attachment);
+					foreach ($attac_exp as $key => $value) {
 						if ($value != '') {
-							$this->CI->email->attach ( getcwd () . "/attachments/" . $value );
+							$this->CI->email->attach(getcwd()."/attachments/".$value);
 						}
 						$mail_data ['attachment'] [$key] = $value;
 					}
 				}
-				$this->CI->email->send ();
-				$mail_data ['from'] = isset ( $this->from ) ? $this->from : '';
-				$mail_data ['to'] = isset ( $this->to ) ? $this->to : '';
-				$mail_data ['subject'] = isset ( $this->subject ) ? $this->subject : '';
+				$this->CI->email->send();
+				$mail_data ['from'] = isset ($this->from) ? $this->from : '';
+				$mail_data ['to'] = isset ($this->to) ? $this->to : '';
+				$mail_data ['subject'] = isset ($this->subject) ? $this->subject : '';
 				if (common_model::$global_config ['system_config'] ['mail_debug'] == 0) {
-					$this->CI->email->print_debugger_email ( $mail_data, common_model::$global_config ['system_config'] ['log_path'] );
+					$this->CI->email->print_debugger_email($mail_data, common_model::$global_config ['system_config'] ['log_path']);
 				}
-				$this->CI->email->clear ( true );
-				$this->update_mail_history ( $history_id );
+				$this->CI->email->clear(true);
+				$this->update_mail_history($history_id);
 			}
 		}
 	}
@@ -291,31 +291,31 @@ 
 	 * *
 	 */
 	function send_mail($template_type, $details, $detail_type = '', $attachment = '', $resend = 0, $mass_mail = 0, $brodcast = 0) {
-		$this->get_email_settings ();
-		if (! $this->email) {
+		$this->get_email_settings();
+		if ( ! $this->email) {
 			
-			if (! $resend) {
-				$this->build_template ( $template_type, $details, $detail_type );
+			if ( ! $resend) {
+				$this->build_template($template_type, $details, $detail_type);
 			} else {
-				$this->set_email_paramenters ( $details );
+				$this->set_email_paramenters($details);
 			}
 			
-			if (! $brodcast)
-				$history_id = $this->mail_history ( $attachment );
+			if ( ! $brodcast)
+				$history_id = $this->mail_history($attachment);
 			else
 				$history_id = $details ['history_id'];
-			if (isset ( $this->from ) && $this->from != '' && isset ( $this->to ) && $this->to != '' && ! $mass_mail) {
-				if (! $this->smtp) {
-					$this->get_smtp_details ();
+			if (isset ($this->from) && $this->from != '' && isset ($this->to) && $this->to != '' && ! $mass_mail) {
+				if ( ! $this->smtp) {
+					$this->get_smtp_details();
 				}
-				$this->CI->email->from ( $this->from, $this->company_name );
-				$this->CI->email->to ( $this->to );
-				$this->CI->email->subject ( $this->subject );
-				eval ( "\$message = \"" . $this->message . "\";" );
-				$this->CI->email->message ( $this->message );
-				$this->CI->email->send ();
-				$this->CI->email->clear ( true );
-				$this->update_mail_history ( $history_id );
+				$this->CI->email->from($this->from, $this->company_name);
+				$this->CI->email->to($this->to);
+				$this->CI->email->subject($this->subject);
+				eval ("\$message = \"".$this->message."\";");
+				$this->CI->email->message($this->message);
+				$this->CI->email->send();
+				$this->CI->email->clear(true);
+				$this->update_mail_history($history_id);
 			}
 		}
 	}

Braces +18 added lines, -14 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
@@ -116,9 +117,9 @@ 
 		return false;
 	}
 	function build_template($template_type, $detail, $detail_type = '') {
-		if (! is_array ( $template_type ))
-			$this->get_template ( $template_type );
-		else {
+		if (! is_array ( $template_type )) {
+					$this->get_template ( $template_type );
+		} else {
 			$this->message = $template_type ['message'];
 			$this->subject = $template_type ['subject'];
 			$template_type = '';
@@ -228,8 +229,9 @@ 
 		$this->account_id = $details ['accountid'];
 	}
 	function get_smtp_details() {
-		if ($this->smtp_port == '' || $this->smtp_host == '' || $this->smtp_user == '' || $this->smtp_pass == '')
-			exit ();
+		if ($this->smtp_port == '' || $this->smtp_host == '' || $this->smtp_user == '' || $this->smtp_pass == '') {
+					exit ();
+		}
 		$config ['protocol'] = "smtp";
 		$config ['smtp_host'] = $this->smtp_host;
 		$config ['smtp_port'] = $this->smtp_port;
@@ -249,10 +251,11 @@ 
 				$this->set_email_paramenters ( $details );
 			}
 			
-			if (! $brodcast)
-				$history_id = $this->mail_history ( $attachment );
-			else
-				$history_id = $details ['history_id'];
+			if (! $brodcast) {
+							$history_id = $this->mail_history ( $attachment );
+			} else {
+							$history_id = $details ['history_id'];
+			}
 			if (isset ( $this->from ) && $this->from != '' && isset ( $this->to ) && $this->to != '' && ! $mass_mail) {
 				if (! $this->smtp) {
 					$this->get_smtp_details ();
@@ -300,10 +303,11 @@ 
 				$this->set_email_paramenters ( $details );
 			}
 			
-			if (! $brodcast)
-				$history_id = $this->mail_history ( $attachment );
-			else
-				$history_id = $details ['history_id'];
+			if (! $brodcast) {
+							$history_id = $this->mail_history ( $attachment );
+			} else {
+							$history_id = $details ['history_id'];
+			}
 			if (isset ( $this->from ) && $this->from != '' && isset ( $this->to ) && $this->to != '' && ! $mass_mail) {
 				if (! $this->smtp) {
 					$this->get_smtp_details ();

web_interface/astpp/application/libraries/astpp/permission.php

Spacing +24 added lines, -24 removed lines

@@ -20,44 +20,44 @@
 // 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 Permission {
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
-		$this->CI->load->model ( "db_model" );
-		$this->CI->load->library ( 'session' );
+		$this->CI = & get_instance();
+		$this->CI->load->model("db_model");
+		$this->CI->load->library('session');
 	}
 	function get_module_access($user_type) {
-		$where = array (
+		$where = array(
 				"userlevelid" => $user_type 
 		);
-		$modules_arr = $this->CI->db_model->getSelect ( "module_permissions", "userlevels", $where );
+		$modules_arr = $this->CI->db_model->getSelect("module_permissions", "userlevels", $where);
 		if ($modules_arr->num_rows > 0) {
-			$modules_arr = $modules_arr->result_array ();
+			$modules_arr = $modules_arr->result_array();
 			$modules_arr = $modules_arr [0] ['module_permissions'];
 			
-			$menu_arr = $this->CI->db_model->select ( "*", "menu_modules", "id IN ($modules_arr)", "priority", "asc", "", "", "" );
-			$menu_list = array ();
-			$permited_modules = array ();
-			$modules_seq_arr = array ();
-			$modules_seq_arr = explode ( ",", $modules_arr );
-			$label_arr = array ();
-			foreach ( $menu_arr->result_array () as $menu_key => $menu_value ) {
-				if (! isset ( $label_arr [$menu_value ['menu_label']] ) && $menu_value ['menu_label'] != 'Configuration') {
+			$menu_arr = $this->CI->db_model->select("*", "menu_modules", "id IN ($modules_arr)", "priority", "asc", "", "", "");
+			$menu_list = array();
+			$permited_modules = array();
+			$modules_seq_arr = array();
+			$modules_seq_arr = explode(",", $modules_arr);
+			$label_arr = array();
+			foreach ($menu_arr->result_array() as $menu_key => $menu_value) {
+				if ( ! isset ($label_arr [$menu_value ['menu_label']]) && $menu_value ['menu_label'] != 'Configuration') {
 					$label_arr [$menu_value ['menu_label']] = $menu_value ['menu_label'];
 					$menu_value ["menu_image"] = ($menu_value ["menu_image"] == "") ? "Home.png" : $menu_value ["menu_image"];
-					$menu_list [$menu_value ["menu_title"]] [$menu_value ["menu_subtitle"]] [] = array (
-							"menu_label" => trim ( $menu_value ["menu_label"] ),
-							"module_url" => trim ( $menu_value ["module_url"] ),
-							"module" => trim ( $menu_value ["module_name"] ),
-							"menu_image" => trim ( $menu_value ["menu_image"] ) 
+					$menu_list [$menu_value ["menu_title"]] [$menu_value ["menu_subtitle"]] [] = array(
+							"menu_label" => trim($menu_value ["menu_label"]),
+							"module_url" => trim($menu_value ["module_url"]),
+							"module" => trim($menu_value ["module_name"]),
+							"menu_image" => trim($menu_value ["menu_image"]) 
 					);
 				}
-				$permited_modules [] = trim ( $menu_value ["module_name"] );
+				$permited_modules [] = trim($menu_value ["module_name"]);
 			}
-			$this->CI->session->set_userdata ( 'permited_modules', serialize ( $permited_modules ) );
-			$this->CI->session->set_userdata ( 'menuinfo', serialize ( $menu_list ) );
+			$this->CI->session->set_userdata('permited_modules', serialize($permited_modules));
+			$this->CI->session->set_userdata('menuinfo', serialize($menu_list));
 			return true;
 		}
 	}

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' );
+}
 class Permission {
 	function __construct($library_name = '') {
 		$this->CI = & get_instance ();

web_interface/astpp/application/libraries/astpp/form.php

Spacing +285 added lines, -285 removed lines

@@ -20,30 +20,30 @@ 
 // 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 Form {
 	protected $CI; // codeigniter
-	protected $fields = array (); // array of fields
+	protected $fields = array(); // array of fields
 	protected $form_title = 'Form';
 	protected $form_id = 'form';
 	protected $form_action = '';
 	protected $form_class = '';
-	protected $hidden = array ();
+	protected $hidden = array();
 	protected $multipart = FALSE; // default to standard form
 	protected $submit_button = 'Submit';
 	protected $after_button = '';
-	protected $rules = array (); // storage for validation rules
+	protected $rules = array(); // storage for validation rules
 	function __construct() {
-		$this->CI = & get_instance ();
-		$this->CI->load->library ( 'form_validation' );
-		$this->CI->load->library ( 'astpp/common' );
-		$this->CI->load->model ( 'db_model' );
-		$this->check_permissions ();
+		$this->CI = & get_instance();
+		$this->CI->load->library('form_validation');
+		$this->CI->load->library('astpp/common');
+		$this->CI->load->model('db_model');
+		$this->check_permissions();
 	}
 	
 	// __construct
@@ -51,67 +51,67 @@ 
 	 * adds raw html to the field array
 	 */
 	function check_permissions() {
-		if ($this->CI->session->userdata ( 'user_login' ) == TRUE) {
-			$module_info = unserialize ( $this->CI->session->userdata ( "permited_modules" ) );
-			if ($this->CI->session->userdata ( 'userlevel_logintype' ) != 0 && $this->CI->session->userdata ( 'userlevel_logintype' ) != 3) {
+		if ($this->CI->session->userdata('user_login') == TRUE) {
+			$module_info = unserialize($this->CI->session->userdata("permited_modules"));
+			if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
 				$module_info [] = 'dashboard';
 			}
 			$url = $this->CI->uri->uri_string;
-			$file_name = explode ( "/", $url );
-			if (isset ( $file_name ['1'] )) {
-				$module = explode ( '_', $file_name ['1'] );
+			$file_name = explode("/", $url);
+			if (isset ($file_name ['1'])) {
+				$module = explode('_', $file_name ['1']);
 			} else {
 				$module = $file_name;
 			}
-			if ($this->CI->session->userdata ( 'userlevel_logintype' ) != -1) {
+			if ($this->CI->session->userdata('userlevel_logintype') != -1) {
 				$module_info [] = 'user';
 			}
-			if (in_array ( $module [0], $module_info )) {
-				if ($this->CI->session->userdata ( 'userlevel_logintype' ) == 0 && $module [0] == 'customer' && isset ( $file_name [1] ) && $file_name [1] != 'customer_transfer') {
-					redirect ( base_url () . 'user/user/' );
+			if (in_array($module [0], $module_info)) {
+				if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module [0] == 'customer' && isset ($file_name [1]) && $file_name [1] != 'customer_transfer') {
+					redirect(base_url().'user/user/');
 				} else {
 					return true;
 				}
 			} else {
-				$this->CI->session->set_userdata ( 'astpp_errormsg', 'You do not have permission to access this module..!' );
-				if ($this->CI->session->userdata ( 'userlevel_logintype' ) == '-1' || $this->CI->session->userdata ( 'logintype' ) == '1' || $this->CI->session->userdata ( 'logintype' ) == '4') {
-					redirect ( base_url () . 'dashboard/' );
+				$this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
+				if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1' || $this->CI->session->userdata('logintype') == '4') {
+					redirect(base_url().'dashboard/');
 				} else {
-					redirect ( base_url () . 'user/user/' );
+					redirect(base_url().'user/user/');
 				}
 			}
 		} else {
-			redirect ( base_url () );
+			redirect(base_url());
 		}
 	}
 	function build_form($fields_array, $values) {
 		$form_contents = '';
 		$form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
-		if (isset ( $fields_array ['breadcrumb'] )) {
-			$form_contents .= form_breadcrumb ( $fields_array ['breadcrumb'] );
-			unset ( $fields_array ['breadcrumb'] );
+		if (isset ($fields_array ['breadcrumb'])) {
+			$form_contents .= form_breadcrumb($fields_array ['breadcrumb']);
+			unset ($fields_array ['breadcrumb']);
 		}
-		$form_contents .= form_open ( $fields_array ['forms'] [0], $fields_array ['forms'] [1] );
-		unset ( $fields_array ['forms'] );
-		$button_array = array ();
-		if (isset ( $fields_array ['button_save'] ) || isset ( $fields_array ['button_cancel'] ) || isset ( $fields_array ['additional_button'] )) {
+		$form_contents .= form_open($fields_array ['forms'] [0], $fields_array ['forms'] [1]);
+		unset ($fields_array ['forms']);
+		$button_array = array();
+		if (isset ($fields_array ['button_save']) || isset ($fields_array ['button_cancel']) || isset ($fields_array ['additional_button'])) {
 			$save = $fields_array ['button_save'];
-			unset ( $fields_array ['button_save'] );
-			if (isset ( $fields_array ['button_cancel'] )) {
+			unset ($fields_array ['button_save']);
+			if (isset ($fields_array ['button_cancel'])) {
 				$cancel = $fields_array ['button_cancel'];
-				unset ( $fields_array ['button_cancel'] );
+				unset ($fields_array ['button_cancel']);
 			}
-			if (isset ( $fields_array ['additional_button'] )) {
+			if (isset ($fields_array ['additional_button'])) {
 				$additiopnal_button = $fields_array ['additional_button'];
-				unset ( $fields_array ['additional_button'] );
+				unset ($fields_array ['additional_button']);
 			}
 		}
-		if (isset ( $additiopnal_button )) {
-			$form_contents .= form_button ( gettext ( $additiopnal_button ) );
+		if (isset ($additiopnal_button)) {
+			$form_contents .= form_button(gettext($additiopnal_button));
 		}
 		$i = 0;
-		foreach ( $fields_array as $fieldset_key => $form_fileds ) {
-			if (count ( $fields_array ) > 1) {
+		foreach ($fields_array as $fieldset_key => $form_fileds) {
+			if (count($fields_array) > 1) {
 				if ($i == 1 || $i == 3) {
 					$form_contents .= '<div class="col-md-6 no-padding pull-right">';
 					$form_contents .= '<div class="col-md-12 padding-x-4">';
@@ -126,235 +126,235 @@ 
 			$form_contents .= '<ul class="no-padding">';
 			$form_contents .= '<div class="col-md-12 no-padding">';
 			if ($i == 1 || $i == 3) {
-				$form_contents .= form_fieldset ( gettext ( $fieldset_key ) );
+				$form_contents .= form_fieldset(gettext($fieldset_key));
 			} else {
-				$form_contents .= form_fieldset ( gettext ( $fieldset_key ) );
+				$form_contents .= form_fieldset(gettext($fieldset_key));
 			}
-			foreach ( $form_fileds as $fieldkey => $fieldvalue ) {
-				if (isset ( $fieldvalue ) && $fieldvalue != '') {
+			foreach ($form_fileds as $fieldkey => $fieldvalue) {
+				if (isset ($fieldvalue) && $fieldvalue != '') {
 					$form_contents .= '<li class="col-md-12">';
 					if ($fieldvalue [1] == 'HIDDEN') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? @$fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						else
-							$fieldvalue [2] ['value'] = ($values) ? (isset ( $values [$fieldvalue [2] ['name']] ) ? $values [$fieldvalue [2] ['name']] : '') : (isset ( $fieldvalue [2] ['value'] ) ? $fieldvalue [2] ['value'] : '');
-						$form_contents .= form_hidden ( $fieldvalue [2] ['name'], $fieldvalue [2] ['value'] );
+							$fieldvalue [2] ['value'] = ($values) ? (isset ($values [$fieldvalue [2] ['name']]) ? $values [$fieldvalue [2] ['name']] : '') : (isset ($fieldvalue [2] ['value']) ? $fieldvalue [2] ['value'] : '');
+						$form_contents .= form_hidden($fieldvalue [2] ['name'], $fieldvalue [2] ['value']);
 					} else {
-						$validation_arr = array ();
+						$validation_arr = array();
 						if ($fieldvalue [1] == 'INPUT') {
-							if (! empty ( $fieldvalue [3] )) {
-								$validation_arr = explode ( "|", $fieldvalue [3] );
+							if ( ! empty ($fieldvalue [3])) {
+								$validation_arr = explode("|", $fieldvalue [3]);
 							}
 						} elseif ($fieldvalue [2] == 'SELECT') {
 							
-							if (is_array ( $fieldvalue [4] )) {
-								$validation_arr = explode ( "|", $fieldvalue [4] ['rules'] );
+							if (is_array($fieldvalue [4])) {
+								$validation_arr = explode("|", $fieldvalue [4] ['rules']);
 							} else {
-								$validation_arr = explode ( "|", $fieldvalue [4] );
+								$validation_arr = explode("|", $fieldvalue [4]);
 							}
 						}
-						if (! empty ( $validation_arr )) {
-							$fieldvalue [0] = in_array ( 'required', $validation_arr ) ? $fieldvalue [0] . "<span style='color:black;'> *</span>" : $fieldvalue [0];
-							$fieldvalue [0] = in_array ( 'dropdown', $validation_arr ) ? $fieldvalue [0] . "<span style='color:black;'> *</span>" : $fieldvalue [0];
+						if ( ! empty ($validation_arr)) {
+							$fieldvalue [0] = in_array('required', $validation_arr) ? $fieldvalue [0]."<span style='color:black;'> *</span>" : $fieldvalue [0];
+							$fieldvalue [0] = in_array('dropdown', $validation_arr) ? $fieldvalue [0]."<span style='color:black;'> *</span>" : $fieldvalue [0];
 						}
 						
-						if (is_array ( $fieldvalue [1] ) || (is_array ( $fieldvalue [2] ) && isset ( $fieldvalue [2] ['hidden'] ))) {
-							$form_contents .= form_label ( gettext ( $fieldvalue [0] ), $fieldvalue [0], array (
+						if (is_array($fieldvalue [1]) || (is_array($fieldvalue [2]) && isset ($fieldvalue [2] ['hidden']))) {
+							$form_contents .= form_label(gettext($fieldvalue [0]), $fieldvalue [0], array(
 									'class' => 'col-md-3 no-padding add_settings' 
-							) );
+							));
 						} else {
-							$form_contents .= form_label ( gettext ( $fieldvalue [0] ), "", array (
+							$form_contents .= form_label(gettext($fieldvalue [0]), "", array(
 									"class" => "col-md-3 no-padding" 
-							) );
+							));
 						}
 					}
-					if ($fieldvalue [2] == 'SELECT' && ! isset ( $fieldvalue [13] )) {
+					if ($fieldvalue [2] == 'SELECT' && ! isset ($fieldvalue [13])) {
 						
 						/*
 						 * To make Drop down enabled disabled
 						 */
-						$extra = isset ( $fieldvalue [1] ['extra'] ) ? $fieldvalue [1] ['extra'] : '';
+						$extra = isset ($fieldvalue [1] ['extra']) ? $fieldvalue [1] ['extra'] : '';
 						/**
 						 * ************************
 						 */
 						if ($fieldvalue [7] != '' && $fieldvalue [8] != '') {
-							$str = $fieldvalue [7] . "," . $fieldvalue [8];
+							$str = $fieldvalue [7].",".$fieldvalue [8];
 							
-							if (isset ( $this->CI->input->post )) {
-								$fieldvalue ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [1] : $this->CI->input->post ( $fieldvalue [1] );
+							if (isset ($this->CI->input->post)) {
+								$fieldvalue ['value'] = ( ! $this->CI->input->post($fieldvalue [1])) ? @$fieldvalue [1] : $this->CI->input->post($fieldvalue [1]);
 							} else {
-								if (is_array ( $fieldvalue [1] )) {
+								if (is_array($fieldvalue [1])) {
 									$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1] ['name']] : @$fieldvalue [1];
 								} else {
 									$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1]] : @$fieldvalue [1];
 								}
 							}
-							$drp_array = call_user_func_array ( array (
+							$drp_array = call_user_func_array(array(
 									$this->CI->db_model,
 									$fieldvalue [10] 
-							), array (
+							), array(
 									$str,
 									$fieldvalue [9],
 									$fieldvalue [11],
 									$fieldvalue [12] 
-							) );
+							));
 							
-							if ($fieldset_key == gettext ( 'System Configuration Information' ) || ($fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue [0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue [0] == 'Rate Group' || ($fieldset_key == 'Origination Rate Add/Edit' && $fieldvalue [0] == 'Trunks') || $fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Rate Group' || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Failover GW Name #1') || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Failover GW Name #2') || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Rate Group') || ($fieldset_key == 'Sip Devices' && $fieldvalue [0] == 'Sip Profile') || ($fieldset_key == 'Sip Devices' && $fieldvalue [0] == 'Account')) {
-								$form_contents .= form_dropdown_all ( $fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra );
+							if ($fieldset_key == gettext('System Configuration Information') || ($fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue [0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue [0] == 'Rate Group' || ($fieldset_key == 'Origination Rate Add/Edit' && $fieldvalue [0] == 'Trunks') || $fieldset_key == 'Billing Information' && $fieldvalue [0] == 'Rate Group' || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Failover GW Name #1') || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Failover GW Name #2') || ($fieldset_key == 'Information' && $fieldvalue [0] == 'Rate Group') || ($fieldset_key == 'Sip Devices' && $fieldvalue [0] == 'Sip Profile') || ($fieldset_key == 'Sip Devices' && $fieldvalue [0] == 'Account')) {
+								$form_contents .= form_dropdown_all($fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra);
 							} else {
-								$form_contents .= form_dropdown ( $fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra );
+								$form_contents .= form_dropdown($fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra);
 							}
-							if (isset ( $fieldvalue [4] ) && $fieldvalue [4] != '') {
-								if (is_array ( $fieldvalue [4] )) {
+							if (isset ($fieldvalue [4]) && $fieldvalue [4] != '') {
+								if (is_array($fieldvalue [4])) {
 									
-									if (isset ( $fieldvalue [1] ['name'] )) {
+									if (isset ($fieldvalue [1] ['name'])) {
 										$fieldvalue_pass = $fieldvalue [1] ['name'];
 									} else {
 										$fieldvalue_pass = $fieldvalue [1];
 									}
 									
-									$this->CI->form_validation->set_rules ( $fieldvalue_pass, $fieldvalue [0], $fieldvalue [4] ['rules'] );
+									$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue [0], $fieldvalue [4] ['rules']);
 								} else {
 									
-									if (isset ( $fieldvalue [1] ['name'] )) {
+									if (isset ($fieldvalue [1] ['name'])) {
 										$fieldvalue_pass = $fieldvalue [1] ['name'];
 									} else {
 										$fieldvalue_pass = $fieldvalue [1];
 									}
 									
-									$this->CI->form_validation->set_rules ( $fieldvalue_pass, $fieldvalue [0], $fieldvalue [4] );
+									$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue [0], $fieldvalue [4]);
 								}
 							}
-							$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . (is_array ( $fieldvalue [1] ) ? $fieldvalue [1] ['name'] : $fieldvalue [1]) . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-							$form_contents .= '<span class="popup_error error  no-padding" id="' . (gettext ( is_array ( $fieldvalue [1] ) ? $fieldvalue [1] ['name'] : $fieldvalue [1] )) . '_error">
+							$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue [1]) ? $fieldvalue [1] ['name'] : $fieldvalue [1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+							$form_contents .= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue [1]) ? $fieldvalue [1] ['name'] : $fieldvalue [1])).'_error">
                         </span></div>';
 						} else {
-							if (isset ( $this->CI->input->post )) {
-								$fieldvalue ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [1] : $this->CI->input->post ( $fieldvalue [1] );
+							if (isset ($this->CI->input->post)) {
+								$fieldvalue ['value'] = ( ! $this->CI->input->post($fieldvalue [1])) ? @$fieldvalue [1] : $this->CI->input->post($fieldvalue [1]);
 							} else {
-								if (is_array ( $fieldvalue [1] )) {
+								if (is_array($fieldvalue [1])) {
 									$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1] ['name']] : @$fieldvalue [1];
 								} else {
 									$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1]] : @$fieldvalue [1];
 								}
 							}
 							
-							$str = $fieldvalue [7] . "," . $fieldvalue [8];
-							$drp_array = call_user_func_array ( array (
+							$str = $fieldvalue [7].",".$fieldvalue [8];
+							$drp_array = call_user_func_array(array(
 									$this->CI->common,
 									$fieldvalue [10] 
-							), array (
+							), array(
 									$fieldvalue [9] 
-							) );
-							$form_contents .= form_dropdown ( $fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra );
-							if (isset ( $fieldvalue [4] ) && $fieldvalue [4] != '') {
-								$this->CI->form_validation->set_rules ( $fieldvalue [1], $fieldvalue [0], $fieldvalue [4] );
+							));
+							$form_contents .= form_dropdown($fieldvalue [1], $drp_array, $fieldvalue ['value'], $extra);
+							if (isset ($fieldvalue [4]) && $fieldvalue [4] != '') {
+								$this->CI->form_validation->set_rules($fieldvalue [1], $fieldvalue [0], $fieldvalue [4]);
 							}
-							$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . (is_array ( $fieldvalue [1] ) ? $fieldvalue [1] ['name'] : $fieldvalue [1]) . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-							$form_contents .= '<span class="popup_error error  no-padding" id="' . (is_array ( $fieldvalue [1] ) ? $fieldvalue [1] ['name'] : $fieldvalue [1]) . '_error">
+							$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue [1]) ? $fieldvalue [1] ['name'] : $fieldvalue [1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+							$form_contents .= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue [1]) ? $fieldvalue [1] ['name'] : $fieldvalue [1]).'_error">
                         </span></div>';
 						}
-					} else if (isset ( $fieldvalue [13] ) && $fieldvalue [13] != '') {
+					} else if (isset ($fieldvalue [13]) && $fieldvalue [13] != '') {
 						
 						/* For multi select code */
-						$str = $fieldvalue [7] . "," . $fieldvalue [8];
+						$str = $fieldvalue [7].",".$fieldvalue [8];
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [1] : $this->CI->input->post ( $fieldvalue [1] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue ['value'] = ( ! $this->CI->input->post($fieldvalue [1])) ? @$fieldvalue [1] : $this->CI->input->post($fieldvalue [1]);
 						else
 							$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1]] : @$fieldvalue [1];
 						
-						$drp_array = call_user_func_array ( array (
+						$drp_array = call_user_func_array(array(
 								$this->CI->db_model,
 								$fieldvalue [10] 
-						), array (
+						), array(
 								$str,
 								$fieldvalue [9],
 								$fieldvalue [11],
 								$fieldvalue [12] 
-						) );
+						));
 						if ($fieldset_key === 'System Configuration Information') {
-							$form_contents .= form_dropdown_multiselect ( $fieldvalue [1], $drp_array, '' );
+							$form_contents .= form_dropdown_multiselect($fieldvalue [1], $drp_array, '');
 						} else {
-							$form_contents .= form_dropdown_multiselect ( $fieldvalue [1] . "[]", $drp_array, $fieldvalue ['value'] );
+							$form_contents .= form_dropdown_multiselect($fieldvalue [1]."[]", $drp_array, $fieldvalue ['value']);
 						}
-						if (isset ( $fieldvalue [4] ) && $fieldvalue [4] != '') {
-							$this->CI->form_validation->set_rules ( $fieldvalue [1], $fieldvalue [0], $fieldvalue [4] );
+						if (isset ($fieldvalue [4]) && $fieldvalue [4] != '') {
+							$this->CI->form_validation->set_rules($fieldvalue [1], $fieldvalue [0], $fieldvalue [4]);
 						}
-						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [1] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [1] . '_error"></span></div>';
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue [1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue [1].'_error"></span></div>';
 						/* End--------------------- For multi select code */
 					} else if ($fieldvalue [1] == 'INPUT') {
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? $fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? $fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						else {
-							$fieldvalue [2] ['value'] = ($values) ? (isset ( $values [$fieldvalue [2] ['name']] ) ? $values [$fieldvalue [2] ['name']] : '') : (isset ( $fieldvalue [2] ['value'] ) ? $fieldvalue [2] ['value'] : '');
+							$fieldvalue [2] ['value'] = ($values) ? (isset ($values [$fieldvalue [2] ['name']]) ? $values [$fieldvalue [2] ['name']] : '') : (isset ($fieldvalue [2] ['value']) ? $fieldvalue [2] ['value'] : '');
 						}
-						$form_contents .= form_input ( $fieldvalue [2], 'readonly' );
-						if (isset ( $fieldvalue [6] ) && ! empty ( $fieldvalue [6] )) {
+						$form_contents .= form_input($fieldvalue [2], 'readonly');
+						if (isset ($fieldvalue [6]) && ! empty ($fieldvalue [6])) {
 							$form_contents .= $fieldvalue [6];
 						}
-						$this->CI->form_validation->set_rules ( $fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3] );
-						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [2] ['name'] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [2] ['name'] . '_error">
+						$this->CI->form_validation->set_rules($fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3]);
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue [2] ['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue [2] ['name'].'_error">
                     </span></div>';
 					} 					/*
 					 * Image upload from invoice configuration code.
 					 */
 					else if ($fieldvalue [1] == 'IMAGE') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? @$fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						
 						else
 							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
-						$fieldvalue [2] ['style'] = isset ( $fieldvalue [2] ['style'] ) ? $fieldvalue [2] ['style'] : "";
-						$form_contents .= form_image ( $fieldvalue [2], 'readonly', $fieldvalue [2] ['style'] );
+						$fieldvalue [2] ['style'] = isset ($fieldvalue [2] ['style']) ? $fieldvalue [2] ['style'] : "";
+						$form_contents .= form_image($fieldvalue [2], 'readonly', $fieldvalue [2] ['style']);
 						$form_contents .= @$fieldvalue [6];
-						$this->CI->form_validation->set_rules ( $fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3] );
-						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [2] ['name'] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [2] ['name'] . '_error">
+						$this->CI->form_validation->set_rules($fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3]);
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue [2] ['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue [2] ['name'].'_error">
                     </span></div>';
 					} else if ($fieldvalue [1] == 'DEL_BUTTON') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? @$fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						
 						else
 							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
-						$fieldvalue [2] ['style'] = isset ( $fieldvalue [2] ['style'] ) ? $fieldvalue [2] ['style'] : "";
-						$form_contents .= form_img_delete ( $fieldvalue [2], 'readonly', $fieldvalue [2] ['style'] );
+						$fieldvalue [2] ['style'] = isset ($fieldvalue [2] ['style']) ? $fieldvalue [2] ['style'] : "";
+						$form_contents .= form_img_delete($fieldvalue [2], 'readonly', $fieldvalue [2] ['style']);
 						$form_contents .= @$fieldvalue [6];
-						$this->CI->form_validation->set_rules ( $fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3] );
-						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [2] ['name'] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [2] ['name'] . '_error">
+						$this->CI->form_validation->set_rules($fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3]);
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue [2] ['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue [2] ['name'].'_error">
                     </span></div>';
 					} /**
 					 * *******************************************************************************
 					 */
 					else if ($fieldvalue [1] == 'PASSWORD') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? @$fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						else
 							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
-						$form_contents .= form_password ( $fieldvalue [2] );
-						$this->CI->form_validation->set_rules ( $fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3] );
-						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [2] ['name'] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [2] ['name'] . '_error">
+						$form_contents .= form_password($fieldvalue [2]);
+						$this->CI->form_validation->set_rules($fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3]);
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue [2] ['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue [2] ['name'].'_error">
                     </span></div>';
 					} else if ($fieldvalue [2] == 'CHECKBOX') {
-						$OptionArray = array ();
+						$OptionArray = array();
 						
-						if (isset ( $fieldvalue [7] ) && $fieldvalue [7] != '')
-							$OptionArray = call_user_func_array ( array (
+						if (isset ($fieldvalue [7]) && $fieldvalue [7] != '')
+							$OptionArray = call_user_func_array(array(
 									$this->CI->common,
 									$fieldvalue [7] 
-							), array (
+							), array(
 									$fieldvalue [6] 
-							) );
-						if (isset ( $this->CI->input->post )) {
-							$fieldvalue [3] ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [3] ['value'] : $this->CI->input->post ( $fieldvalue [1] );
+							));
+						if (isset ($this->CI->input->post)) {
+							$fieldvalue [3] ['value'] = ( ! $this->CI->input->post($fieldvalue [1])) ? @$fieldvalue [3] ['value'] : $this->CI->input->post($fieldvalue [1]);
 						} else {
-							$fieldvalue [3] ['value'] = ($values) ? (isset ( $values [$fieldvalue [1]] ) && $values [$fieldvalue [1]] ? 1 : 0) : @$fieldvalue [3] ['value'];
+							$fieldvalue [3] ['value'] = ($values) ? (isset ($values [$fieldvalue [1]]) && $values [$fieldvalue [1]] ? 1 : 0) : @$fieldvalue [3] ['value'];
 						}
 						if ($fieldvalue [3] ['value'] == "1") {
 							$checked = true;
@@ -362,22 +362,22 @@ 
 							$checked = false;
 						}
 						;
-						if (isset ( $fieldvalue [3] ['table_name'] ) && $fieldvalue [3] ['table_name'] != "") {
+						if (isset ($fieldvalue [3] ['table_name']) && $fieldvalue [3] ['table_name'] != "") {
 							
-							$form_contents .= form_checkbox ( $fieldvalue [1], $fieldvalue [3] ['value'], $checked, $OptionArray );
+							$form_contents .= form_checkbox($fieldvalue [1], $fieldvalue [3] ['value'], $checked, $OptionArray);
 						} else {
-							$form_contents .= form_checkbox ( $fieldvalue [1], $fieldvalue [3] ['value'], $checked, $OptionArray );
+							$form_contents .= form_checkbox($fieldvalue [1], $fieldvalue [3] ['value'], $checked, $OptionArray);
 						}
 					} else if ($fieldvalue [1] == 'TEXTAREA') {
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						if (isset ($this->CI->input->post))
+							$fieldvalue [2] ['value'] = ( ! $this->CI->input->post($fieldvalue [2] ['name'])) ? @$fieldvalue [2] ['value'] : $this->CI->input->post($fieldvalue [2] ['name']);
 						else
 							$fieldvalue [2] ['value'] = ($values) ? $values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
-						$form_contents .= form_textarea ( $fieldvalue [2] );
+						$form_contents .= form_textarea($fieldvalue [2]);
 					} else if ($fieldvalue [2] == 'RADIO') {
 						
-						$form_contents .= form_radio ( $fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked'] );
+						$form_contents .= form_radio($fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked']);
 					}
 					$form_contents .= '</li>';
 				}
@@ -385,19 +385,19 @@ 
 			$form_contents .= '</ul>';
 			$form_contents .= '</div>';
 			$form_contents .= '</div>';
-			$i ++;
+			$i++;
 		}
 		
 		$form_contents .= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
 		
-		$form_contents .= form_button ( $save );
+		$form_contents .= form_button($save);
 		
-		if (isset ( $cancel )) {
-			$form_contents .= form_button ( $cancel );
+		if (isset ($cancel)) {
+			$form_contents .= form_button($cancel);
 		}
 		$form_contents .= '</center></div>';
-		$form_contents .= form_fieldset_close ();
-		$form_contents .= form_close ();
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
 		$form_contents .= '</div>';
 		
 		return $form_contents;
@@ -405,128 +405,128 @@ 
 	function build_serach_form($fields_array) {
 		$form_contents = '';
 		$form_contents .= '<div>';
-		$form_contents .= form_open ( $fields_array ['forms'] [0], $fields_array ['forms'] [1] );
-		unset ( $fields_array ['forms'] );
-		$button_array = array ();
+		$form_contents .= form_open($fields_array ['forms'] [0], $fields_array ['forms'] [1]);
+		unset ($fields_array ['forms']);
+		$button_array = array();
 		/**
 		 * *****
 		 * Batch Delete
 		 * *****
 		 */
-		if (isset ( $fields_array ['button_search'] ) || isset ( $fields_array ['button_reset'] ) || isset ( $fields_array ['button_search_delete'] ) || isset ( $fields_array ['display_in'] )) {
+		if (isset ($fields_array ['button_search']) || isset ($fields_array ['button_reset']) || isset ($fields_array ['button_search_delete']) || isset ($fields_array ['display_in'])) {
 			$save = $fields_array ['button_search'];
-			unset ( $fields_array ['button_search'] );
+			unset ($fields_array ['button_search']);
 			if ($fields_array ['button_reset']) {
 				$cancel = $fields_array ['button_reset'];
-				unset ( $fields_array ['button_reset'] );
+				unset ($fields_array ['button_reset']);
 			}
 			$button_search_delete = '';
-			if (isset ( $fields_array ['button_search_delete'] )) {
+			if (isset ($fields_array ['button_search_delete'])) {
 				$button_search_delete = $fields_array ['button_search_delete'];
-				unset ( $fields_array ['button_search_delete'] );
+				unset ($fields_array ['button_search_delete']);
 			}
-			if (isset ( $fields_array ['display_in'] )) {
+			if (isset ($fields_array ['display_in'])) {
 				$display_in = $fields_array ['display_in'];
-				unset ( $fields_array ['display_in'] );
+				unset ($fields_array ['display_in']);
 			}
 		}
 		/**
 		 * ***********************
 		 */
 		$i = 1;
-		foreach ( $fields_array as $fieldset_key => $form_fileds ) {
+		foreach ($fields_array as $fieldset_key => $form_fileds) {
 			
 			$form_contents .= '<ul class="padding-15">';
-			$form_contents .= form_fieldset ( gettext ( $fieldset_key ), array (
+			$form_contents .= form_fieldset(gettext($fieldset_key), array(
 					'style' => 'font-weight:bold;' 
-			), "search" );
+			), "search");
 			
-			foreach ( $form_fileds as $fieldkey => $fieldvalue ) {
+			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
 					$form_contents .= '<li class="col-md-12">';
 				}
 				$form_contents .= '<div class="col-md-3 no-padding">';
 				if ($fieldvalue [1] == 'HIDDEN') {
-					$form_contents .= form_hidden ( $fieldvalue [2], $fieldvalue [3] );
+					$form_contents .= form_hidden($fieldvalue [2], $fieldvalue [3]);
 				} else {
-					$form_contents .= form_label ( gettext ( $fieldvalue [0] ), "", array (
+					$form_contents .= form_label(gettext($fieldvalue [0]), "", array(
 							"class" => "search_label col-md-12 no-padding" 
-					) );
+					));
 				}
 				if ($fieldvalue [1] == 'INPUT') {
-					$form_contents .= form_input ( $fieldvalue [2] );
+					$form_contents .= form_input($fieldvalue [2]);
 				}
 				
 				if ($fieldvalue [2] == 'SELECT' || $fieldvalue [5] == '1') {
 					
 					if ($fieldvalue [7] != '' && $fieldvalue [8] != '') {
-						$str = $fieldvalue [7] . "," . $fieldvalue [8];
+						$str = $fieldvalue [7].",".$fieldvalue [8];
 						
-						$drp_array = call_user_func_array ( array (
+						$drp_array = call_user_func_array(array(
 								$this->CI->db_model,
 								$fieldvalue [10] 
-						), array (
+						), array(
 								$str,
 								$fieldvalue [9],
 								$fieldvalue [11],
 								$fieldvalue [12] 
-						) );
-						$form_contents .= form_dropdown_all ( $fieldvalue [1], $drp_array, '' );
+						));
+						$form_contents .= form_dropdown_all($fieldvalue [1], $drp_array, '');
 					} else {
 						
 						if ($fieldvalue [1] == 'INPUT') {
 							$fieldvalue [1] = $fieldvalue [6];
 						}
 						
-						$drp_array = call_user_func_array ( array (
+						$drp_array = call_user_func_array(array(
 								$this->CI->common,
 								$fieldvalue [10] 
-						), array (
+						), array(
 								$fieldvalue [9] 
-						) );
-						$form_contents .= form_dropdown_all_search ( $fieldvalue [1], $drp_array, '' );
+						));
+						$form_contents .= form_dropdown_all_search($fieldvalue [1], $drp_array, '');
 					}
 				} else if ($fieldvalue [1] == 'PASSWORD') {
-					$form_contents .= form_password ( $fieldvalue [2] );
+					$form_contents .= form_password($fieldvalue [2]);
 				} else if ($fieldvalue [2] == 'CHECKBOX') {
-					$form_contents .= form_checkbox ( $fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked'] );
+					$form_contents .= form_checkbox($fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked']);
 				}
 				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
 					$form_contents .= '</li>';
 					$i = 0;
 				}
-				$i ++;
+				$i++;
 			}
 		}
 		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
-		$form_contents .= form_button ( $cancel );
-		$form_contents .= form_button ( $save );
-		if (! empty ( $display_in )) {
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
+		if ( ! empty ($display_in)) {
 			$form_contents .= "<div class='col-md-5 pull-right'>";
 			$form_contents .= "<div class='col-md-3'></div>";
 			$extra_parameters ['class'] = $display_in ['label_class'];
 			$extra_parameters ['style'] = $display_in ['label_style'];
-			$form_contents .= form_label ( $display_in ['content'], "", $extra_parameters );
-			$drp_array = call_user_func_array ( array (
+			$form_contents .= form_label($display_in ['content'], "", $extra_parameters);
+			$drp_array = call_user_func_array(array(
 					$this->CI->common,
 					$display_in ['function'] 
-			), array () );
+			), array());
 			$extra_parameters ['class'] = $display_in ['dropdown_class'];
 			$extra_parameters ['style'] = $display_in ['dropdown_style'];
-			$form_contents .= form_dropdown_all_search ( $display_in, $drp_array, '', $extra_parameters );
+			$form_contents .= form_dropdown_all_search($display_in, $drp_array, '', $extra_parameters);
 			$form_contents .= "</div>";
 		}
-		if (isset ( $button_search_delete ) && $button_search_delete != '') {
-			$form_contents .= form_button ( $button_search_delete );
+		if (isset ($button_search_delete) && $button_search_delete != '') {
+			$form_contents .= form_button($button_search_delete);
 		}
 		$form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="">
-		<div class="pull-right btn-close" id="global_clearsearch_filter">' . gettext ( 'Close' ) . '</div> 
+		<div class="pull-right btn-close" id="global_clearsearch_filter">' . gettext('Close').'</div> 
 	</div>';
 		$form_contents .= '</ul>';
 		$form_contents .= '</div>';
-		$form_contents .= form_fieldset_close ();
-		$form_contents .= form_close ();
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
 		$form_contents .= '</div>';
 		
 		return $form_contents;
@@ -534,56 +534,56 @@ 
 	function build_batchupdate_form($fields_array) {
 		$form_contents = '';
 		$form_contents .= '<div >';
-		$form_contents .= form_open ( $fields_array ['forms'] [0], $fields_array ['forms'] [1] );
-		unset ( $fields_array ['forms'] );
-		$button_array = array ();
-		if (isset ( $fields_array ['button_search'] ) || isset ( $fields_array ['button_reset'] )) {
+		$form_contents .= form_open($fields_array ['forms'] [0], $fields_array ['forms'] [1]);
+		unset ($fields_array ['forms']);
+		$button_array = array();
+		if (isset ($fields_array ['button_search']) || isset ($fields_array ['button_reset'])) {
 			$save = $fields_array ['button_search'];
-			unset ( $fields_array ['button_search'] );
+			unset ($fields_array ['button_search']);
 			if ($fields_array ['button_reset']) {
 				$cancel = $fields_array ['button_reset'];
-				unset ( $fields_array ['button_reset'] );
+				unset ($fields_array ['button_reset']);
 			}
 		}
 		$i = 1;
-		foreach ( $fields_array as $fieldset_key => $form_fileds ) {
+		foreach ($fields_array as $fieldset_key => $form_fileds) {
 			$form_contents .= '<div class="col-md-12 no-padding margin-t-12" style="margin-bottom:10px; !important">
 		<div class="pull-right close" id="global_clearbatchupdate_filter">×</div></div>';
 			
 			$form_contents .= '<ul>';
-			$form_contents .= form_fieldset ( gettext ( $fieldset_key ), array (
+			$form_contents .= form_fieldset(gettext($fieldset_key), array(
 					'style' => 'margin-left:-22px;font-weight:bold;' 
-			) );
-			foreach ( $form_fileds as $fieldkey => $fieldvalue ) {
+			));
+			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
 					$form_contents .= '<li>';
 				}
 				$form_contents .= '<div class="col-md-4 no-padding">';
 				if ($fieldvalue [1] == 'HIDDEN') {
-					$form_contents .= form_hidden ( $fieldvalue [2], $fieldvalue [3] );
+					$form_contents .= form_hidden($fieldvalue [2], $fieldvalue [3]);
 				} else {
-					$form_contents .= form_label ( gettext ( $fieldvalue [0] ), "", array (
+					$form_contents .= form_label(gettext($fieldvalue [0]), "", array(
 							"class" => "search_label col-md-12 no-padding" 
-					) );
+					));
 				}
 				if ($fieldvalue [2] == 'SELECT' || $fieldvalue [5] == '1') {
 					if ($fieldvalue [7] != '' && $fieldvalue [8] != '') {
-						$str = $fieldvalue [7] . "," . $fieldvalue [8];
-						if (is_array ( $fieldvalue [13] )) {
-							$drp_array = call_user_func_array ( array (
+						$str = $fieldvalue [7].",".$fieldvalue [8];
+						if (is_array($fieldvalue [13])) {
+							$drp_array = call_user_func_array(array(
 									$this->CI->common,
 									$fieldvalue [14] 
-							), array (
+							), array(
 									$fieldvalue [13] 
-							) );
-							$form_contents .= form_dropdown ( $fieldvalue [13], $drp_array, '' );
+							));
+							$form_contents .= form_dropdown($fieldvalue [13], $drp_array, '');
 						}
 						/**
 						 * ASTPP 3.0
 						 * Reseller Batch Update
 						 */
 						if ($fieldvalue [10] == 'set_status') {
-							$drp_array = array (
+							$drp_array = array(
 									'0' => 'Active',
 									'1' => 'Inactive' 
 							);
@@ -591,59 +591,59 @@ 
 						 * *********************************************************
 						 */
 						else {
-							$drp_array = call_user_func_array ( array (
+							$drp_array = call_user_func_array(array(
 									$this->CI->db_model,
 									$fieldvalue [10] 
-							), array (
+							), array(
 									$str,
 									$fieldvalue [9],
 									$fieldvalue [11],
 									$fieldvalue [12] 
-							) );
+							));
 						}
-						$form_contents .= form_dropdown_all ( $fieldvalue [1], $drp_array, '' );
+						$form_contents .= form_dropdown_all($fieldvalue [1], $drp_array, '');
 					} else {
 						if ($fieldvalue [1] == 'INPUT') {
 							$drp_name = $fieldvalue [6];
 						}
-						$drp_array = call_user_func_array ( array (
+						$drp_array = call_user_func_array(array(
 								$this->CI->common,
 								$fieldvalue [10] 
-						), array (
+						), array(
 								$fieldvalue [9] 
-						) );
-						$form_contents .= form_dropdown ( $drp_name, $drp_array, '' );
+						));
+						$form_contents .= form_dropdown($drp_name, $drp_array, '');
 					}
 				}
 				if ($fieldvalue [1] == 'INPUT') {
-					$form_contents .= form_input ( $fieldvalue [2] );
+					$form_contents .= form_input($fieldvalue [2]);
 				} else if ($fieldvalue [2] == 'CHECKBOX') {
-					$form_contents .= form_checkbox ( $fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked'] );
+					$form_contents .= form_checkbox($fieldvalue [1], $fieldvalue [3] ['value'], $fieldvalue [3] ['checked']);
 				}
 				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
 					$form_contents .= '</li>';
 					$i = 0;
 				}
-				$i ++;
+				$i++;
 			}
 		}
 		
 		$form_contents .= '</ul>';
 		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
 		
-		$form_contents .= form_button ( $cancel );
-		$form_contents .= form_button ( $save );
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
 		
-		$form_contents .= form_fieldset_close ();
-		$form_contents .= form_close ();
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
 		$form_contents .= '</div>';
 		$form_contents .= '</div>';
 		
 		return $form_contents;
 	}
 	function load_grid_config($count_all, $rp, $page) {
-		$json_data = array ();
+		$json_data = array();
 		$config ['total_rows'] = $count_all;
 		$config ['per_page'] = $rp;
 		
@@ -660,30 +660,30 @@ 
 		return $json_data;
 	}
 	function build_grid($query, $grid_fields) {
-		$jsn_tmp = array ();
-		$json_data = array ();
+		$jsn_tmp = array();
+		$json_data = array();
 		if ($query->num_rows > 0) {
-			foreach ( $query->result_array () as $row ) {
+			foreach ($query->result_array() as $row) {
 				/*
 				 * ASTPP 3.0
 				 * For Edit on Account number or name
 				 */
-				$row_id = isset ( $row ['id'] ) ? $row ["id"] : '';
+				$row_id = isset ($row ['id']) ? $row ["id"] : '';
 				/**
 				 * **************************
 				 */
-				foreach ( $grid_fields as $field_key => $field_arr ) {
+				foreach ($grid_fields as $field_key => $field_arr) {
 					/**
 					 * ASTPP 3.0
 					 * For Edit on Account number or name
 					 * *
 					 */
-					$Actionkey = array_search ( 'Action', $this->CI->common->array_column ( $grid_fields, 0 ) );
+					$Actionkey = array_search('Action', $this->CI->common->array_column($grid_fields, 0));
 					if ($Actionkey == '') {
-						$Actionkey = array_search ( 'action', $this->CI->common->array_column ( $grid_fields, 0 ) );
+						$Actionkey = array_search('action', $this->CI->common->array_column($grid_fields, 0));
 					}
 					if ($Actionkey == '') {
-						$Actionkey = array_search ( 'Acción', $this->CI->common->array_column ( $grid_fields, 0 ) );
+						$Actionkey = array_search('Acción', $this->CI->common->array_column($grid_fields, 0));
 					}
 					/**
 					 * ******************************
@@ -692,23 +692,23 @@ 
 						if ($field_arr [3] != "") {
 							if ($field_arr [2] == "status") {
 								$row ['id'] = $row_id;
-								$jsn_tmp [$field_key] = call_user_func_array ( array (
+								$jsn_tmp [$field_key] = call_user_func_array(array(
 										$this->CI->common,
 										$field_arr [5] 
-								), array (
+								), array(
 										$field_arr [3],
 										$field_arr [4],
 										$row 
-								) );
+								));
 							} else {
-								$jsn_tmp [$field_key] = call_user_func_array ( array (
+								$jsn_tmp [$field_key] = call_user_func_array(array(
 										$this->CI->common,
 										$field_arr [5] 
-								), array (
+								), array(
 										$field_arr [3],
 										$field_arr [4],
 										$row [$field_arr [2]] 
-								) );
+								));
 							}
 							
 							/**
@@ -718,7 +718,7 @@ 
 							 */
 							$row [$field_arr [2]] = $jsn_tmp [$field_key];
 						}
-						if (array_search ( "EDITABLE", $field_arr )) {
+						if (array_search("EDITABLE", $field_arr)) {
 							$ActionArr = $grid_fields [$Actionkey];
 							if ($ActionArr [5]->EDIT->url == "accounts/customer_edit/" || $ActionArr [5]->EDIT->url == "accounts/provider_edit/") {
 								$ActionArr [5]->EDIT->url = $row ['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
@@ -727,13 +727,13 @@ 
 								$ActionArr [5]->EDIT->url = $row ['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 							}
 							$acctype = "";
-							if (isset ( $row ["type"] ) && ($row ["type"] == '0' || $row ["type"] == '1' || $row ["type"] == '3')) {
-								$acctype = (isset ( $row ["posttoexternal"] ) && $row ["posttoexternal"] != '') ? "<span class='label label-default pull-right'>" . $this->CI->common->get_account_type ( "", "", $row ["posttoexternal"] ) . "</span>" : "";
+							if (isset ($row ["type"]) && ($row ["type"] == '0' || $row ["type"] == '1' || $row ["type"] == '3')) {
+								$acctype = (isset ($row ["posttoexternal"]) && $row ["posttoexternal"] != '') ? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("", "", $row ["posttoexternal"])."</span>" : "";
 							}
 							
-							$fieldstr = $this->CI->common->build_custome_edit_button ( $ActionArr [5]->EDIT, $row [$field_arr [2]], $row ["id"] );
+							$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr [5]->EDIT, $row [$field_arr [2]], $row ["id"]);
 							if ($acctype != '') {
-								$jsn_tmp [$field_key] = $fieldstr . "<br/>" . $acctype;
+								$jsn_tmp [$field_key] = $fieldstr."<br/>".$acctype;
 							} else {
 								$jsn_tmp [$field_key] = $fieldstr;
 							}
@@ -745,25 +745,25 @@ 
 							$jsn_tmp [$field_key] = $row [$field_arr [2]];
 						}
 					} else {
-						if ($field_arr [0] == gettext ( "Action" )) {
-							if (isset ( $field_arr [5] ) && isset ( $field_arr [5]->EDIT ) && isset ( $field_arr [5]->DELETE )) {
+						if ($field_arr [0] == gettext("Action")) {
+							if (isset ($field_arr [5]) && isset ($field_arr [5]->EDIT) && isset ($field_arr [5]->DELETE)) {
 								
 								if ($field_arr [5]->EDIT->url == 'accounts/customer_edit/' || $field_arr [5]->EDIT->url == 'accounts/provider_edit/' || $field_arr [5]->DELETE->url == 'accounts/provider_delete/' || $field_arr [5]->DELETE->url == 'accounts/customer_delete/') {
-									if ($row ['type'] == '0' || strtolower ( $row ['type'] ) == 'customer') {
+									if ($row ['type'] == '0' || strtolower($row ['type']) == 'customer') {
 										$field_arr [5]->EDIT->url = 'accounts/customer_edit/';
 										$field_arr [5]->DELETE->url = 'accounts/customer_delete/';
 									}
-									if ($row ['type'] == 3 || strtolower ( $row ['type'] ) == 'provider') {
+									if ($row ['type'] == 3 || strtolower($row ['type']) == 'provider') {
 										$field_arr [5]->EDIT->url = 'accounts/provider_edit/';
 										$field_arr [5]->DELETE->url = 'accounts/provider_delete/';
 									}
 								}
 								if ($field_arr [5]->EDIT->url == 'accounts/admin_edit/' || $field_arr [5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr [5]->DELETE->url == 'accounts/admin_delete/' || $field_arr [5]->DELETE->url == 'accounts/subadmin_delete/') {
-									if ($row ['type'] == 2 || strtolower ( $row ['type'] ) == 'administrator') {
+									if ($row ['type'] == 2 || strtolower($row ['type']) == 'administrator') {
 										$field_arr [5]->EDIT->url = 'accounts/admin_edit/';
 										$field_arr [5]->DELETE->url = 'accounts/admin_delete/';
 									}
-									if ($row ['type'] == 4 || strtolower ( $row ['type'] ) == 'sub admin') {
+									if ($row ['type'] == 4 || strtolower($row ['type']) == 'sub admin') {
 										$field_arr [5]->EDIT->url = 'accounts/subadmin_edit/';
 										$field_arr [5]->DELETE->url = 'accounts/subadmin_delete/';
 									}
@@ -773,22 +773,22 @@ 
 							 * ASTPP 3.0
 							 * For edit on account number or name
 							 */
-							$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons ( $field_arr [5], $row_id );
+							$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons($field_arr [5], $row_id);
 						/**
 						 * *************************************************************************
 						 */
-						} elseif ($field_arr [0] == gettext ( "Profile Action" )) {
-							if (isset ( $field_arr [5] ) && isset ( $field_arr [5]->START ) && isset ( $field_arr [5]->STOP ) && isset ( $field_arr [5]->RELOAD ) && isset ( $field_arr [5]->RESCAN )) {
+						} elseif ($field_arr [0] == gettext("Profile Action")) {
+							if (isset ($field_arr [5]) && isset ($field_arr [5]->START) && isset ($field_arr [5]->STOP) && isset ($field_arr [5]->RELOAD) && isset ($field_arr [5]->RESCAN)) {
 							}
-							$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons ( $field_arr [5], $row ["id"] );
+							$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons($field_arr [5], $row ["id"]);
 						} else {
-							$className = (isset ( $field_arr ['9'] ) && $field_arr ['9'] != '') ? $field_arr ['9'] : "chkRefNos";
+							$className = (isset ($field_arr ['9']) && $field_arr ['9'] != '') ? $field_arr ['9'] : "chkRefNos";
 							
-							$jsn_tmp [$field_key] = '<input type="checkbox" name="chkAll" id=' . $row ['id'] . ' class="ace ' . $className . '" onclick="clickchkbox(' . $row ['id'] . ')" value=' . $row ['id'] . '><lable class="lbl"></lable>';
+							$jsn_tmp [$field_key] = '<input type="checkbox" name="chkAll" id='.$row ['id'].' class="ace '.$className.'" onclick="clickchkbox('.$row ['id'].')" value='.$row ['id'].'><lable class="lbl"></lable>';
 						}
 					}
 				}
-				$json_data [] = array (
+				$json_data [] = array(
 						'cell' => $jsn_tmp 
 				);
 			}
@@ -796,17 +796,17 @@ 
 		return $json_data;
 	}
 	function build_json_grid($query, $grid_fields) {
-		$jsn_tmp = array ();
-		$json_data = array ();
-		foreach ( $query as $row ) {
-			foreach ( $grid_fields as $field_key => $field_arr ) {
-				$row_id = isset ( $row ['id'] ) ? $row ["id"] : '';
+		$jsn_tmp = array();
+		$json_data = array();
+		foreach ($query as $row) {
+			foreach ($grid_fields as $field_key => $field_arr) {
+				$row_id = isset ($row ['id']) ? $row ["id"] : '';
 				/**
 				 * ASTPP 3.0
 				 * For Edit on Account number or name
 				 * *
 				 */
-				$Actionkey = array_search ( 'Action', $this->CI->common->array_column ( $grid_fields, 0 ) );
+				$Actionkey = array_search('Action', $this->CI->common->array_column($grid_fields, 0));
 				/**
 				 * ****************************
 				 */
@@ -815,23 +815,23 @@ 
 					if ($field_arr [3] != "") {
 						if ($field_arr [2] == "status") {
 							$row ['id'] = $row_id;
-							$jsn_tmp [$field_key] = call_user_func_array ( array (
+							$jsn_tmp [$field_key] = call_user_func_array(array(
 									$this->CI->common,
 									$field_arr [5] 
-							), array (
+							), array(
 									$field_arr [3],
 									$field_arr [4],
 									$row 
-							) );
+							));
 						} else {
-							$jsn_tmp [$field_key] = call_user_func_array ( array (
+							$jsn_tmp [$field_key] = call_user_func_array(array(
 									$this->CI->common,
 									$field_arr [5] 
-							), array (
+							), array(
 									$field_arr [3],
 									$field_arr [4],
 									$row [$field_arr [2]] 
-							) );
+							));
 						}
 						/**
 						 * ASTPP 3.0
@@ -840,7 +840,7 @@ 
 						 */
 						$row [$field_arr [2]] = $jsn_tmp [$field_key];
 					}
-					if (array_search ( "EDITABLE", $field_arr )) {
+					if (array_search("EDITABLE", $field_arr)) {
 						$ActionArr = $grid_fields [$Actionkey];
 						if ($ActionArr [5]->EDIT->url == "accounts/customer_edit/" || $ActionArr [5]->EDIT->url == "accounts/provider_edit/") {
 							$ActionArr [5]->EDIT->url = $row ['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
@@ -848,22 +848,22 @@ 
 						if ($ActionArr [5]->EDIT->url == "accounts/admin_edit/" || $ActionArr [5]->EDIT->url == "accounts/subadmin_edit/") {
 							$ActionArr [5]->EDIT->url = $row ['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 						}
-						$jsn_tmp [$field_key] = $this->CI->common->build_custome_edit_button ( $ActionArr [5]->EDIT, $row [$field_arr [2]], $row ["id"] );
+						$jsn_tmp [$field_key] = $this->CI->common->build_custome_edit_button($ActionArr [5]->EDIT, $row [$field_arr [2]], $row ["id"]);
 					/**
 					 * ****************************
 					 */
 					} else {
-						$jsn_tmp [$field_key] = isset ( $row [$field_arr [2]] ) ? $row [$field_arr [2]] : "";
+						$jsn_tmp [$field_key] = isset ($row [$field_arr [2]]) ? $row [$field_arr [2]] : "";
 					}
 				} else {
 					if ($field_arr [0] == "Action") {
-						$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons ( $field_arr [5], $row ["id"] );
+						$jsn_tmp [$field_key] = $this->CI->common->get_action_buttons($field_arr [5], $row ["id"]);
 					} else {
-						$jsn_tmp [$field_key] = '<input type="checkbox" name="chkAll" id=' . $row ['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row ['id'] . ')" value=' . $row ['id'] . '><lable class="lbl"></lable>';
+						$jsn_tmp [$field_key] = '<input type="checkbox" name="chkAll" id='.$row ['id'].' class="ace chkRefNos" onclick="clickchkbox('.$row ['id'].')" value='.$row ['id'].'><lable class="lbl"></lable>';
 					}
 				}
 			}
-			$json_data [] = array (
+			$json_data [] = array(
 					'cell' => $jsn_tmp 
 			);
 		}

Braces +41 added lines, -34 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
@@ -134,10 +135,11 @@ 
 				if (isset ( $fieldvalue ) && $fieldvalue != '') {
 					$form_contents .= '<li class="col-md-12">';
 					if ($fieldvalue [1] == 'HIDDEN') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						else
-							$fieldvalue [2] ['value'] = ($values) ? (isset ( $values [$fieldvalue [2] ['name']] ) ? $values [$fieldvalue [2] ['name']] : '') : (isset ( $fieldvalue [2] ['value'] ) ? $fieldvalue [2] ['value'] : '');
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
+													$fieldvalue [2] ['value'] = ($values) ? (isset ( $values [$fieldvalue [2] ['name']] ) ? $values [$fieldvalue [2] ['name']] : '') : (isset ( $fieldvalue [2] ['value'] ) ? $fieldvalue [2] ['value'] : '');
+						}
 						$form_contents .= form_hidden ( $fieldvalue [2] ['name'], $fieldvalue [2] ['value'] );
 					} else {
 						$validation_arr = array ();
@@ -259,10 +261,11 @@ 
 						/* For multi select code */
 						$str = $fieldvalue [7] . "," . $fieldvalue [8];
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [1] : $this->CI->input->post ( $fieldvalue [1] );
-						else
-							$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1]] : @$fieldvalue [1];
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [1] : $this->CI->input->post ( $fieldvalue [1] );
+						} else {
+													$fieldvalue ['value'] = ($values) ? @$values [$fieldvalue [1]] : @$fieldvalue [1];
+						}
 						
 						$drp_array = call_user_func_array ( array (
 								$this->CI->db_model,
@@ -286,9 +289,9 @@ 
 						/* End--------------------- For multi select code */
 					} else if ($fieldvalue [1] == 'INPUT') {
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? $fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						else {
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? $fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
 							$fieldvalue [2] ['value'] = ($values) ? (isset ( $values [$fieldvalue [2] ['name']] ) ? $values [$fieldvalue [2] ['name']] : '') : (isset ( $fieldvalue [2] ['value'] ) ? $fieldvalue [2] ['value'] : '');
 						}
 						$form_contents .= form_input ( $fieldvalue [2], 'readonly' );
@@ -303,11 +306,11 @@ 
 					 * Image upload from invoice configuration code.
 					 */
 					else if ($fieldvalue [1] == 'IMAGE') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						
-						else
-							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
+													$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						}
 						$fieldvalue [2] ['style'] = isset ( $fieldvalue [2] ['style'] ) ? $fieldvalue [2] ['style'] : "";
 						$form_contents .= form_image ( $fieldvalue [2], 'readonly', $fieldvalue [2] ['style'] );
 						$form_contents .= @$fieldvalue [6];
@@ -316,11 +319,11 @@ 
 						$form_contents .= '<span class="popup_error error  no-padding" id="' . $fieldvalue [2] ['name'] . '_error">
                     </span></div>';
 					} else if ($fieldvalue [1] == 'DEL_BUTTON') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						
-						else
-							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
+													$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						}
 						$fieldvalue [2] ['style'] = isset ( $fieldvalue [2] ['style'] ) ? $fieldvalue [2] ['style'] : "";
 						$form_contents .= form_img_delete ( $fieldvalue [2], 'readonly', $fieldvalue [2] ['style'] );
 						$form_contents .= @$fieldvalue [6];
@@ -332,10 +335,11 @@ 
 					 * *******************************************************************************
 					 */
 					else if ($fieldvalue [1] == 'PASSWORD') {
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						else
-							$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
+													$fieldvalue [2] ['value'] = ($values) ? @$values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						}
 						$form_contents .= form_password ( $fieldvalue [2] );
 						$this->CI->form_validation->set_rules ( $fieldvalue [2] ['name'], $fieldvalue [0], $fieldvalue [3] );
 						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="' . $fieldvalue [2] ['name'] . '_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
@@ -344,13 +348,14 @@ 
 					} else if ($fieldvalue [2] == 'CHECKBOX') {
 						$OptionArray = array ();
 						
-						if (isset ( $fieldvalue [7] ) && $fieldvalue [7] != '')
-							$OptionArray = call_user_func_array ( array (
+						if (isset ( $fieldvalue [7] ) && $fieldvalue [7] != '') {
+													$OptionArray = call_user_func_array ( array (
 									$this->CI->common,
 									$fieldvalue [7] 
 							), array (
 									$fieldvalue [6] 
 							) );
+						}
 						if (isset ( $this->CI->input->post )) {
 							$fieldvalue [3] ['value'] = (! $this->CI->input->post ( $fieldvalue [1] )) ? @$fieldvalue [3] ['value'] : $this->CI->input->post ( $fieldvalue [1] );
 						} else {
@@ -370,10 +375,11 @@ 
 						}
 					} else if ($fieldvalue [1] == 'TEXTAREA') {
 						
-						if (isset ( $this->CI->input->post ))
-							$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
-						else
-							$fieldvalue [2] ['value'] = ($values) ? $values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						if (isset ( $this->CI->input->post )) {
+													$fieldvalue [2] ['value'] = (! $this->CI->input->post ( $fieldvalue [2] ['name'] )) ? @$fieldvalue [2] ['value'] : $this->CI->input->post ( $fieldvalue [2] ['name'] );
+						} else {
+													$fieldvalue [2] ['value'] = ($values) ? $values [$fieldvalue [2] ['name']] : @$fieldvalue [2] ['value'];
+						}
 						$form_contents .= form_textarea ( $fieldvalue [2] );
 					} else if ($fieldvalue [2] == 'RADIO') {
 						
@@ -653,8 +659,9 @@ 
 		$json_data ["json_paging"] ['total'] = $config ['total_rows'];
 		$perpage = $config ['per_page'];
 		$start = ($page_no - 1) * $perpage;
-		if ($start < 0)
-			$start = 0;
+		if ($start < 0) {
+					$start = 0;
+		}
 		$json_data ["paging"] ['start'] = $start;
 		$json_data ["paging"] ['page_no'] = $perpage;
 		return $json_data;

web_interface/astpp/application/libraries/API_Controller.php

Spacing +134 added lines, -134 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined ( 'BASEPATH' ) or exit ( 'No direct script access allowed' );
+defined('BASEPATH') or exit ('No direct script access allowed');
 abstract class API_Controller extends CI_Controller {
 	
 	/**
@@ -17,14 +17,14 @@ 
 	 *
 	 * @var array
 	 */
-	protected $methods = array ();
+	protected $methods = array();
 	
 	/**
 	 * List of allowed HTTP methods
 	 *
 	 * @var array
 	 */
-	protected $allowed_http_methods = array (
+	protected $allowed_http_methods = array(
 			'get',
 			'delete',
 			'post',
@@ -58,35 +58,35 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_get_args = array ();
+	protected $_get_args = array();
 	
 	/**
 	 * The arguments for the POST request method
 	 *
 	 * @var array
 	 */
-	protected $_post_args = array ();
+	protected $_post_args = array();
 	
 	/**
 	 * The arguments for the PUT request method
 	 *
 	 * @var array
 	 */
-	protected $_put_args = array ();
+	protected $_put_args = array();
 	
 	/**
 	 * The arguments for the DELETE request method
 	 *
 	 * @var array
 	 */
-	protected $_delete_args = array ();
+	protected $_delete_args = array();
 	
 	/**
 	 * The arguments from GET, POST, PUT, DELETE request methods combined.
 	 *
 	 * @var array
 	 */
-	protected $_args = array ();
+	protected $_args = array();
 	
 	/**
 	 * If the request is allowed based on the API key provided.
@@ -107,7 +107,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_supported_formats = array (
+	protected $_supported_formats = array(
 			'xml' => 'application/xml',
 			'json' => 'application/json',
 			'jsonp' => 'application/javascript',
@@ -123,72 +123,72 @@ 
 	 * @todo Document more please.
 	 */
 	public function __construct() {
-		parent::__construct ();
+		parent::__construct();
 		
 		// Loading my custom log class
-		$this->load->library ( 'Api_log' );
+		$this->load->library('Api_log');
 		
 		// Loading language file
-		$this->lang->load ( 'api/api', config_item ( 'api_default_language' ) );
+		$this->lang->load('api/api', config_item('api_default_language'));
 		
 		// Lets grab the config and get ready to party
-		$this->load->config ( 'api' );
+		$this->load->config('api');
 		
 		// How is this request being made? POST, DELETE, GET, PUT?
-		$this->request = new stdClass ();
-		$this->request->method = $this->_detect_method ();
+		$this->request = new stdClass();
+		$this->request->method = $this->_detect_method();
 		
 		// Create argument container, if nonexistent
-		if (! isset ( $this->{'_' . $this->request->method . '_args'} )) {
-			$this->{'_' . $this->request->method . '_args'} = array ();
+		if ( ! isset ($this->{'_'.$this->request->method.'_args'} )) {
+			$this->{'_'.$this->request->method.'_args'} = array();
 		}
 		
 		// Set up our GET variables
-		$this->_get_args = array_merge ( $this->_get_args, $this->uri->ruri_to_assoc () );
+		$this->_get_args = array_merge($this->_get_args, $this->uri->ruri_to_assoc());
 		
 		// $this->load->library('security');
 		
 		// This library is bundled with api_Controller 2.5+, but will eventually be part of CodeIgniter itself
-		$this->load->library ( 'format' );
+		$this->load->library('format');
 		
 		// Try to find a format for the request (means we have a request body)
-		$this->request->format = $this->_detect_input_format ();
+		$this->request->format = $this->_detect_input_format();
 		
 		// Some Methods cant have a body
 		$this->request->body = NULL;
 		
-		$this->{'_parse_' . $this->request->method} ();
+		$this->{'_parse_'.$this->request->method} ();
 		
 		// Now we know all about our request, let's try and parse the body if it exists
 		if ($this->request->format and $this->request->body) {
-			$this->request->body = $this->format->factory ( $this->request->body, $this->request->format )->to_array ();
+			$this->request->body = $this->format->factory($this->request->body, $this->request->format)->to_array();
 			// Assign payload arguments to proper method container
-			$this->{'_' . $this->request->method . '_args'} = $this->request->body;
+			$this->{'_'.$this->request->method.'_args'} = $this->request->body;
 		}
 		
 		// Merge both for one mega-args variable
-		$this->_args = array_merge ( $this->_get_args, $this->_put_args, $this->_post_args, $this->_delete_args, $this->{'_' . $this->request->method . '_args'} );
+		$this->_args = array_merge($this->_get_args, $this->_put_args, $this->_post_args, $this->_delete_args, $this->{'_'.$this->request->method.'_args'} );
 		
 		// Which format should the data be returned in?
-		$this->response = new stdClass ();
-		$this->response->format = $this->_detect_output_format ();
+		$this->response = new stdClass();
+		$this->response->format = $this->_detect_output_format();
 		
 		// Which format should the data be returned in?
-		$this->response->lang = $this->_detect_lang ();
+		$this->response->lang = $this->_detect_lang();
 		
 		// Developers can extend this class and add a check in here
-		$this->early_checks ();
+		$this->early_checks();
 		
-		$this->api = new StdClass ();
+		$this->api = new StdClass();
 		// Load DB if its enabled
 		$this->api->db = $this->db;
 		
 		// only allow ajax requests
-		if (! $this->input->is_ajax_request () and config_item ( 'api_ajax_only' )) {
-			$this->response ( array (
+		if ( ! $this->input->is_ajax_request() and config_item('api_ajax_only')) {
+			$this->response(array(
 					'status' => false,
 					'error' => 'Only AJAX requests are accepted.' 
-			), 505 );
+			), 505);
 		}
 	}
 	
@@ -204,8 +204,8 @@ 
 	 *        	The arguments passed to the controller method.
 	 */
 	public function _remap($object_called, $arguments) {
-		$pattern = '/^(.*)\.(' . implode ( '|', array_keys ( $this->_supported_formats ) ) . ')$/';
-		if (preg_match ( $pattern, $object_called, $matches )) {
+		$pattern = '/^(.*)\.('.implode('|', array_keys($this->_supported_formats)).')$/';
+		if (preg_match($pattern, $object_called, $matches)) {
 			$object_called = $matches [1];
 		}
 		
@@ -215,45 +215,45 @@ 
 		// Samir : Ends
 		
 		// Do we want to log this method (if allowed by config)?
-		$log_method = ! (isset ( $this->methods [$controller_method] ['log'] ) and $this->methods [$controller_method] ['log'] == FALSE);
+		$log_method = ! (isset ($this->methods [$controller_method] ['log']) and $this->methods [$controller_method] ['log'] == FALSE);
 		
 		// Use keys for this method?
-		$use_key = ! (isset ( $this->methods [$controller_method] ['key'] ) and $this->methods [$controller_method] ['key'] == FALSE);
+		$use_key = ! (isset ($this->methods [$controller_method] ['key']) and $this->methods [$controller_method] ['key'] == FALSE);
 		
 		// Sure it exists, but can they do anything with it?
-		if (! method_exists ( $this, $controller_method )) {
-			$this->response ( array (
+		if ( ! method_exists($this, $controller_method)) {
+			$this->response(array(
 					'status' => false,
-					'error' => $this->lang->line ( 'unknown_method' ) 
-			), 404 );
+					'error' => $this->lang->line('unknown_method') 
+			), 404);
 		}
 		
 		// Doing key related stuff? Can only do it if they have a key right?
-		if (config_item ( 'api_enable_keys' ) and ! empty ( $this->api->key )) {
+		if (config_item('api_enable_keys') and ! empty ($this->api->key)) {
 			// Check the limit
-			if (config_item ( 'api_enable_limits' ) and ! $this->_check_limit ( $controller_method )) {
-				$this->response ( array (
+			if (config_item('api_enable_limits') and ! $this->_check_limit($controller_method)) {
+				$this->response(array(
 						'status' => false,
 						'error' => 'This API key has reached the hourly limit for this method.' 
-				), 401 );
+				), 401);
 			}
 			
 			// If no level is set use 0, they probably aren't using permissions
-			$level = isset ( $this->methods [$controller_method] ['level'] ) ? $this->methods [$controller_method] ['level'] : 0;
+			$level = isset ($this->methods [$controller_method] ['level']) ? $this->methods [$controller_method] ['level'] : 0;
 			
 			// If no level is set, or it is lower than/equal to the key's level
 			$authorized = $level <= $this->api->level;
 			
 			// IM TELLIN!
-			if (config_item ( 'api_enable_logging' ) and $log_method) {
-				$this->_log_request ( $authorized );
+			if (config_item('api_enable_logging') and $log_method) {
+				$this->_log_request($authorized);
 			}
 			
 			// They don't have good enough perms
-			$authorized or $this->response ( array (
+			$authorized or $this->response(array(
 					'status' => false,
 					'error' => 'This API key does not have enough permissions.' 
-			), 401 );
+			), 401);
 		}
 		
 		// No key stuff, but record that stuff is happening
@@ -265,10 +265,10 @@ 
 		 */
 		
 		// And...... GO!
-		$this->_fire_method ( array (
+		$this->_fire_method(array(
 				$this,
 				$controller_method 
-		), $arguments );
+		), $arguments);
 	}
 	
 	/**
@@ -282,7 +282,7 @@ 
 	 *        	The arguments to pass to the controller method
 	 */
 	protected function _fire_method($method, $args) {
-		call_user_func_array ( $method, $args );
+		call_user_func_array($method, $args);
 	}
 	
 	/**
@@ -297,7 +297,7 @@ 
 		global $CFG;
 		
 		// If data is empty and not code provide, error and bail
-		if (empty ( $data ) && $http_code === null) {
+		if (empty ($data) && $http_code === null) {
 			$http_code = 404;
 			
 			// create the output variable here in the case of $this->response(array());
@@ -310,30 +310,30 @@ 
 			$data ['response_code'] = $http_code;
 			
 			// Is compression requested?
-			if ($CFG->item ( 'compress_output' ) === TRUE && $this->_zlib_oc == FALSE) {
-				if (extension_loaded ( 'zlib' )) {
-					if (isset ( $_SERVER ['HTTP_ACCEPT_ENCODING'] ) and strpos ( $_SERVER ['HTTP_ACCEPT_ENCODING'], 'gzip' ) !== FALSE) {
-						ob_start ( 'ob_gzhandler' );
+			if ($CFG->item('compress_output') === TRUE && $this->_zlib_oc == FALSE) {
+				if (extension_loaded('zlib')) {
+					if (isset ($_SERVER ['HTTP_ACCEPT_ENCODING']) and strpos($_SERVER ['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE) {
+						ob_start('ob_gzhandler');
 					}
 				}
 			}
 			
-			is_numeric ( $http_code ) or $http_code = 200;
+			is_numeric($http_code) or $http_code = 200;
 			
 			// If the format method exists, call and return the output in that format
-			if (method_exists ( $this, '_format_' . $this->response->format )) {
+			if (method_exists($this, '_format_'.$this->response->format)) {
 				// Set the correct format header
-				header ( 'Content-Type: ' . $this->_supported_formats [$this->response->format] );
+				header('Content-Type: '.$this->_supported_formats [$this->response->format]);
 				
-				$output = $this->{'_format_' . $this->response->format} ( $data );
+				$output = $this->{'_format_'.$this->response->format} ($data);
 			}			
 
 			// If the format method exists, call and return the output in that format
-			elseif (method_exists ( $this->format, 'to_' . $this->response->format )) {
+			elseif (method_exists($this->format, 'to_'.$this->response->format)) {
 				// Set the correct format header
-				header ( 'Content-Type: ' . $this->_supported_formats [$this->response->format] );
+				header('Content-Type: '.$this->_supported_formats [$this->response->format]);
 				
-				$output = $this->format->factory ( $data )->{'to_' . $this->response->format} ();
+				$output = $this->format->factory($data)->{'to_'.$this->response->format} ();
 			} 			
 
 			// Format not supported, output directly
@@ -342,20 +342,20 @@ 
 			}
 		}
 		
-		header ( 'HTTP/1.1: ' . $http_code );
-		header ( 'Status: ' . $http_code );
+		header('HTTP/1.1: '.$http_code);
+		header('Status: '.$http_code);
 		
 		// If zlib.output_compression is enabled it will compress the output,
 		// but it will not modify the content-length header to compensate for
 		// the reduction, causing the browser to hang waiting for more data.
 		// We'll just skip content-length in those cases.
-		if (! $this->_zlib_oc && ! $CFG->item ( 'compress_output' )) {
+		if ( ! $this->_zlib_oc && ! $CFG->item('compress_output')) {
 			// header('Content-Length: ' . strlen($output));
 		}
 		
-		$loglevel = (isset ( $data ['error'] )) ? "error" : "info";
-		$this->api_log->write_log ( $loglevel, "[" . $http_code . "] " . $output );
-		exit ( $output );
+		$loglevel = (isset ($data ['error'])) ? "error" : "info";
+		$this->api_log->write_log($loglevel, "[".$http_code."] ".$output);
+		exit ($output);
 	}
 	
 	/*
@@ -364,11 +364,11 @@ 
 	 * Detect which format the HTTP Body is provided in
 	 */
 	protected function _detect_input_format() {
-		if ($this->input->server ( 'CONTENT_TYPE' )) {
+		if ($this->input->server('CONTENT_TYPE')) {
 			// Check all formats against the HTTP_ACCEPT header
-			foreach ( $this->_supported_formats as $format => $mime ) {
-				if (strpos ( $match = $this->input->server ( 'CONTENT_TYPE' ), ';' )) {
-					$match = current ( explode ( ';', $match ) );
+			foreach ($this->_supported_formats as $format => $mime) {
+				if (strpos($match = $this->input->server('CONTENT_TYPE'), ';')) {
+					$match = current(explode(';', $match));
 				}
 				
 				if ($match == $mime) {
@@ -388,36 +388,36 @@ 
 	 * @return string The output format.
 	 */
 	protected function _detect_output_format() {
-		$pattern = '/\.(' . implode ( '|', array_keys ( $this->_supported_formats ) ) . ')$/';
+		$pattern = '/\.('.implode('|', array_keys($this->_supported_formats)).')$/';
 		
 		// Check if a file extension is used
-		if (preg_match ( $pattern, $this->uri->uri_string (), $matches )) {
+		if (preg_match($pattern, $this->uri->uri_string(), $matches)) {
 			return $matches [1];
 		}		
 
 		// Check if a file extension is used
-		elseif ($this->_get_args and ! is_array ( end ( $this->_get_args ) ) and preg_match ( $pattern, end ( $this->_get_args ), $matches )) {
+		elseif ($this->_get_args and ! is_array(end($this->_get_args)) and preg_match($pattern, end($this->_get_args), $matches)) {
 			// The key of the last argument
-			$last_key = end ( array_keys ( $this->_get_args ) );
+			$last_key = end(array_keys($this->_get_args));
 			
 			// Remove the extension from arguments too
-			$this->_get_args [$last_key] = preg_replace ( $pattern, '', $this->_get_args [$last_key] );
-			$this->_args [$last_key] = preg_replace ( $pattern, '', $this->_args [$last_key] );
+			$this->_get_args [$last_key] = preg_replace($pattern, '', $this->_get_args [$last_key]);
+			$this->_args [$last_key] = preg_replace($pattern, '', $this->_args [$last_key]);
 			
 			return $matches [1];
 		}
 		
 		// A format has been passed as an argument in the URL and it is supported
-		if (isset ( $this->_get_args ['format'] ) and array_key_exists ( $this->_get_args ['format'], $this->_supported_formats )) {
+		if (isset ($this->_get_args ['format']) and array_key_exists($this->_get_args ['format'], $this->_supported_formats)) {
 			return $this->_get_args ['format'];
 		}
 		
 		// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)
-		if ($this->config->item ( 'api_ignore_http_accept' ) === FALSE and $this->input->server ( 'HTTP_ACCEPT' )) {
+		if ($this->config->item('api_ignore_http_accept') === FALSE and $this->input->server('HTTP_ACCEPT')) {
 			// Check all formats against the HTTP_ACCEPT header
-			foreach ( array_keys ( $this->_supported_formats ) as $format ) {
+			foreach (array_keys($this->_supported_formats) as $format) {
 				// Has this format been requested?
-				if (strpos ( $this->input->server ( 'HTTP_ACCEPT' ), $format ) !== FALSE) {
+				if (strpos($this->input->server('HTTP_ACCEPT'), $format) !== FALSE) {
 					// If not HTML or XML assume its right and send it on its way
 					if ($format != 'html' and $format != 'xml') {
 						
@@ -427,12 +427,12 @@ 
 					// HTML or XML have shown up as a match
 					else {
 						// If it is truly HTML, it wont want any XML
-						if ($format == 'html' and strpos ( $this->input->server ( 'HTTP_ACCEPT' ), 'xml' ) === FALSE) {
+						if ($format == 'html' and strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE) {
 							return $format;
 						}						
 
 						// If it is truly XML, it wont want any HTML
-						elseif ($format == 'xml' and strpos ( $this->input->server ( 'HTTP_ACCEPT' ), 'html' ) === FALSE) {
+						elseif ($format == 'xml' and strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE) {
 							return $format;
 						}
 					}
@@ -441,12 +441,12 @@ 
 		} // End HTTP_ACCEPT checking
 		  
 		// Well, none of that has worked! Let's see if the controller has a default
-		if (! empty ( $this->api_format )) {
+		if ( ! empty ($this->api_format)) {
 			return $this->api_format;
 		}
 		
 		// Just use the default format
-		return config_item ( 'api_default_format' );
+		return config_item('api_default_format');
 	}
 	
 	/**
@@ -457,17 +457,17 @@ 
 	 * @return string
 	 */
 	protected function _detect_method() {
-		$method = strtolower ( $this->input->server ( 'REQUEST_METHOD' ) );
+		$method = strtolower($this->input->server('REQUEST_METHOD'));
 		
-		if ($this->config->item ( 'enable_emulate_request' )) {
-			if ($this->input->post ( '_method' )) {
-				$method = strtolower ( $this->input->post ( '_method' ) );
-			} elseif ($this->input->server ( 'HTTP_X_HTTP_METHOD_OVERRIDE' )) {
-				$method = strtolower ( $this->input->server ( 'HTTP_X_HTTP_METHOD_OVERRIDE' ) );
+		if ($this->config->item('enable_emulate_request')) {
+			if ($this->input->post('_method')) {
+				$method = strtolower($this->input->post('_method'));
+			} elseif ($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE')) {
+				$method = strtolower($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
 			}
 		}
 		
-		if (in_array ( $method, $this->allowed_http_methods ) && method_exists ( $this, '_parse_' . $method )) {
+		if (in_array($method, $this->allowed_http_methods) && method_exists($this, '_parse_'.$method)) {
 			return $method;
 		}
 		
@@ -482,20 +482,20 @@ 
 	 * @return null|string The language code.
 	 */
 	protected function _detect_lang() {
-		if (! $lang = $this->input->server ( 'HTTP_ACCEPT_LANGUAGE' )) {
+		if ( ! $lang = $this->input->server('HTTP_ACCEPT_LANGUAGE')) {
 			return NULL;
 		}
 		
 		// They might have sent a few, make it an array
-		if (strpos ( $lang, ',' ) !== FALSE) {
-			$langs = explode ( ',', $lang );
+		if (strpos($lang, ',') !== FALSE) {
+			$langs = explode(',', $lang);
 			
-			$return_langs = array ();
+			$return_langs = array();
 			$i = 1;
-			foreach ( $langs as $lang ) {
+			foreach ($langs as $lang) {
 				// Remove weight and strip space
-				list ( $lang ) = explode ( ';', $lang );
-				$return_langs [] = trim ( $lang );
+				list ($lang) = explode(';', $lang);
+				$return_langs [] = trim($lang);
 			}
 			
 			return $return_langs;
@@ -516,7 +516,7 @@ 
 	 */
 	protected function _check_limit($controller_method) {
 		// They are special, or it might not even have a limit
-		if (! empty ( $this->api->ignore_limits ) or ! isset ( $this->methods [$controller_method] ['limit'] )) {
+		if ( ! empty ($this->api->ignore_limits) or ! isset ($this->methods [$controller_method] ['limit'])) {
 			// On your way sonny-jim.
 			return TRUE;
 		}
@@ -525,17 +525,17 @@ 
 		$limit = $this->methods [$controller_method] ['limit'];
 		
 		// Get data on a keys usage
-		$result = $this->api->db->where ( 'uri', $this->uri->uri_string () )->where ( 'api_key', $this->api->key )->get ( config_item ( 'api_limits_table' ) )->row ();
+		$result = $this->api->db->where('uri', $this->uri->uri_string())->where('api_key', $this->api->key)->get(config_item('api_limits_table'))->row();
 		
 		// No calls yet, or been an hour since they called
-		if (! $result or $result->hour_started < time () - (60 * 60)) {
+		if ( ! $result or $result->hour_started < time() - (60 * 60)) {
 			// Right, set one up from scratch
-			$this->api->db->insert ( config_item ( 'api_limits_table' ), array (
-					'uri' => $this->uri->uri_string (),
-					'api_key' => isset ( $this->api->key ) ? $this->api->key : '',
+			$this->api->db->insert(config_item('api_limits_table'), array(
+					'uri' => $this->uri->uri_string(),
+					'api_key' => isset ($this->api->key) ? $this->api->key : '',
 					'count' => 1,
-					'hour_started' => time () 
-			) );
+					'hour_started' => time() 
+			));
 		} 		
 
 		// They have called within the hour, so lets update
@@ -545,7 +545,7 @@ 
 				return FALSE;
 			}
 			
-			$this->api->db->where ( 'uri', $this->uri->uri_string () )->where ( 'api_key', $this->api->key )->set ( 'count', 'count + 1', FALSE )->update ( config_item ( 'api_limits_table' ) );
+			$this->api->db->where('uri', $this->uri->uri_string())->where('api_key', $this->api->key)->set('count', 'count + 1', FALSE)->update(config_item('api_limits_table'));
 		}
 		
 		return TRUE;
@@ -556,10 +556,10 @@ 
 	 */
 	protected function _parse_get() {
 		// Grab proper GET variables
-		parse_str ( parse_url ( $_SERVER ['REQUEST_URI'], PHP_URL_QUERY ), $get );
+		parse_str(parse_url($_SERVER ['REQUEST_URI'], PHP_URL_QUERY), $get);
 		
 		// Merge both the URI segments and GET params
-		$this->_get_args = array_merge ( $this->_get_args, $get );
+		$this->_get_args = array_merge($this->_get_args, $get);
 	}
 	
 	/**
@@ -568,7 +568,7 @@ 
 	protected function _parse_post() {
 		$this->_post_args = $_POST;
 		
-		$this->request->format and $this->request->body = file_get_contents ( 'php://input' );
+		$this->request->format and $this->request->body = file_get_contents('php://input');
 	}
 	
 	// INPUT FUNCTION --------------------------------------------------------------
@@ -587,7 +587,7 @@ 
 			return $this->_get_args;
 		}
 		
-		return array_key_exists ( $key, $this->_get_args ) ? $this->_xss_clean ( $this->_get_args [$key], $xss_clean ) : FALSE;
+		return array_key_exists($key, $this->_get_args) ? $this->_xss_clean($this->_get_args [$key], $xss_clean) : FALSE;
 	}
 	
 	/**
@@ -604,7 +604,7 @@ 
 			return $this->_post_args;
 		}
 		
-		return array_key_exists ( $key, $this->_post_args ) ? $this->_xss_clean ( $this->_post_args [$key], $xss_clean ) : FALSE;
+		return array_key_exists($key, $this->_post_args) ? $this->_xss_clean($this->_post_args [$key], $xss_clean) : FALSE;
 	}
 	
 	/**
@@ -618,10 +618,10 @@ 
 	 */
 	protected function _xss_clean($val, $process) {
 		if (CI_VERSION < 2) {
-			return $process ? $this->input->xss_clean ( $val ) : $val;
+			return $process ? $this->input->xss_clean($val) : $val;
 		}
 		
-		return $process ? $this->security->xss_clean ( $val ) : $val;
+		return $process ? $this->security->xss_clean($val) : $val;
 	}
 	
 	// SECURITY FUNCTIONS ---------------------------------------------------------
@@ -630,19 +630,19 @@ 
 	 * Check if the client's ip is in the 'api_ip_whitelist' config
 	 */
 	protected function _check_whitelist_auth() {
-		$whitelist = explode ( ',', config_item ( 'api_ip_whitelist' ) );
+		$whitelist = explode(',', config_item('api_ip_whitelist'));
 		
-		array_push ( $whitelist, '127.0.0.1', '0.0.0.0' );
+		array_push($whitelist, '127.0.0.1', '0.0.0.0');
 		
-		foreach ( $whitelist as &$ip ) {
-			$ip = trim ( $ip );
+		foreach ($whitelist as &$ip) {
+			$ip = trim($ip);
 		}
 		
-		if (! in_array ( $this->input->ip_address (), $whitelist )) {
-			$this->response ( array (
+		if ( ! in_array($this->input->ip_address(), $whitelist)) {
+			$this->response(array(
 					'status' => false,
 					'error' => 'Not authorized' 
-			), 401 );
+			), 401);
 		}
 	}
 	
@@ -654,8 +654,8 @@ 
 	 */
 	protected function _force_loopable($data) {
 		// Force it to be something useful
-		if (! is_array ( $data ) and ! is_object ( $data )) {
-			$data = ( array ) $data;
+		if ( ! is_array($data) and ! is_object($data)) {
+			$data = (array)$data;
 		}
 		
 		return $data;
@@ -672,7 +672,7 @@ 
 	 * @return string The JSONP data string (loadable from Javascript).
 	 */
 	protected function _format_jsonp($data = array()) {
-		return $this->get ( 'callback' ) . '(' . json_encode ( $data ) . ')';
+		return $this->get('callback').'('.json_encode($data).')';
 	}
 	
 	/*
@@ -685,15 +685,15 @@ 
 		 */
 		
 		// Added patch to validate request from freeswitch to send push notification for callkit to ios
-		if ($_SERVER ['HTTP_USER_AGENT'] == 'freeswitch-curl/1.0' && isset ( $_POST ['uuid'] )) {
-			$_SERVER ['HTTP_X_AUTH_TOKEN'] = $this->post ( 'fs_key' );
+		if ($_SERVER ['HTTP_USER_AGENT'] == 'freeswitch-curl/1.0' && isset ($_POST ['uuid'])) {
+			$_SERVER ['HTTP_X_AUTH_TOKEN'] = $this->post('fs_key');
 		}
 		
-		if (! isset ( $_SERVER ['HTTP_X_AUTH_TOKEN'] ) || config_item ( 'api_x_auth_token' ) != $_SERVER ['HTTP_X_AUTH_TOKEN']) {
-			$this->response ( array (
+		if ( ! isset ($_SERVER ['HTTP_X_AUTH_TOKEN']) || config_item('api_x_auth_token') != $_SERVER ['HTTP_X_AUTH_TOKEN']) {
+			$this->response(array(
 					'status' => false,
-					'error' => $this->lang->line ( 'error_authentication_invalid_token' ) 
-			), 403 );
+					'error' => $this->lang->line('error_authentication_invalid_token') 
+			), 403);
 		}
 	}
 }

web_interface/astpp/application/libraries/locale.php

Spacing +20 added lines, -20 removed lines

@@ -20,40 +20,40 @@
 // 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 {
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
-		$this->CI->load->model ( 'db_model' );
-		$this->CI->load->library ( 'email' );
-		$this->CI->load->library ( 'session' );
-		$this->CI->load->driver ( 'cache' );
-		$this->set_lang ();
+		$this->CI = & get_instance();
+		$this->CI->load->model('db_model');
+		$this->CI->load->library('email');
+		$this->CI->load->library('session');
+		$this->CI->load->driver('cache');
+		$this->set_lang();
 	}
 	function set_lang($lang = FALSE) {
-		$current_locale = $this->CI->session->userdata ( 'user_language' );
-		if (empty ( $current_locale )) {
+		$current_locale = $this->CI->session->userdata('user_language');
+		if (empty ($current_locale)) {
 			$current_locale = 'en_US';
 		}
-		putenv ( "LANG=$current_locale" );
-		setlocale ( LC_ALL, $current_locale . ".UTF-8" );
-		setlocale ( LC_MESSAGES, $current_locale );
-		setlocale ( LC_TIME, $current_locale );
-		setlocale ( LC_CTYPE, $current_locale );
+		putenv("LANG=$current_locale");
+		setlocale(LC_ALL, $current_locale.".UTF-8");
+		setlocale(LC_MESSAGES, $current_locale);
+		setlocale(LC_TIME, $current_locale);
+		setlocale(LC_CTYPE, $current_locale);
 		$domain = 'messages';
 		$uri_segment = '';
 		$uri_segment = $this->CI->uri->segments;
-		if (isset ( $uri_segment [1] )) {
-			$filename = getcwd () . '/application/modules/user/language/' . $lang . '/LC_MESSAGES/messages.mo';
-			bindtextdomain ( WEBSITE_DOMAIN, getcwd () . '/application/modules/' . $uri_segment [1] . '/language/' );
+		if (isset ($uri_segment [1])) {
+			$filename = getcwd().'/application/modules/user/language/'.$lang.'/LC_MESSAGES/messages.mo';
+			bindtextdomain(WEBSITE_DOMAIN, getcwd().'/application/modules/'.$uri_segment [1].'/language/');
 		}
-		bind_textdomain_codeset ( WEBSITE_DOMAIN, 'UTF-8' );
-		textdomain ( WEBSITE_DOMAIN );
+		bind_textdomain_codeset(WEBSITE_DOMAIN, 'UTF-8');
+		textdomain(WEBSITE_DOMAIN);
 		return true;
 	}
 }

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