iNextrix / ASTPP

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

Spacing +7 added lines, -7 removed lines

@@ -52,24 +52,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                    <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                    <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#"><?php echo gettext('Billing')?></a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                            <a href="<?= base_url() . "user/user_invoices_list/"; ?>"> <?php echo gettext('Invoices')?> </a>
+                            <a href="<?= base_url()."user/user_invoices_list/"; ?>"> <?php echo gettext('Invoices')?> </a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

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

Spacing +7 added lines, -7 removed lines

@@ -43,24 +43,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#"><?php echo gettext('Configuration')?></a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                           <a href="<?= base_url() . "user/user_animap_list/"; ?>"><?php echo gettext('Caller ID')?></a>
+                           <a href="<?= base_url()."user/user_animap_list/"; ?>"><?php echo gettext('Caller ID')?></a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

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

Indentation +2 added lines, -2 removed lines

@@ -110,8 +110,8 @@
                                             <div class="col-md-3">
                                                 <label class="col-md-2" name="speed_dial" size="16"> 
                                                     <?php if ($result[$i]['speed_num'] == $i) {
-							        //echo $result[$i]['number'];
-							         echo $speeddial[$i];
+									//echo $result[$i]['number'];
+									 echo $speeddial[$i];
 							  } ?> 
                                                 </label>
                                             </div>

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
                                             </label>
                                             </div>
                                                <div class="col-md-3">
-                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  onkeypress="return isNumberKey(event)" value="<?php if (isset($speeddial[$i]) && !empty($speeddial[$i])) {
+                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  onkeypress="return isNumberKey(event)" value="<?php if (isset($speeddial[$i]) && ! empty($speeddial[$i])) {
 		echo $speeddial[$i];
 	} ?>">
                                                </div>

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

Spacing +7 added lines, -7 removed lines

@@ -31,22 +31,22 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                      <ul class="breadcrumb">
-                                         <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                                         <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#"><?php echo gettext('Configuration')?></a></li>
                           <?php } ?>
 			  <li class='active'>
-                             <a href="<?= base_url() . "user/user_alert_threshold/"; ?>"><?php echo gettext('Alert Threshold')?></a>
+                             <a href="<?= base_url()."user/user_alert_threshold/"; ?>"><?php echo gettext('Alert Threshold')?></a>
                           </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>      

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

Spacing +7 added lines, -7 removed lines

@@ -27,24 +27,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#"><?php echo gettext('Configuration')?></a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                           <a href="<?= base_url() . "user/user_sipdevices/"; ?>"><?php echo gettext('SIP Devices')?></a>
+                           <a href="<?= base_url()."user/user_sipdevices/"; ?>"><?php echo gettext('SIP Devices')?></a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/models/db_model.php

Spacing +321 added lines, -321 removed lines

@@ -23,8 +23,8 @@ 
 class Db_model extends CI_Model {
 	function Db_model() {
 		// parent::Model();
-		parent::__construct ();
-		$this->db->query ( "SET time_zone='+0:00'" );
+		parent::__construct();
+		$this->db->query("SET time_zone='+0:00'");
 	}
 	
 	/*
@@ -35,9 +35,9 @@ 
 	function getCriteria($condition = "", $tableName) {
 		// print_r($condition);
 		if ($condition != "") {
-			$this->db->where ( $condition );
+			$this->db->where($condition);
 		}
-		return $this->db->get ( $tableName );
+		return $this->db->get($tableName);
 	}
 	
 	/*
@@ -46,10 +46,10 @@ 
 	 * ********************************************************
 	 */
 	function save($tableName, $arr, $val = 'false') {
-		$str = $this->db->insert_string ( $tableName, $arr );
-		$rs = $this->db->query ( $str );
+		$str = $this->db->insert_string($tableName, $arr);
+		$rs = $this->db->query($str);
 		if ($val == true)
-			return $this->db->insert_id ();
+			return $this->db->insert_id();
 		else
 			return $rs;
 	}
@@ -60,8 +60,8 @@ 
 	 * ********************************************************
 	 */
 	function update($tableName, $arr, $where) {
-		$str = $this->db->update_string ( $tableName, $arr, $where );
-		$rs = $this->db->query ( $str );
+		$str = $this->db->update_string($tableName, $arr, $where);
+		$rs = $this->db->query($str);
 		return $rs;
 	}
 	
@@ -71,12 +71,12 @@ 
 	 * ********************************************************
 	 */
 	function getSelect($select, $tableName, $where) {
-		$this->db->select ( $select, false );
-		$this->db->from ( $tableName );
+		$this->db->select($select, false);
+		$this->db->from($tableName);
 		if ($where != '') {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		$query = $this->db->get ();
+		$query = $this->db->get();
 		return $query;
 	}
 	
@@ -86,11 +86,11 @@ 
 	 * ********************************************************
 	 */
 	function getSelectWithOrder($select, $tableName, $where, $order_type, $order_by) {
-		$this->db->select ( $select );
-		$this->db->from ( $tableName );
-		$this->db->where ( $where );
-		$this->db->order_by ( $order_by, $order_type );
-		$query = $this->db->get ();
+		$this->db->select($select);
+		$this->db->from($tableName);
+		$this->db->where($where);
+		$this->db->order_by($order_by, $order_type);
+		$query = $this->db->get();
 		return $query;
 	}
 	
@@ -100,12 +100,12 @@ 
 	 * ********************************************************
 	 */
 	function getSelectWithOrderAndLimit($select, $tableName, $where, $order_type, $order_by, $paging_limit) {
-		$this->db->select ( $select );
-		$this->db->from ( $tableName );
-		$this->db->where ( $where );
-		$this->db->order_by ( $order_by, $order_type );
-		$this->db->limit ( $paging_limit );
-		$query = $this->db->get ();
+		$this->db->select($select);
+		$this->db->from($tableName);
+		$this->db->where($where);
+		$this->db->order_by($order_by, $order_type);
+		$this->db->limit($paging_limit);
+		$query = $this->db->get();
 		return $query;
 	}
 	
@@ -115,8 +115,8 @@ 
 	 * ********************************************************
 	 */
 	function delete($tableName, $where) {
-		$this->db->where ( $where );
-		$this->db->delete ( $tableName );
+		$this->db->where($where);
+		$this->db->delete($tableName);
 	}
 	
 	/*
@@ -125,7 +125,7 @@ 
 	 * ********************************************************
 	 */
 	function excecute($query) {
-		$rs = $this->db->query ( $query );
+		$rs = $this->db->query($query);
 		return $rs;
 	}
 	
@@ -135,23 +135,23 @@ 
 	 * ********************************************************
 	 */
 	function select($select, $tableName, $where, $order_by, $order_type, $paging_limit = '', $start_limit = '', $groupby = '') {
-		$this->db->select ( $select );
-		$this->db->from ( $tableName );
+		$this->db->select($select);
+		$this->db->from($tableName);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
 		
 		if ($paging_limit)
-			$this->db->limit ( $paging_limit, $start_limit );
-		if (! empty ( $groupby ))
-			$this->db->group_by ( $groupby );
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+			$this->db->limit($paging_limit, $start_limit);
+		if ( ! empty ($groupby))
+			$this->db->group_by($groupby);
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
 			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+				$this->db->order_by($order_by, $order_type);
 		}
-		$query = $this->db->get ();
+		$query = $this->db->get();
 		return $query;
 	}
 	
@@ -161,18 +161,18 @@ 
 	 * ********************************************************
 	 */
 	function select_by_in($select, $tableName, $where, $order_by, $order_type, $paging_limit, $start_limit, $groupby = '', $key, $where_in) {
-		$this->db->select ( $select );
-		$this->db->from ( $tableName );
+		$this->db->select($select);
+		$this->db->from($tableName);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		$this->db->where_in ( $key, $where_in );
-		$this->db->order_by ( $order_by, $order_type );
+		$this->db->where_in($key, $where_in);
+		$this->db->order_by($order_by, $order_type);
 		if ($paging_limit)
-			$this->db->limit ( $paging_limit, $start_limit );
-		if (! empty ( $groupby ))
-			$this->db->groupby ( $groupby );
-		$query = $this->db->get ();
+			$this->db->limit($paging_limit, $start_limit);
+		if ( ! empty ($groupby))
+			$this->db->groupby($groupby);
+		$query = $this->db->get();
 		
 		return $query;
 	}
@@ -183,13 +183,13 @@ 
 	 * ********************************************************
 	 */
 	function countQuery($select, $table, $where = "") {
-		$this->db->select ( $select );
+		$this->db->select($select);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		$this->db->from ( $table );
-		$query = $this->db->get ();
-		return $query->num_rows ();
+		$this->db->from($table);
+		$query = $this->db->get();
+		return $query->num_rows();
 	}
 	
 	/*
@@ -198,16 +198,16 @@ 
 	 * ********************************************************
 	 */
 	function countQuery_by_in($select, $table, $where = "", $key, $where_in) {
-		$this->db->select ( $select );
+		$this->db->select($select);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		if (! empty ( $where_in )) {
-			$this->db->where_in ( $key, $where_in );
+		if ( ! empty ($where_in)) {
+			$this->db->where_in($key, $where_in);
 		}
-		$this->db->from ( $table );
-		$query = $this->db->get ();
-		return $query->num_rows ();
+		$this->db->from($table);
+		$query = $this->db->get();
+		return $query->num_rows();
 	}
 	
 	/*
@@ -216,14 +216,14 @@ 
 	 * ********************************************************
 	 */
 	function maxQuery($table, $select, $where = "", $name) {
-		$this->db->select ( $select );
-		$this->db->from ( $table );
+		$this->db->select($select);
+		$this->db->from($table);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		$query = $this->db->get ();
-		if ($query->num_rows () > 0) {
-			$rowP = $query->row ();
+		$query = $this->db->get();
+		if ($query->num_rows() > 0) {
+			$rowP = $query->row();
 			return $rowP->$name;
 		} else {
 			return 0;
@@ -237,13 +237,13 @@ 
 	 */
 	function getCurrent($table, $feild, $where) {
 		// echo "<pre>table====><br>".$table."field====><br>".$feild."where====><br>".print_r($where);
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$this->db->where ( $where );
-		$query = $this->db->get ();
-		if ($query->num_rows () > 0) {
+		$this->db->select($feild);
+		$this->db->from($table);
+		$this->db->where($where);
+		$query = $this->db->get();
+		if ($query->num_rows() > 0) {
 			
-			$rowP = $query->row ();
+			$rowP = $query->row();
 			return $rowP->$feild;
 		} else {
 			return false;
@@ -256,101 +256,101 @@ 
 	 * ********************************************************
 	 */
 	function getJionQuery($table, $feild, $where = "", $jionTable, $jionCondition, $type = 'inner', $start = '', $end = '', $order_type = '', $order_by = '', $group_by = '') {
-		$start = ( int ) $start;
-		$end = ( int ) $end;
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$this->db->join ( $jionTable, $jionCondition, $type );
+		$start = (int)$start;
+		$end = (int)$end;
+		$this->db->select($feild);
+		$this->db->from($table);
+		$this->db->join($jionTable, $jionCondition, $type);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
 			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+				$this->db->order_by($order_by, $order_type);
 		}
 		
 		if ($group_by != '') {
-			$this->db->group_by ( $group_by );
+			$this->db->group_by($group_by);
 		}
 		
-		$this->db->limit ( $start, $end );
+		$this->db->limit($start, $end);
 		
-		return $query = $this->db->get ();
+		return $query = $this->db->get();
 	}
 	function getJionQueryCount($table, $feild, $where = "", $jionTable, $jionCondition, $type = 'inner', $start = '', $end = '', $order_type = '', $order_by = '', $group_by = '') {
-		$start = ( int ) $start;
-		$end = ( int ) $end;
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$this->db->join ( $jionTable, $jionCondition, $type );
+		$start = (int)$start;
+		$end = (int)$end;
+		$this->db->select($feild);
+		$this->db->from($table);
+		$this->db->join($jionTable, $jionCondition, $type);
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
 		
 		if ($order_type != '' && $order_by != '') {
-			$this->db->orderby ( $order_type, $order_by );
+			$this->db->orderby($order_type, $order_by);
 		}
 		
 		if ($group_by != '') {
-			$this->db->group_by ( $group_by );
+			$this->db->group_by($group_by);
 		}
 		
-		$query = $this->db->get ();
-		return $query->num_rows ();
+		$query = $this->db->get();
+		return $query->num_rows();
 	}
 	function getAllJionQuery($table, $feild, $where = "", $jionTable, $jionCondition, $type, $start = '', $end = '', $order_type = '', $order_by = '', $group_by = '') {
-		$start = ( int ) $start;
-		$end = ( int ) $end;
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$jion_table_count = count ( $jionTable );
-		for($i = 0; $i < $jion_table_count; $i ++) {
-			$this->db->join ( $jionTable [$i], $jionCondition [$i], $type [$i] );
+		$start = (int)$start;
+		$end = (int)$end;
+		$this->db->select($feild);
+		$this->db->from($table);
+		$jion_table_count = count($jionTable);
+		for ($i = 0; $i < $jion_table_count; $i++) {
+			$this->db->join($jionTable [$i], $jionCondition [$i], $type [$i]);
 		}
 		
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
 			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+				$this->db->order_by($order_by, $order_type);
 		}
 		
 		if ($group_by != '') {
-			$this->db->group_by ( $group_by );
+			$this->db->group_by($group_by);
 		}
 		
 		if ($start != '' && $end != '') {
-			$this->db->limit ( $start, $end );
+			$this->db->limit($start, $end);
 		}
 		
 		if ($start != '' && $end == '') {
-			$this->db->limit ( $start );
+			$this->db->limit($start);
 		}
 		
-		return $query = $this->db->get ();
+		return $query = $this->db->get();
 	}
 	function getCountWithJion($table, $feild, $where = "", $jionTable, $jionCondition, $type, $group_by = '') {
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$jion_table_count = count ( $jionTable );
-		for($i = 0; $i < $jion_table_count; $i ++) {
-			$this->db->join ( $jionTable [$i], $jionCondition [$i], $type [$i] );
+		$this->db->select($feild);
+		$this->db->from($table);
+		$jion_table_count = count($jionTable);
+		for ($i = 0; $i < $jion_table_count; $i++) {
+			$this->db->join($jionTable [$i], $jionCondition [$i], $type [$i]);
 		}
 		
 		if ($where != "") {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
 		if ($group_by != '') {
-			$this->db->group_by ( $group_by );
+			$this->db->group_by($group_by);
 		}
-		$query = $this->db->get ();
-		if ($query->num_rows () > 0) {
-			return $query->num_rows ();
+		$query = $this->db->get();
+		if ($query->num_rows() > 0) {
+			return $query->num_rows();
 		} else {
 			return false;
 		}
@@ -362,16 +362,16 @@ 
 	 * ********************************************************
 	 */
 	function getCurrentWithOrder($table, $feild, $where, $order, $order_by, $limit, $option) {
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$this->db->where ( $where );
-		$this->db->order_by ( $order, $order_by );
+		$this->db->select($feild);
+		$this->db->from($table);
+		$this->db->where($where);
+		$this->db->order_by($order, $order_by);
 		if ($limit != 0) {
-			$this->db->limit ( $limit );
+			$this->db->limit($limit);
 		}
-		$query = $this->db->get ();
-		if ($query->num_rows () > 0) {
-			$rowP = $query->row ();
+		$query = $this->db->get();
+		if ($query->num_rows() > 0) {
+			$rowP = $query->row();
 			if ($option == 'yes') {
 				return $rowP->$feild;
 			} else {
@@ -392,12 +392,12 @@ 
 	 * ********************************************************
 	 */
 	function getAllWithOrder($table, $feild, $where) {
-		$this->db->select ( $feild );
-		$this->db->from ( $table );
-		$this->db->where ( $where );
-		$query = $this->db->get ();
-		if ($query->num_rows () > 0) {
-			$rowP = $query->row ();
+		$this->db->select($feild);
+		$this->db->from($table);
+		$this->db->where($where);
+		$query = $this->db->get();
+		if ($query->num_rows() > 0) {
+			$rowP = $query->row();
 			return $rowP->$feild;
 		} else {
 			return false;
@@ -405,20 +405,20 @@ 
 	}
 	function getCommaSperated($table, $select, $where, $limit, $return_message = FALSE, $message = '') {
 		if ($table != '') {
-			$this->db->select ( $select );
-			$this->db->from ( $table );
-			$this->db->where ( $where );
+			$this->db->select($select);
+			$this->db->from($table);
+			$this->db->where($where);
 			if ($limit != 0) {
-				$this->db->limit ( $limit );
+				$this->db->limit($limit);
 			}
-			$query = $this->db->get ();
+			$query = $this->db->get();
 			$string = '';
-			if ($query->num_rows () > 0) {
-				foreach ( $query->result () as $rows ) {
-					$string .= $rows->$select . ',';
+			if ($query->num_rows() > 0) {
+				foreach ($query->result() as $rows) {
+					$string .= $rows->$select.',';
 				}
 				
-				return substr ( $string, '', - 1 );
+				return substr($string, '', - 1);
 			} else {
 				if ($return_message == FALSE) {
 					return '';
@@ -431,29 +431,29 @@ 
 		}
 	}
 	function build_concat_dropdown($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
-		if (isset ( $select_params [3] )) {
+		$select_params = explode(',', $select);
+		if (isset ($select_params [3])) {
 			$cnt_str = " $select_params[1],' ',$select_params[2],' ','(',$select_params[3],')' ";
 		} else {
 			$cnt_str = " $select_params[1],' (',$select_params[2],')' ";
 		}
-		$select = $select_params [0] . ", concat($cnt_str) as $select_params[1] ";
-		$logintype = $this->session->userdata ( 'logintype' );
+		$select = $select_params [0].", concat($cnt_str) as $select_params[1] ";
+		$logintype = $this->session->userdata('logintype');
 		if (($logintype == 1 || $logintype == 5) && $id_where == 'where_arr') {
-			$account_data = $this->session->userdata ( "accountinfo" );
+			$account_data = $this->session->userdata("accountinfo");
 			$id_value ['reseller_id'] = $account_data ['id'];
 		}
-		if (isset ( $id_value ['type'] ) && $id_value ['type'] == '0,3') {
-			$twhere = "type IN (" . $id_value ["type"] . ")";
-			$this->db->where ( $twhere );
-			unset ( $id_value ['type'] );
+		if (isset ($id_value ['type']) && $id_value ['type'] == '0,3') {
+			$twhere = "type IN (".$id_value ["type"].")";
+			$this->db->where($twhere);
+			unset ($id_value ['type']);
 		}
 		$where = $id_value;
-		$drp_array = $this->getSelect ( $select, $table, $where );
-		$drp_array = $drp_array->result ();
+		$drp_array = $this->getSelect($select, $table, $where);
+		$drp_array = $drp_array->result();
 		
-		$drp_list = array ();
-		foreach ( $drp_array as $drp_value ) {
+		$drp_list = array();
+		foreach ($drp_array as $drp_value) {
 			$drp_list [$drp_value->$select_params [0]] = $drp_value->$select_params [1];
 		}
 		return $drp_list;
@@ -465,27 +465,27 @@ 
 	 * ***
 	 */
 	function build_concat_dropdown_refill_coupon($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		if (isset ( $select_params [3] )) {
+		$select_params = explode(',', $select);
+		$account_data = $this->session->userdata("accountinfo");
+		if (isset ($select_params [3])) {
 			$cnt_str = " $select_params[1],' ',$select_params[2],' ','(',$select_params[3],')' ";
 		} else {
 			$cnt_str = " $select_params[1],' (',$select_params[2],')' ";
 		}
-		$select = $select_params [0] . ", concat($cnt_str) as $select_params[1] ";
-		$logintype = $this->session->userdata ( 'logintype' );
+		$select = $select_params [0].", concat($cnt_str) as $select_params[1] ";
+		$logintype = $this->session->userdata('logintype');
 		if ($account_data ['type'] == 1 && $id_where == 'where_arr') {
 			$id_value ['reseller_id'] = $account_data ['id'];
 		} else {
-			$this->db->or_where ( 'type', 3 );
+			$this->db->or_where('type', 3);
 		}
 		$where = $id_value;
-		$this->db->where ( $where );
-		$drp_array = $this->getSelect ( $select, $table, '' );
-		$drp_array = $drp_array->result ();
-		$drp_list = array ();
+		$this->db->where($where);
+		$drp_array = $this->getSelect($select, $table, '');
+		$drp_array = $drp_array->result();
+		$drp_list = array();
 		// $drp_list[0] = 'Admin';
-		foreach ( $drp_array as $drp_value ) {
+		foreach ($drp_array as $drp_value) {
 			$drp_list [$drp_value->$select_params [0]] = $drp_value->$select_params [1];
 		}
 		return $drp_list;
@@ -494,135 +494,135 @@ 
 	 * ********************************
 	 */
 	function build_concat_select_dropdown($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
-		if (isset ( $select_params [3] )) {
+		$select_params = explode(',', $select);
+		if (isset ($select_params [3])) {
 			$cnt_str = " $select_params[1],' ',$select_params[2],' ','(',$select_params[3],')' ";
 		} else {
 			$cnt_str = " $select_params[1],' (',$select_params[2],')' ";
 		}
-		$select = $select_params [0] . ", concat($cnt_str) as $select_params[1] ";
+		$select = $select_params [0].", concat($cnt_str) as $select_params[1] ";
 		$where = $id_value;
-		$drp_array = $this->getSelect ( $select, $table, $id_value );
-		$drp_array = $drp_array->result ();
+		$drp_array = $this->getSelect($select, $table, $id_value);
+		$drp_array = $drp_array->result();
 		
-		$drp_list = array ();
+		$drp_list = array();
 		$drp_list [0] = "--Select--";
-		foreach ( $drp_array as $drp_value ) {
+		foreach ($drp_array as $drp_value) {
 			$drp_list [$drp_value->$select_params [0]] = $drp_value->$select_params [1];
 		}
 		return $drp_list;
 	}
 	function build_dropdown($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
+		$select_params = explode(',', $select);
 		$where = '';
-		if (isset ( $id_value ["type"] ) && $id_value ["type"] == "GLOBAL") {
+		if (isset ($id_value ["type"]) && $id_value ["type"] == "GLOBAL") {
 			$where = "type IN ('0','3')";
-			$this->db->where ( $where );
-			unset ( $id_value ["type"] );
+			$this->db->where($where);
+			unset ($id_value ["type"]);
 		}
 		if ($id_where != '' && $id_value != '') {
 			if ($id_where == 'group_by') {
-				$this->db->group_by ( $id_value );
+				$this->db->group_by($id_value);
 			} else if ($id_where == "where_arr") {
-				$logintype = $this->session->userdata ( 'logintype' );
-				if (($logintype == 1 || $logintype == 5) && $id_where == 'where_arr' && $this->db->field_exists ( 'reseller_id', $table )) {
+				$logintype = $this->session->userdata('logintype');
+				if (($logintype == 1 || $logintype == 5) && $id_where == 'where_arr' && $this->db->field_exists('reseller_id', $table)) {
 					$id_value ['reseller_id'] = $this->session->userdata ["accountinfo"] ['id'];
 				}
 				$where = $id_value;
 			} else {
-				$logintype = $this->session->userdata ( 'logintype' );
+				$logintype = $this->session->userdata('logintype');
 				if (($logintype == 1 || $logintype == 5) && $id_where == 'reseller_id') {
-					$account_data = $this->session->userdata ( "accountinfo" );
+					$account_data = $this->session->userdata("accountinfo");
 					$id_value = $account_data ['id'];
 				}
-				$where = array (
+				$where = array(
 						$id_where => $id_value 
 				);
 			}
 		}
 		
-		$drp_array = $this->getSelect ( $select, $table, $where );
-		$drp_array = $drp_array->result ();
+		$drp_array = $this->getSelect($select, $table, $where);
+		$drp_array = $drp_array->result();
 		
-		$drp_list = array ();
-		foreach ( $drp_array as $drp_value ) {
+		$drp_list = array();
+		foreach ($drp_array as $drp_value) {
 			$drp_list [$drp_value->$select_params [0]] = $drp_value->$select_params [1];
 		}
 		return $drp_list;
 	}
 	function build_dropdown_deleted($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
-		if (isset ( $id_value ["type"] )) {
-			$where = $id_value ["type"] == "GLOBAL" ? "type IN ('0','3')" : "type IN (" . $id_value ["type"] . ")";
-			$this->db->where ( $where );
-			unset ( $id_value ["type"] );
+		$select_params = explode(',', $select);
+		if (isset ($id_value ["type"])) {
+			$where = $id_value ["type"] == "GLOBAL" ? "type IN ('0','3')" : "type IN (".$id_value ["type"].")";
+			$this->db->where($where);
+			unset ($id_value ["type"]);
 		}
 		$where = '';
 		if ($id_where != '' && $id_value != '') {
 			if ($id_where == 'group_by') {
-				$this->db->group_by ( $id_value );
+				$this->db->group_by($id_value);
 			} else if ($id_where == "where_arr") {
-				$logintype = $this->session->userdata ( 'logintype' );
+				$logintype = $this->session->userdata('logintype');
 				if (($logintype == 1 || $logintype == 5) && $id_where == 'where_arr') {
-					$account_data = $this->session->userdata ( "accountinfo" );
+					$account_data = $this->session->userdata("accountinfo");
 					$id_value ['reseller_id'] = $account_data ['id'];
 				}
 				$where = $id_value;
 			} else {
-				$logintype = $this->session->userdata ( 'logintype' );
+				$logintype = $this->session->userdata('logintype');
 				if (($logintype == 1 || $logintype == 5) && $id_where == 'reseller_id') {
-					$account_data = $this->session->userdata ( "accountinfo" );
+					$account_data = $this->session->userdata("accountinfo");
 					$id_value = $account_data ['id'];
 				}
-				$where = array (
+				$where = array(
 						$id_where => $id_value 
 				);
 			}
 		}
 		
-		$drp_array = $this->getSelect ( $select, $table, $where );
+		$drp_array = $this->getSelect($select, $table, $where);
 		
-		$drp_array = $drp_array->result ();
+		$drp_array = $drp_array->result();
 		
-		$name = explode ( "as", $select );
-		if (isset ( $name [3] )) {
-			$name = trim ( $name [3] );
+		$name = explode("as", $select);
+		if (isset ($name [3])) {
+			$name = trim($name [3]);
 		} else {
-			$name = trim ( $name [1] );
+			$name = trim($name [1]);
 		}
 		
-		$drp_list = array ();
-		$dele = array ();
-		foreach ( $drp_array as $drp_value ) {
-			$dele = explode ( "^", $drp_value->$name );
-			if (isset ( $dele [1] )) {
-				$drp_list ['Deleted'] [$drp_value->$select_params [0]] = str_replace ( "^", "", $drp_value->$name );
+		$drp_list = array();
+		$dele = array();
+		foreach ($drp_array as $drp_value) {
+			$dele = explode("^", $drp_value->$name);
+			if (isset ($dele [1])) {
+				$drp_list ['Deleted'] [$drp_value->$select_params [0]] = str_replace("^", "", $drp_value->$name);
 			} else {
 				$drp_list ['Active'] [$drp_value->$select_params [0]] = $drp_value->$name;
 			}
 		}
-		ksort ( $drp_list );
+		ksort($drp_list);
 		return $drp_list;
 	}
 	function build_search($accounts_list_search) {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
-			$account_search = $this->session->userdata ( $accounts_list_search );
-			unset ( $account_search ["ajax_search"] );
-			unset ( $account_search ["advance_search"] );
+		if ($this->session->userdata('advance_search') == 1) {
+			$account_search = $this->session->userdata($accounts_list_search);
+			unset ($account_search ["ajax_search"]);
+			unset ($account_search ["advance_search"]);
 			/*
 			 * ASTPP 3.0
 			 * Display Records in
 			 */
-			unset ( $account_search ['search_in'], $account_search ['time'] );
-			if (! empty ( $account_search )) {
-				foreach ( $account_search as $key => $value ) {
+			unset ($account_search ['search_in'], $account_search ['time']);
+			if ( ! empty ($account_search)) {
+				foreach ($account_search as $key => $value) {
 					if ($value != "") {
-						if (is_array ( $value )) {
-							if (array_key_exists ( $key . "-integer", $value )) {
-								$this->get_interger_array ( $key, $value [$key . "-integer"], $value [$key] );
+						if (is_array($value)) {
+							if (array_key_exists($key."-integer", $value)) {
+								$this->get_interger_array($key, $value [$key."-integer"], $value [$key]);
 							}
-							if (array_key_exists ( $key . "-string", $value )) {
-								$this->get_string_array ( $key, $value [$key . "-string"], $value [$key] );
+							if (array_key_exists($key."-string", $value)) {
+								$this->get_string_array($key, $value [$key."-string"], $value [$key]);
 							}
 							
 							/**
@@ -633,10 +633,10 @@ 
 								/**
 								 * ********************************************
 								 */
-								$this->get_date_array ( $key, $value );
+								$this->get_date_array($key, $value);
 							}
 						} else {
-							$this->db->where ( $key, $value );
+							$this->db->where($key, $value);
 						}
 					}
 				}
@@ -646,20 +646,20 @@ 
 	}
 	function get_date_array($field, $value) {
 		if ($value != '') {
-			if (! empty ( $value [0] )) {
+			if ( ! empty ($value [0])) {
 				if ($field == 'invoice_date') {
-					$this->db->where ( $field . ' >= ', gmdate ( "Y-m-d", strtotime ( $value ['0'] ) ) . " 00:00:01" );
-					$this->db->where ( $field . ' <= ', gmdate ( "Y-m-d", strtotime ( $value ['0'] ) ) . " 23:59:59" );
+					$this->db->where($field.' >= ', gmdate("Y-m-d", strtotime($value ['0']))." 00:00:01");
+					$this->db->where($field.' <= ', gmdate("Y-m-d", strtotime($value ['0']))." 23:59:59");
 					// ITPLATP 22_05_2017
 				} else if ($field == 'to_date') {
-					$this->db->where ( $field . ' <= ', gmdate ( "Y-m-d", strtotime ( $value ['0'] ) ) . " 23:59:59" );
+					$this->db->where($field.' <= ', gmdate("Y-m-d", strtotime($value ['0']))." 23:59:59");
 					// end
 				} else {
-					$this->db->where ( $field . ' >= ', gmdate ( 'Y-m-d H:i:s', strtotime ( $value [0] ) ) );
+					$this->db->where($field.' >= ', gmdate('Y-m-d H:i:s', strtotime($value [0])));
 				}
 			}
-			if (! empty ( $value [1] )) {
-				$this->db->where ( $field . ' <= ', gmdate ( 'Y-m-d H:i:s', strtotime ( $value [1] ) ) );
+			if ( ! empty ($value [1])) {
+				$this->db->where($field.' <= ', gmdate('Y-m-d H:i:s', strtotime($value [1])));
 			}
 		}
 	}
@@ -667,22 +667,22 @@ 
 		if ($search_array != '') {
 			switch ($value) {
 				case "1" :
-					$this->db->where ( $field, $search_array );
+					$this->db->where($field, $search_array);
 					break;
 				case "2" :
-					$this->db->where ( $field . ' <>', $search_array );
+					$this->db->where($field.' <>', $search_array);
 					break;
 				case "3" :
-					$this->db->where ( $field . ' > ', $search_array );
+					$this->db->where($field.' > ', $search_array);
 					break;
 				case "4" :
-					$this->db->where ( $field . ' < ', $search_array );
+					$this->db->where($field.' < ', $search_array);
 					break;
 				case "5" :
-					$this->db->where ( $field . ' >= ', $search_array );
+					$this->db->where($field.' >= ', $search_array);
 					break;
 				case "6" :
-					$this->db->where ( $field . ' <= ', $search_array );
+					$this->db->where($field.' <= ', $search_array);
 					break;
 			}
 		}
@@ -691,36 +691,36 @@ 
 		if ($search_array != '') {
 			switch ($value) {
 				case "1" :
-					$str1 = $field . " LIKE '%$search_array%'";
-					$this->db->where ( $str1 );
+					$str1 = $field." LIKE '%$search_array%'";
+					$this->db->where($str1);
 					break;
 				case "2" :
-					$str1 = $field . " NOT LIKE '%$search_array%'";
-					$this->db->where ( $str1 );
+					$str1 = $field." NOT LIKE '%$search_array%'";
+					$this->db->where($str1);
 					break;
 				case "3" :
-					$this->db->where ( $field, $search_array );
+					$this->db->where($field, $search_array);
 					break;
 				case "4" :
-					$this->db->where ( $field . ' <>', $search_array );
+					$this->db->where($field.' <>', $search_array);
 					break;
 				case "5" :
 					if ($field == "pattern") {
-						$str1 = $field . " LIKE '^" . $search_array . "%'";
-						$this->db->where ( $str1 );
+						$str1 = $field." LIKE '^".$search_array."%'";
+						$this->db->where($str1);
 					} else {
-						$str1 = $field . " LIKE '" . $search_array . "%'";
-						$this->db->where ( $str1 );
+						$str1 = $field." LIKE '".$search_array."%'";
+						$this->db->where($str1);
 					}
 					
 					break;
 				case "6" :
 					if ($field == "pattern") {
-						$str1 = $field . " LIKE '%" . $search_array . ".*'";
-						$this->db->where ( $str1 );
+						$str1 = $field." LIKE '%".$search_array.".*'";
+						$this->db->where($str1);
 					} else {
-						$str1 = $field . " LIKE '%" . $search_array . "'";
-						$this->db->where ( $str1 );
+						$str1 = $field." LIKE '%".$search_array."'";
+						$this->db->where($str1);
 					}
 					
 					break;
@@ -729,30 +729,30 @@ 
 	}
 	function build_search_string($accounts_list_search) {
 		$where = null;
-		$search = $this->session->userdata ( $accounts_list_search );
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
-			$account_search = $this->session->userdata ( $accounts_list_search );
-			unset ( $account_search ["ajax_search"] );
-			unset ( $account_search ["advance_search"] );
-			if (! empty ( $account_search )) {
-				foreach ( $account_search as $key => $value ) {
+		$search = $this->session->userdata($accounts_list_search);
+		if ($this->session->userdata('advance_search') == 1) {
+			$account_search = $this->session->userdata($accounts_list_search);
+			unset ($account_search ["ajax_search"]);
+			unset ($account_search ["advance_search"]);
+			if ( ! empty ($account_search)) {
+				foreach ($account_search as $key => $value) {
 					if ($value != "") {
-						if (is_array ( $value )) {
-							if (array_key_exists ( $key . "-integer", $value )) {
+						if (is_array($value)) {
+							if (array_key_exists($key."-integer", $value)) {
 								$string = null;
-								$string = $this->build_interger_where ( $key, $value [$key . "-integer"], $value [$key] );
+								$string = $this->build_interger_where($key, $value [$key."-integer"], $value [$key]);
 								if ($string)
 									$where .= "$string AND ";
 							}
-							if (array_key_exists ( $key . "-string", $value )) {
+							if (array_key_exists($key."-string", $value)) {
 								$string = null;
-								$string = $this->build_string_where ( $key, $value [$key . "-string"], $value [$key] );
+								$string = $this->build_string_where($key, $value [$key."-string"], $value [$key]);
 								if ($string)
 									$where .= "$string AND ";
 							}
 							if ($key == 'callstart' || $key == 'date' || $key == 'log_time') {
 								$string = null;
-								$string = $this->build_date_where ( $key, $value );
+								$string = $this->build_date_where($key, $value);
 								if ($string)
 									$where .= "$string AND ";
 							}
@@ -763,7 +763,7 @@ 
 				}
 			}
 		}
-		$where = rtrim ( $where, " AND " );
+		$where = rtrim($where, " AND ");
 		return $where;
 	}
 	// This function using by reports module don't delete it
@@ -785,16 +785,16 @@ 
 					break;
 				case "5" :
 					if ($field == "pattern") {
-						$where = $field . " LIKE '^" . $search_array . "%'";
+						$where = $field." LIKE '^".$search_array."%'";
 					} else {
-						$where = $field . " LIKE '" . $search_array . "%'";
+						$where = $field." LIKE '".$search_array."%'";
 					}
 					break;
 				case "6" :
 					if ($field == "pattern") {
-						$str1 = $field . " LIKE '%" . $search_array . ".*'";
+						$str1 = $field." LIKE '%".$search_array.".*'";
 					} else {
-						$str1 = $field . " LIKE '%" . $search_array . "'";
+						$str1 = $field." LIKE '%".$search_array."'";
 					}
 					break;
 			}
@@ -804,7 +804,7 @@ 
 	function build_interger_where($field, $value, $search_array) {
 		$where = null;
 		if ($search_array != '') {
-			if (is_numeric ( $search_array )) {
+			if (is_numeric($search_array)) {
 				switch ($value) {
 					case "1" :
 						$where = "$field = '$search_array'";
@@ -826,7 +826,7 @@ 
 						break;
 				}
 			} else {
-				$this->db->where ( "$field IS NULL" );
+				$this->db->where("$field IS NULL");
 				$where = "$field IS NULL";
 			}
 		}
@@ -835,21 +835,21 @@ 
 	function build_date_where($field, $value) {
 		$where = null;
 		if ($value != '') {
-			if (! empty ( $value [0] )) {
+			if ( ! empty ($value [0])) {
 				$string = null;
 				$string = "$field >= '$value[0]'";
 				if ($string)
-					$where .= $string . " AND ";
+					$where .= $string." AND ";
 			}
-			if (! empty ( $value [1] )) {
+			if ( ! empty ($value [1])) {
 				$string = null;
 				$string = "$field <= '$value[1]'";
 				if ($string)
-					$where .= $string . " AND ";
+					$where .= $string." AND ";
 			}
 		}
 		if ($where) {
-			$where = rtrim ( $where, " AND " );
+			$where = rtrim($where, " AND ");
 		}
 		return $where;
 	}
@@ -862,19 +862,19 @@ 
 	function update_balance($amount, $accountid, $payment_type) {
 		if ($payment_type == "debit" || $payment_type == "0") {
 			
-			$query = "update accounts set balance =  IF(posttoexternal=1,balance+" . $amount . ",balance-" . $amount . ") where id ='" . $accountid . "'";
+			$query = "update accounts set balance =  IF(posttoexternal=1,balance+".$amount.",balance-".$amount.") where id ='".$accountid."'";
 			
-			return $this->db->query ( $query );
+			return $this->db->query($query);
 		} else {
-			$query = "update accounts set balance =  IF(posttoexternal=1,balance-" . $amount . ",balance+" . $amount . ") where id ='" . $accountid . "'";
+			$query = "update accounts set balance =  IF(posttoexternal=1,balance-".$amount.",balance+".$amount.") where id ='".$accountid."'";
 			
-			return $this->db->query ( $query );
+			return $this->db->query($query);
 		}
 	}
 	function build_batch_update_array($update_array) {
 		$updateflg = false;
-		foreach ( $update_array as $key => $update_fields ) {
-			if (is_array ( $update_fields )) {
+		foreach ($update_array as $key => $update_fields) {
+			if (is_array($update_fields)) {
 				switch ($update_fields ["operator"]) {
 					case "1" :
 						// $this->db->where($field, $search_array);
@@ -882,21 +882,21 @@ 
 					case "2" :
 						if ($update_fields [$key] != '') {
 							$updateflg = true;
-							$this->db->set ( $key, $update_fields [$key] );
+							$this->db->set($key, $update_fields [$key]);
 						}
 						break;
 					case "3" :
-						$this->db->set ( $key, $key . "+" . $update_fields [$key], FALSE );
+						$this->db->set($key, $key."+".$update_fields [$key], FALSE);
 						$updateflg = true;
 						break;
 					case "4" :
-						$this->db->set ( $key, $key . "-" . $update_fields [$key], FALSE );
+						$this->db->set($key, $key."-".$update_fields [$key], FALSE);
 						$updateflg = true;
 						break;
 				}
 			} else {
 				if ($update_fields != "") {
-					$this->db->set ( $key, $update_fields );
+					$this->db->set($key, $update_fields);
 					$updateflg = true;
 				}
 			}
@@ -904,21 +904,21 @@ 
 		return $updateflg;
 	}
 	function build_search_opensips($opensips_db_obj, $accounts_list_search) {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
-			$account_search = $this->session->userdata ( $accounts_list_search );
-			unset ( $account_search ["ajax_search"] );
-			unset ( $account_search ["advance_search"] );
-			foreach ( $account_search as $key => $value ) {
+		if ($this->session->userdata('advance_search') == 1) {
+			$account_search = $this->session->userdata($accounts_list_search);
+			unset ($account_search ["ajax_search"]);
+			unset ($account_search ["advance_search"]);
+			foreach ($account_search as $key => $value) {
 				if ($value != "") {
-					if (is_array ( $value )) {
-						if (array_key_exists ( $key . "-integer", $value )) {
-							$this->get_opensips_interger_array ( $opensips_db_obj, $key, $value [$key . "-integer"], $value [$key] );
+					if (is_array($value)) {
+						if (array_key_exists($key."-integer", $value)) {
+							$this->get_opensips_interger_array($opensips_db_obj, $key, $value [$key."-integer"], $value [$key]);
 						}
-						if (array_key_exists ( $key . "-string", $value )) {
-							$this->get_opensips_string_array ( $opensips_db_obj, $key, $value [$key . "-string"], $value [$key] );
+						if (array_key_exists($key."-string", $value)) {
+							$this->get_opensips_string_array($opensips_db_obj, $key, $value [$key."-string"], $value [$key]);
 						}
 					} else {
-						$opensips_db_obj->where ( $key, $value );
+						$opensips_db_obj->where($key, $value);
 					}
 				}
 			}
@@ -928,22 +928,22 @@ 
 		if ($search_array != '') {
 			switch ($value) {
 				case "1" :
-					$opensips_db_obj->where ( $field, $search_array );
+					$opensips_db_obj->where($field, $search_array);
 					break;
 				case "2" :
-					$opensips_db_obj->where ( $field . ' <>', $search_array );
+					$opensips_db_obj->where($field.' <>', $search_array);
 					break;
 				case "3" :
-					$opensips_db_obj->where ( $field . ' > ', $search_array );
+					$opensips_db_obj->where($field.' > ', $search_array);
 					break;
 				case "4" :
-					$opensips_db_obj->where ( $field . ' < ', $search_array );
+					$opensips_db_obj->where($field.' < ', $search_array);
 					break;
 				case "5" :
-					$opensips_db_obj->where ( $field . ' >= ', $search_array );
+					$opensips_db_obj->where($field.' >= ', $search_array);
 					break;
 				case "6" :
-					$opensips_db_obj->where ( $field . ' <= ', $search_array );
+					$opensips_db_obj->where($field.' <= ', $search_array);
 					break;
 			}
 		}
@@ -952,24 +952,24 @@ 
 		if ($search_array != '') {
 			switch ($value) {
 				case "1" :
-					$opensips_db_obj->like ( $field, $search_array );
+					$opensips_db_obj->like($field, $search_array);
 					break;
 				case "2" :
-					$opensips_db_obj->not_like ( $field, $search_array );
+					$opensips_db_obj->not_like($field, $search_array);
 					break;
 				case "3" :
-					$opensips_db_obj->where ( $field, $search_array );
+					$opensips_db_obj->where($field, $search_array);
 					break;
 				case "4" :
-					$opensips_db_obj->where ( $field . ' <>', $search_array );
+					$opensips_db_obj->where($field.' <>', $search_array);
 					break;
 				case "5" :
-					$str1 = $field . " LIKE '" . $search_array . "%'";
-					$opensips_db_obj->where ( $str1 );
+					$str1 = $field." LIKE '".$search_array."%'";
+					$opensips_db_obj->where($str1);
 					break;
 				case "6" :
-					$str1 = $field . " LIKE '%" . $search_array . "'";
-					$opensips_db_obj->where ( $str1 );
+					$str1 = $field." LIKE '%".$search_array."'";
+					$opensips_db_obj->where($str1);
 					break;
 			}
 		}
@@ -978,24 +978,24 @@ 
 	 * ******invoice changes ********
 	 */
 	function build_dropdown_invoices($select, $table, $id_where = '', $id_value = '') {
-		$select_params = explode ( ',', $select );
-		$select_params = explode ( ',', $select );
-		if (isset ( $select_params [3] )) {
+		$select_params = explode(',', $select);
+		$select_params = explode(',', $select);
+		if (isset ($select_params [3])) {
 			$cnt_str = " $select_params[1],' ',$select_params[2],' ','(',$select_params[3],')' ";
 		} else {
 			$cnt_str = " $select_params[1],' (',$select_params[2],')' ";
 		}
-		$select = $select_params [0] . ", concat($cnt_str) as $select_params[1] ," . $select_params [4];
-		$logintype = $this->session->userdata ( 'logintype' );
+		$select = $select_params [0].", concat($cnt_str) as $select_params[1] ,".$select_params [4];
+		$logintype = $this->session->userdata('logintype');
 		if (($logintype == 1 || $logintype == 5) && $id_where == 'where_arr') {
-			$account_data = $this->session->userdata ( "accountinfo" );
+			$account_data = $this->session->userdata("accountinfo");
 			$id_value ['reseller_id'] = $account_data ['id'];
 		}
 		$where = $id_value;
-		$drp_array = $this->getSelect ( $select, $table, $where );
-		$drp_array = $drp_array->result ();
-		$drp_list = array ();
-		foreach ( $drp_array as $drp_value ) {
+		$drp_array = $this->getSelect($select, $table, $where);
+		$drp_array = $drp_array->result();
+		$drp_list = array();
+		foreach ($drp_array as $drp_value) {
 			if ($drp_value->type == 3) {
 				$drp_list ['Provider'] [$drp_value->id] = $drp_value->first_name;
 			} elseif ($drp_value->type == 1) {
@@ -1004,7 +1004,7 @@ 
 				$drp_list ['Customer'] [$drp_value->id] = $drp_value->first_name;
 			}
 		}
-		ksort ( $drp_list );
+		ksort($drp_list);
 		return $drp_list;
 	}
 }

Braces +41 added lines, -28 removed lines

@@ -48,10 +48,11 @@ 
 	function save($tableName, $arr, $val = 'false') {
 		$str = $this->db->insert_string ( $tableName, $arr );
 		$rs = $this->db->query ( $str );
-		if ($val == true)
-			return $this->db->insert_id ();
-		else
-			return $rs;
+		if ($val == true) {
+					return $this->db->insert_id ();
+		} else {
+					return $rs;
+		}
 	}
 	
 	/*
@@ -141,15 +142,18 @@ 
 			$this->db->where ( $where );
 		}
 		
-		if ($paging_limit)
-			$this->db->limit ( $paging_limit, $start_limit );
-		if (! empty ( $groupby ))
-			$this->db->group_by ( $groupby );
+		if ($paging_limit) {
+					$this->db->limit ( $paging_limit, $start_limit );
+		}
+		if (! empty ( $groupby )) {
+					$this->db->group_by ( $groupby );
+		}
 		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
 			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
 		} else {
-			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+			if ($order_by) {
+							$this->db->order_by ( $order_by, $order_type );
+			}
 		}
 		$query = $this->db->get ();
 		return $query;
@@ -168,10 +172,12 @@ 
 		}
 		$this->db->where_in ( $key, $where_in );
 		$this->db->order_by ( $order_by, $order_type );
-		if ($paging_limit)
-			$this->db->limit ( $paging_limit, $start_limit );
-		if (! empty ( $groupby ))
-			$this->db->groupby ( $groupby );
+		if ($paging_limit) {
+					$this->db->limit ( $paging_limit, $start_limit );
+		}
+		if (! empty ( $groupby )) {
+					$this->db->groupby ( $groupby );
+		}
 		$query = $this->db->get ();
 		
 		return $query;
@@ -267,8 +273,9 @@ 
 		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
 			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
 		} else {
-			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+			if ($order_by) {
+							$this->db->order_by ( $order_by, $order_type );
+			}
 		}
 		
 		if ($group_by != '') {
@@ -316,8 +323,9 @@ 
 		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
 			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
 		} else {
-			if ($order_by)
-				$this->db->order_by ( $order_by, $order_type );
+			if ($order_by) {
+							$this->db->order_by ( $order_by, $order_type );
+			}
 		}
 		
 		if ($group_by != '') {
@@ -741,20 +749,23 @@ 
 							if (array_key_exists ( $key . "-integer", $value )) {
 								$string = null;
 								$string = $this->build_interger_where ( $key, $value [$key . "-integer"], $value [$key] );
-								if ($string)
-									$where .= "$string AND ";
+								if ($string) {
+																	$where .= "$string AND ";
+								}
 							}
 							if (array_key_exists ( $key . "-string", $value )) {
 								$string = null;
 								$string = $this->build_string_where ( $key, $value [$key . "-string"], $value [$key] );
-								if ($string)
-									$where .= "$string AND ";
+								if ($string) {
+																	$where .= "$string AND ";
+								}
 							}
 							if ($key == 'callstart' || $key == 'date' || $key == 'log_time') {
 								$string = null;
 								$string = $this->build_date_where ( $key, $value );
-								if ($string)
-									$where .= "$string AND ";
+								if ($string) {
+																	$where .= "$string AND ";
+								}
 							}
 						} else {
 							$where .= "$key = '$value'AND ";
@@ -838,14 +849,16 @@ 
 			if (! empty ( $value [0] )) {
 				$string = null;
 				$string = "$field >= '$value[0]'";
-				if ($string)
-					$where .= $string . " AND ";
+				if ($string) {
+									$where .= $string . " AND ";
+				}
 			}
 			if (! empty ( $value [1] )) {
 				$string = null;
 				$string = "$field <= '$value[1]'";
-				if ($string)
-					$where .= $string . " AND ";
+				if ($string) {
+									$where .= $string . " AND ";
+				}
 			}
 		}
 		if ($where) {

web_interface/astpp/application/models/common_model.php

Spacing +113 added lines, -113 removed lines

@@ -29,32 +29,32 @@ 
 	var $conn = false;
 	public static $global_config;
 	function Common_model() {
-		parent::__construct ();
-		$this->get_system_config ();
-		$this->get_currencylist ();
-		$this->get_language_list ();
-		$this->get_country_list ();
-		$this->get_admin_info ();
-		$this->load->library ( 'astpp/common' );
-		$this->db->query ( 'SET time_zone = "+00:00"' );
+		parent::__construct();
+		$this->get_system_config();
+		$this->get_currencylist();
+		$this->get_language_list();
+		$this->get_country_list();
+		$this->get_admin_info();
+		$this->load->library('astpp/common');
+		$this->db->query('SET time_zone = "+00:00"');
 	}
 	function get_language_list() {
-		$query = $this->db->get ( "language" );
-		$result = $query->result_array ();
-		$language_list = array ();
-		foreach ( $result as $row ) {
+		$query = $this->db->get("language");
+		$result = $query->result_array();
+		$language_list = array();
+		foreach ($result as $row) {
 			$language_list [$row ['language']] = $row ['languagename'];
 		}
 		self::$global_config ['language_list'] = $language_list;
 		return $language_list;
 	}
 	function get_system_config() {
-		$query = $this->db->get ( "system" );
-		$config = array ();
-		$result = $query->result_array ();
-		foreach ( $result as $row ) {
+		$query = $this->db->get("system");
+		$config = array();
+		$result = $query->result_array();
+		foreach ($result as $row) {
 			if ($row ['name'] == 'decimal_points' || $row ['name'] == 'starting_digit' || $row ['name'] == 'card_length' || $row ['name'] == 'pin_length') {
-				$row ['name'] = str_replace ( "_", "", $row ['name'] );
+				$row ['name'] = str_replace("_", "", $row ['name']);
 			}
 			$config [$row ['name']] = $row ['value'];
 		}
@@ -62,10 +62,10 @@ 
 		return $config;
 	}
 	function get_country_list() {
-		$query = $this->db->get ( "countrycode" );
-		$result = $query->result_array ();
-		$country_list = array ();
-		foreach ( $result as $row ) {
+		$query = $this->db->get("countrycode");
+		$result = $query->result_array();
+		$country_list = array();
+		foreach ($result as $row) {
 			$country_list [$row ['id']] = $row ['country'];
 		}
 		self::$global_config ['country_list'] = $country_list;
@@ -74,20 +74,20 @@ 
 	
 	// Return list of currency with rate
 	function get_currencylist() {
-		$query = $this->db->get ( "currency" );
-		$currencylist = array ();
-		$result = $query->result_array ();
-		foreach ( $result as $row ) {
+		$query = $this->db->get("currency");
+		$currencylist = array();
+		$result = $query->result_array();
+		foreach ($result as $row) {
 			$currencylist [$row ['currency']] = $row ['currencyrate'];
 		}
 		self::$global_config ['currency_list'] = $currencylist;
 		return $currencylist;
 	}
 	function get_admin_info() {
-		$result = $this->db->get_where ( 'accounts', array (
+		$result = $this->db->get_where('accounts', array(
 				'type' => '-1' 
-		) );
-		$result = $result->result_array ();
+		));
+		$result = $result->result_array();
 		self::$global_config ['admin_info'] = $result [0];
 		return $result [0];
 	}
@@ -96,15 +96,15 @@ 
 	 * Changes for invoices
 	 */
 	function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
-		$amount = str_replace ( ',', '', $amount );
-		$invoice_data = array (
+		$amount = str_replace(',', '', $amount);
+		$invoice_data = array(
 				"accountid" => $accountid,
 				"invoice_prefix" => $invoice_prefix,
 				"invoiceid" => $last_invoice_ID,
 				"reseller_id" => $accountinfo ['reseller_id'],
-				"invoice_date" => gmdate ( "Y-m-d H:i:s" ),
-				"from_date" => gmdate ( "Y-m-d H:i:s" ),
-				"to_date" => gmdate ( "Y-m-d H:i:s" ),
+				"invoice_date" => gmdate("Y-m-d H:i:s"),
+				"from_date" => gmdate("Y-m-d H:i:s"),
+				"to_date" => gmdate("Y-m-d H:i:s"),
 				"due_date" => $due_date,
 				"status" => 1,
 				"balance" => $accountinfo ['balance'],
@@ -112,26 +112,26 @@ 
 				"type" => 'R',
 				"confirm" => '1' 
 		);
-		$this->db->insert ( "invoices", $invoice_data );
-		return $this->db->insert_id ();
+		$this->db->insert("invoices", $invoice_data);
+		return $this->db->insert_id();
 	}
 	function calculate_currency($amount = 0, $from_currency = '', $to_currency = '', $format_currency = true, $append_currency = true) {
 		$from_currency = ($from_currency == '') ? self::$global_config ['system_config'] ['base_currency'] : $from_currency;
 		
 		if ($to_currency == '') {
 			$to_currency1 = $this->session->userdata ['accountinfo'] ['currency_id'];
-			$to_currency = $this->common->get_field_name ( 'currency', 'currency', $to_currency1 );
+			$to_currency = $this->common->get_field_name('currency', 'currency', $to_currency1);
 		}
 		$from_cur_rate = (self::$global_config ['currency_list'] [$from_currency] > 0) ? self::$global_config ['currency_list'] [$from_currency] : 1;
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
-		$amount = str_replace ( ',', '', $amount );
+		$amount = str_replace(',', '', $amount);
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
 		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
+			$cal_amount = $this->format_currency($cal_amount);
 		if ($append_currency) {
-			$cal_amount = $cal_amount . " " . $to_currency;
+			$cal_amount = $cal_amount." ".$to_currency;
 		}
-		$cal_amount = str_replace ( ',', '', $cal_amount );
+		$cal_amount = str_replace(',', '', $cal_amount);
 		return $cal_amount;
 	}
 	function calculate_currency_customer($amount = 0, $from_currency = '', $to_currency = '', $format_currency = true, $append_currency = true) {
@@ -139,24 +139,24 @@ 
 		
 		if ($to_currency == '') {
 			$to_currency1 = $this->session->userdata ['accountinfo'] ['currency_id'];
-			$to_currency = $this->common->get_field_name ( 'currency', 'currency', $to_currency1 );
+			$to_currency = $this->common->get_field_name('currency', 'currency', $to_currency1);
 		}
 		$from_cur_rate = (self::$global_config ['currency_list'] [$from_currency] > 0) ? self::$global_config ['currency_list'] [$from_currency] : 1;
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
-		$amount = str_replace ( ',', '', $amount );
+		$amount = str_replace(',', '', $amount);
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
 		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
+			$cal_amount = $this->format_currency($cal_amount);
 		if ($append_currency)
 			$cal_amount = $cal_amount;
-		$cal_amount = str_replace ( ',', '', $cal_amount );
+		$cal_amount = str_replace(',', '', $cal_amount);
 		return $cal_amount;
 	}
 	function add_calculate_currency($amount = 0, $from_currency = '', $to_currency = '', $format_currency = true, $append_currency = true) {
-		$amount = str_replace ( ',', '', $amount );
+		$amount = str_replace(',', '', $amount);
 		if ($from_currency == '') {
 			$from_currency1 = $this->session->userdata ['accountinfo'] ['currency_id'];
-			$from_currency = $this->common->get_field_name ( 'currency', 'currency', $from_currency1 );
+			$from_currency = $this->common->get_field_name('currency', 'currency', $from_currency1);
 		}
 		$to_currency = ($to_currency == '') ? self::$global_config ['system_config'] ['base_currency'] : $to_currency;
 		if (self::$global_config ['currency_list'] [$from_currency] > 0) {
@@ -165,54 +165,54 @@ 
 			$cal_amount = $amount;
 		}
 		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
+			$cal_amount = $this->format_currency($cal_amount);
 		if ($append_currency)
-			$cal_amount = $cal_amount . " " . $to_currency;
-		$cal_amount = str_replace ( ',', '', $cal_amount );
+			$cal_amount = $cal_amount." ".$to_currency;
+		$cal_amount = str_replace(',', '', $cal_amount);
 		return $cal_amount;
 	}
 	function to_calculate_currency($amount = 0, $from_currency = '', $to_currency = '', $format_currency = true, $append_currency = true) {
 		if ($to_currency == '') {
 			$to_currency1 = $this->session->userdata ['accountinfo'] ['currency_id'];
-			$to_currency = $this->common->get_field_name ( 'currency', 'currency', $to_currency1 );
+			$to_currency = $this->common->get_field_name('currency', 'currency', $to_currency1);
 		}
 		$from_currency = ($from_currency == '') ? self::$global_config ['system_config'] ['base_currency'] : $from_currency;
 		
 		$from_cur_rate = (self::$global_config ['currency_list'] [$from_currency] > 0) ? self::$global_config ['currency_list'] [$from_currency] : 1;
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
-		$amount = str_replace ( ',', '', $amount );
+		$amount = str_replace(',', '', $amount);
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
 		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
+			$cal_amount = $this->format_currency($cal_amount);
 		if ($append_currency)
-			$cal_amount = $cal_amount . " " . $to_currency;
-		$cal_amount = str_replace ( ',', '', $cal_amount );
+			$cal_amount = $cal_amount." ".$to_currency;
+		$cal_amount = str_replace(',', '', $cal_amount);
 		return $cal_amount;
 	}
 	function format_currency($amount) {
-		$amount = str_replace ( ',', '', $amount );
-		return number_format ( $amount, Common_model::$global_config ['system_config'] ['decimalpoints'] );
+		$amount = str_replace(',', '', $amount);
+		return number_format($amount, Common_model::$global_config ['system_config'] ['decimalpoints']);
 		// return $amount;
 	}
 	function money_format($format, $number) {
-		$regex = '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?' . '(?:#([0-9]+))?(?:\.([0-9]+))?([in%])/';
-		if (setlocale ( LC_MONETARY, 0 ) == 'C') {
-			setlocale ( LC_MONETARY, '' );
+		$regex = '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?'.'(?:#([0-9]+))?(?:\.([0-9]+))?([in%])/';
+		if (setlocale(LC_MONETARY, 0) == 'C') {
+			setlocale(LC_MONETARY, '');
 		}
-		$locale = localeconv ();
-		preg_match_all ( $regex, $format, $matches, PREG_SET_ORDER );
-		foreach ( $matches as $fmatch ) {
-			$value = floatval ( $number );
-			$flags = array (
-					'fillchar' => preg_match ( '/\=(.)/', $fmatch [1], $match ) ? $match [1] : ' ',
-					'nogroup' => preg_match ( '/\^/', $fmatch [1] ) > 0,
-					'usesignal' => preg_match ( '/\+|\(/', $fmatch [1], $match ) ? $match [0] : '+',
-					'nosimbol' => preg_match ( '/\!/', $fmatch [1] ) > 0,
-					'isleft' => preg_match ( '/\-/', $fmatch [1] ) > 0 
+		$locale = localeconv();
+		preg_match_all($regex, $format, $matches, PREG_SET_ORDER);
+		foreach ($matches as $fmatch) {
+			$value = floatval($number);
+			$flags = array(
+					'fillchar' => preg_match('/\=(.)/', $fmatch [1], $match) ? $match [1] : ' ',
+					'nogroup' => preg_match('/\^/', $fmatch [1]) > 0,
+					'usesignal' => preg_match('/\+|\(/', $fmatch [1], $match) ? $match [0] : '+',
+					'nosimbol' => preg_match('/\!/', $fmatch [1]) > 0,
+					'isleft' => preg_match('/\-/', $fmatch [1]) > 0 
 			);
-			$width = trim ( $fmatch [2] ) ? ( int ) $fmatch [2] : 0;
-			$left = trim ( $fmatch [3] ) ? ( int ) $fmatch [3] : 0;
-			$right = trim ( $fmatch [4] ) ? ( int ) $fmatch [4] : $locale ['int_frac_digits'];
+			$width = trim($fmatch [2]) ? (int)$fmatch [2] : 0;
+			$left = trim($fmatch [3]) ? (int)$fmatch [3] : 0;
+			$right = trim($fmatch [4]) ? (int)$fmatch [4] : $locale ['int_frac_digits'];
 			$conversion = $fmatch [5];
 			
 			$positive = true;
@@ -244,53 +244,53 @@ 
 					$suffix = ')';
 					break;
 			}
-			if (! $flags ['nosimbol']) {
-				$currency = $cprefix . ($conversion == 'i' ? $locale ['int_curr_symbol'] : $locale ['currency_symbol']) . $csuffix;
+			if ( ! $flags ['nosimbol']) {
+				$currency = $cprefix.($conversion == 'i' ? $locale ['int_curr_symbol'] : $locale ['currency_symbol']).$csuffix;
 			} else {
 				$currency = '';
 			}
 			$space = $locale ["{$letter}_sep_by_space"] ? ' ' : '';
 			
-			$value = number_format ( $value, $right, $locale ['mon_decimal_point'], $flags ['nogroup'] ? '' : $locale ['mon_thousands_sep'] );
-			$value = @explode ( $locale ['mon_decimal_point'], $value );
+			$value = number_format($value, $right, $locale ['mon_decimal_point'], $flags ['nogroup'] ? '' : $locale ['mon_thousands_sep']);
+			$value = @explode($locale ['mon_decimal_point'], $value);
 			
-			$n = strlen ( $prefix ) + strlen ( $currency ) + strlen ( $value [0] );
+			$n = strlen($prefix) + strlen($currency) + strlen($value [0]);
 			if ($left > 0 && $left > $n) {
-				$value [0] = str_repeat ( $flags ['fillchar'], $left - $n ) . $value [0];
+				$value [0] = str_repeat($flags ['fillchar'], $left - $n).$value [0];
 			}
-			$value = implode ( $locale ['mon_decimal_point'], $value );
+			$value = implode($locale ['mon_decimal_point'], $value);
 			if ($locale ["{$letter}_cs_precedes"]) {
-				$value = $prefix . $currency . $space . $value . $suffix;
+				$value = $prefix.$currency.$space.$value.$suffix;
 			} else {
-				$value = $prefix . $value . $space . $currency . $suffix;
+				$value = $prefix.$value.$space.$currency.$suffix;
 			}
 			if ($width > 0) {
-				$value = str_pad ( $value, $width, $flags ['fillchar'], $flags ['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT );
+				$value = str_pad($value, $width, $flags ['fillchar'], $flags ['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT);
 			}
 			
-			$format = str_replace ( $fmatch [0], $value, $format );
+			$format = str_replace($fmatch [0], $value, $format);
 		}
 		return $format;
 	}
 	function get_list_taxes() {
-		$this->db->select ( 'id,taxes_description' );
-		$query = $this->db->get ( "taxes" );
-		$taxesList = array ();
-		if ($query->num_rows () > 0) {
-			return $query->result ();
+		$this->db->select('id,taxes_description');
+		$query = $this->db->get("taxes");
+		$taxesList = array();
+		if ($query->num_rows() > 0) {
+			return $query->result();
 		}
 	}
 	function get_params($table_name, $select, $where) {
-		if (is_array ( $select )) {
+		if (is_array($select)) {
 		} else {
-			$this->db->select ( $select );
+			$this->db->select($select);
 		}
-		if (is_array ( $where )) {
+		if (is_array($where)) {
 		} else {
-			$this->db->where ( $where );
+			$this->db->where($where);
 		}
-		$query = $this->db->get ( $table_name );
-		$query = $query->result ();
+		$query = $this->db->get($table_name);
+		$query = $query->result();
 		return $query;
 	}
 	/*
@@ -298,11 +298,11 @@ 
 	 * Using for Payment Functionality from Admin/Reseller Login
 	 */
 	function get_parent_info($accountid) {
-		$this->db->where ( 'id', $accountid );
-		$this->db->select ( 'reseller_id,type' );
-		$account_result = $this->db->get ( 'accounts' );
-		$account_result = ( array ) $account_result->first_row ();
-		if (isset ( $account_result ['reseller_id'] ) && $account_result ['reseller_id'] > 0) {
+		$this->db->where('id', $accountid);
+		$this->db->select('reseller_id,type');
+		$account_result = $this->db->get('accounts');
+		$account_result = (array)$account_result->first_row();
+		if (isset ($account_result ['reseller_id']) && $account_result ['reseller_id'] > 0) {
 			return $account_result ['reseller_id'];
 		} else {
 			return '0';
@@ -310,31 +310,31 @@ 
 	}
 	function apply_invoice_taxes($invoiceid, $account, $start_date) {
 		$tax_priority = "";
-		$where = array (
+		$where = array(
 				"accountid" => $account ['id'] 
 		);
-		$accounttax_query = $this->db_model->getSelectWithOrder ( "*", "taxes_to_accounts", $where, "ASC", "taxes_priority" );
+		$accounttax_query = $this->db_model->getSelectWithOrder("*", "taxes_to_accounts", $where, "ASC", "taxes_priority");
 		if ($accounttax_query->num_rows > 0) {
-			$accounttax_query = $accounttax_query->result_array ();
-			foreach ( $accounttax_query as $tax_value ) {
-				$taxes_info = $this->db->get_where ( 'taxes', array (
+			$accounttax_query = $accounttax_query->result_array();
+			foreach ($accounttax_query as $tax_value) {
+				$taxes_info = $this->db->get_where('taxes', array(
 						'id' => $tax_value ['taxes_id'] 
-				) );
-				if ($taxes_info->num_rows () > 0) {
-					$tax_value = $taxes_info->result_array ();
+				));
+				if ($taxes_info->num_rows() > 0) {
+					$tax_value = $taxes_info->result_array();
 					$tax_value = $tax_value [0];
 					if ($tax_value ["taxes_priority"] == "") {
 						$tax_priority = $tax_value ["taxes_priority"];
 					} else if ($tax_value ["taxes_priority"] > $tax_priority) {
-						$query = $this->db_model->getSelect ( "SUM(debit) as total", "invoice_details", array (
+						$query = $this->db_model->getSelect("SUM(debit) as total", "invoice_details", array(
 								"invoiceid" => $invoiceid 
-						) );
-						$query = $query->result_array ();
+						));
+						$query = $query->result_array();
 						$sub_total = $query ["0"] ["total"];
 					}
 					$tax_total = (($sub_total * ($tax_value ['taxes_rate'] / 100)) + $tax_value ['taxes_amount']);
-					$tax_total = round ( $tax_total, self::$global_config ['system_config'] ['decimalpoints'] );
-					$tax_array = array (
+					$tax_total = round($tax_total, self::$global_config ['system_config'] ['decimalpoints']);
+					$tax_array = array(
 							"accountid" => $account ['id'],
 							"reseller_id" => $account ['reseller_id'],
 							"invoiceid" => $invoiceid,
@@ -345,7 +345,7 @@ 
 							"item_type" => "TAX",
 							"created_date" => $start_date 
 					);
-					$this->db->insert ( "invoice_details", $tax_array );
+					$this->db->insert("invoice_details", $tax_array);
 				}
 			}
 		}

Braces +21 added lines, -14 removed lines

@@ -126,8 +126,9 @@ 
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
 		$amount = str_replace ( ',', '', $amount );
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
-		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
+		if ($format_currency) {
+					$cal_amount = $this->format_currency ( $cal_amount );
+		}
 		if ($append_currency) {
 			$cal_amount = $cal_amount . " " . $to_currency;
 		}
@@ -145,10 +146,12 @@ 
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
 		$amount = str_replace ( ',', '', $amount );
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
-		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
-		if ($append_currency)
-			$cal_amount = $cal_amount;
+		if ($format_currency) {
+					$cal_amount = $this->format_currency ( $cal_amount );
+		}
+		if ($append_currency) {
+					$cal_amount = $cal_amount;
+		}
 		$cal_amount = str_replace ( ',', '', $cal_amount );
 		return $cal_amount;
 	}
@@ -164,10 +167,12 @@ 
 		} else {
 			$cal_amount = $amount;
 		}
-		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
-		if ($append_currency)
-			$cal_amount = $cal_amount . " " . $to_currency;
+		if ($format_currency) {
+					$cal_amount = $this->format_currency ( $cal_amount );
+		}
+		if ($append_currency) {
+					$cal_amount = $cal_amount . " " . $to_currency;
+		}
 		$cal_amount = str_replace ( ',', '', $cal_amount );
 		return $cal_amount;
 	}
@@ -182,10 +187,12 @@ 
 		$to_cur_rate = (self::$global_config ['currency_list'] [$to_currency]) ? self::$global_config ['currency_list'] [$to_currency] : 1;
 		$amount = str_replace ( ',', '', $amount );
 		$cal_amount = ($amount * $to_cur_rate) / $from_cur_rate;
-		if ($format_currency)
-			$cal_amount = $this->format_currency ( $cal_amount );
-		if ($append_currency)
-			$cal_amount = $cal_amount . " " . $to_currency;
+		if ($format_currency) {
+					$cal_amount = $this->format_currency ( $cal_amount );
+		}
+		if ($append_currency) {
+					$cal_amount = $cal_amount . " " . $to_currency;
+		}
 		$cal_amount = str_replace ( ',', '', $cal_amount );
 		return $cal_amount;
 	}

web_interface/astpp/application/models/astpp_common.php

Spacing +43 added lines, -43 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return Usermodel
 	 */
 	function Astpp_common() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	/**
 	 * -------Here we write code for model astpp_common_model functions list_applyable_charges------
@@ -39,23 +39,23 @@ 
 	 * @return return array of applyable chargelist.
 	 */
 	function list_applyable_charges($accountid = '') {
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
+		$accountinfo = $this->session->userdata('accountinfo');
 		$reseller_id = $accountinfo ['type'] == 1 ? $accountinfo ['id'] : 0;
 		$q = " SELECT * FROM `charges` where reseller_id =$reseller_id and id NOT IN(select charge_id from charge_to_account where accountid  =$accountid) AND pricelist_id = '0'";
-		$item_arr = array ();
-		$query = $this->db->query ( $q );
-		if ($query->num_rows () > 0) {
-			foreach ( $query->result_array () as $row ) {
+		$item_arr = array();
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			foreach ($query->result_array() as $row) {
 				if ($row ['charge'] > 0) {
-					$row ['charge'] = $this->common_model->calculate_currency ( $row ['charge'] );
+					$row ['charge'] = $this->common_model->calculate_currency($row ['charge']);
 				}
-				$item_arr [$row ['id']] = $row ['description'] . ' - ' . $row ['charge'];
+				$item_arr [$row ['id']] = $row ['description'].' - '.$row ['charge'];
 			}
 		}
 		return $item_arr;
 	}
 	function quote($inp) {
-		return "'" . $this->db->escape_str ( $inp ) . "'";
+		return "'".$this->db->escape_str($inp)."'";
 	}
 	
 	/**
@@ -64,10 +64,10 @@ 
 	 * @param string $colname        	
 	 */
 	function db_get_item($q, $colname) {
-		$item_arr = array ();
-		$query = $this->db->query ( $q );
-		if ($query->num_rows () > 0) {
-			$row = $query->row_array ();
+		$item_arr = array();
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
 			return $row [$colname];
 		}
 		return '';
@@ -75,24 +75,24 @@ 
 	// Return the balance for a specific ASTPP account.
 	function accountbalance($account) {
 		$debit = 0;
-		$q = "SELECT SUM(debit) as val1 FROM cdrs WHERE accountid=" . $this->quote ( $account ) . " AND status NOT IN (1, 2)";
-		$query = $this->db->query ( $q );
-		if ($query->num_rows () > 0) {
-			$row = $query->row_array ();
+		$q = "SELECT SUM(debit) as val1 FROM cdrs WHERE accountid=".$this->quote($account)." AND status NOT IN (1, 2)";
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
 			$debit = $row ['val1'];
 		}
 		$credit = 0;
-		$q = "SELECT SUM(credit) as val1  FROM cdrs WHERE accountid= " . $this->quote ( $account ) . " AND status NOT IN (1, 2)";
-		$query = $this->db->query ( $q );
-		if ($query->num_rows () > 0) {
-			$row = $query->row_array ();
+		$q = "SELECT SUM(credit) as val1  FROM cdrs WHERE accountid= ".$this->quote($account)." AND status NOT IN (1, 2)";
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
 			$credit = $row ['val1'];
 		}
 		$posted_balance = 0;
-		$q = "SELECT * FROM accounts WHERE id = " . $this->quote ( $account );
-		$query = $this->db->query ( $q );
-		if ($query->num_rows () > 0) {
-			$row = $query->row_array ();
+		$q = "SELECT * FROM accounts WHERE id = ".$this->quote($account);
+		$query = $this->db->query($q);
+		if ($query->num_rows() > 0) {
+			$row = $query->row_array();
 			$posted_balance = $row ['balance'];
 		}
 		$balance = ($debit - $credit + $posted_balance);
@@ -103,47 +103,47 @@ 
 		$credit = 0;
 		if ($reseller == "") {
 			$q = "SELECT SUM(debit) as val1 FROM cdrs WHERE status NOT IN (1, 2)";
-			$debit = $this->db_get_item ( $q, 'val1' );
+			$debit = $this->db_get_item($q, 'val1');
 			
 			$q = "SELECT SUM(credit)  as val1 FROM cdrs WHERE status NOT IN (1, 2)";
-			$credit = $this->db_get_item ( $q, 'val1' );
+			$credit = $this->db_get_item($q, 'val1');
 			
 			$tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ''";
 		} else {
-			$tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = " . $this->quote ( $reseller );
+			$tmp = "SELECT SUM(balance) as val1 FROM accounts WHERE reseller_id = ".$this->quote($reseller);
 		}
-		$posted_balance = $this->db_get_item ( $tmp, "val1" );
+		$posted_balance = $this->db_get_item($tmp, "val1");
 		
 		$balance = ($debit - $credit + $posted_balance);
 		return $balance;
 	}
 	function count_dids($test) {
-		$tmp = "SELECT COUNT(*) as val1 FROM dids " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM dids ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 	function count_callingcards($where, $field = 'COUNT(*)') {
-		$tmp = "SELECT $field as val FROM callingcards " . $where;
-		return $this->db_get_item ( $tmp, 'val' );
+		$tmp = "SELECT $field as val FROM callingcards ".$where;
+		return $this->db_get_item($tmp, 'val');
 	}
 	function count_accounts($test) {
-		$tmp = "SELECT COUNT(*) as val1 FROM accounts " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM accounts ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 	function count_rategroup($test) {
-		$tmp = "SELECT COUNT(*) as val1 FROM pricelists " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM pricelists ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 	function count_termination($test = '') {
-		$tmp = "SELECT COUNT(*) as val1 FROM outbound_routes " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM outbound_routes ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 	function count_trunk($test = '') {
-		$tmp = "SELECT COUNT(*) as val1 FROM trunks " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM trunks ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 	function count_origination($test = '') {
-		$tmp = "SELECT COUNT(*) as val1 FROM routes " . $test;
-		return $this->db_get_item ( $tmp, 'val1' );
+		$tmp = "SELECT COUNT(*) as val1 FROM routes ".$test;
+		return $this->db_get_item($tmp, 'val1');
 	}
 }
 ?>

web_interface/astpp/application/models/system_model.php

Spacing +156 added lines, -156 removed lines

@@ -22,436 +22,436 @@
 // ##############################################################################
 class System_model extends CI_Model {
 	function System_model() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	function add_config($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Configuration";
 		$data ['action'] = "Add Item";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		return $this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		return $this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function edit_config($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Configuration";
 		$data ['action'] = "Save Item";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		return $this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		return $this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function get_config_by_id($id) {
-		$this->db->where ( "id", $id );
-		$query = $this->db->get ( "system" );
+		$this->db->where("id", $id);
+		$query = $this->db->get("system");
 		
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
+		if ($query->num_rows() > 0)
+			return $query->row_array();
 		else
 			return false;
 	}
 	function remove_config($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Configuration";
 		$data ['action'] = "Delete";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		return $this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		return $this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function add_tax($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Taxes";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		$this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		$this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function edit_tax($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Taxes";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		$this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		$this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function get_tax_by_id($id) {
-		$this->db->where ( "taxes_id", $id );
-		$query = $this->db->get ( "taxes" );
+		$this->db->where("taxes_id", $id);
+		$query = $this->db->get("taxes");
 		
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
+		if ($query->num_rows() > 0)
+			return $query->row_array();
 		else
 			return false;
 	}
 	function remove_tax($data) {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Taxes";
 		$data ['action'] = "Delete";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		$this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		$this->curl->sendRequestToPerlScript($url, $data);
 	}
 	function purge_deactivated_records() {
-		$this->load->library ( "curl" );
+		$this->load->library("curl");
 		$url = "astpp-wraper.cgi";
 		$data ['mode'] = "Purge Deactivated";
 		$data ['action'] = "Yes, Drop Them";
-		$data ['logintype'] = $this->session->userdata ( 'logintype' );
-		$data ['username'] = $this->session->userdata ( 'username' );
-		$feedback = $this->curl->sendRequestToPerlScript ( $url, $data );
+		$data ['logintype'] = $this->session->userdata('logintype');
+		$data ['username'] = $this->session->userdata('username');
+		$feedback = $this->curl->sendRequestToPerlScript($url, $data);
 		
-		return $feedback = str_replace ( ".", ".<br />", $feedback );
+		return $feedback = str_replace(".", ".<br />", $feedback);
 	}
 	function getTaxesCount() {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
+		if ($this->session->userdata('advance_search') == 1) {
 			
-			$taxes_search = $this->session->userdata ( 'taxes_search' );
+			$taxes_search = $this->session->userdata('taxes_search');
 			
 			$amount_operator = $taxes_search ['amount_operator'];
 			
-			if (! empty ( $taxes_search ['amount'] )) {
+			if ( ! empty ($taxes_search ['amount'])) {
 				switch ($amount_operator) {
 					case "1" :
-						$this->db->where ( 'taxes_amount ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount ', $taxes_search ['amount']);
 						break;
 					case "2" :
-						$this->db->where ( 'taxes_amount <>', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount <>', $taxes_search ['amount']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_amount > ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount > ', $taxes_search ['amount']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_amount < ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount < ', $taxes_search ['amount']);
 						break;
 					case "5" :
-						$this->db->where ( 'taxes_amount >= ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount >= ', $taxes_search ['amount']);
 						break;
 					case "6" :
-						$this->db->where ( 'taxes_amount <= ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount <= ', $taxes_search ['amount']);
 						break;
 				}
 			}
 			
 			$rate_operator = $taxes_search ['rate_operator'];
 			
-			if (! empty ( $taxes_search ['rate'] )) {
+			if ( ! empty ($taxes_search ['rate'])) {
 				switch ($rate_operator) {
 					case "1" :
-						$this->db->where ( 'taxes_rate ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate ', $taxes_search ['rate']);
 						break;
 					case "2" :
-						$this->db->where ( 'taxes_rate <>', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate <>', $taxes_search ['rate']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_rate > ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate > ', $taxes_search ['rate']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_rate < ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate < ', $taxes_search ['rate']);
 						break;
 					case "5" :
-						$this->db->where ( 'taxes_rate >= ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate >= ', $taxes_search ['rate']);
 						break;
 					case "6" :
-						$this->db->where ( 'taxes_rate <= ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate <= ', $taxes_search ['rate']);
 						break;
 				}
 			}
 			
 			$description_operator = $taxes_search ['description_operator'];
-			if (! empty ( $taxes_search ['description'] )) {
+			if ( ! empty ($taxes_search ['description'])) {
 				switch ($description_operator) {
 					case "1" :
-						$this->db->like ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->like('taxes_description', $taxes_search ['description']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->not_like('taxes_description', $taxes_search ['description']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->where('taxes_description', $taxes_search ['description']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_description <>', $taxes_search ['description'] );
+						$this->db->where('taxes_description <>', $taxes_search ['description']);
 						break;
 				}
 			}
 		}
-		$this->db->from ( 'taxes' );
-		$providercnt = $this->db->count_all_results ();
+		$this->db->from('taxes');
+		$providercnt = $this->db->count_all_results();
 		return $providercnt;
 	}
 	function getTaxesList($start, $limit) {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
+		if ($this->session->userdata('advance_search') == 1) {
 			
-			$taxes_search = $this->session->userdata ( 'taxes_search' );
+			$taxes_search = $this->session->userdata('taxes_search');
 			
 			$amount_operator = $taxes_search ['amount_operator'];
 			
-			if (! empty ( $taxes_search ['amount'] )) {
+			if ( ! empty ($taxes_search ['amount'])) {
 				switch ($amount_operator) {
 					case "1" :
-						$this->db->where ( 'taxes_amount =', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount =', $taxes_search ['amount']);
 						break;
 					case "2" :
-						$this->db->where ( 'taxes_amount <>', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount <>', $taxes_search ['amount']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_amount > ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount > ', $taxes_search ['amount']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_amount < ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount < ', $taxes_search ['amount']);
 						break;
 					case "5" :
-						$this->db->where ( 'taxes_amount >= ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount >= ', $taxes_search ['amount']);
 						break;
 					case "6" :
-						$this->db->where ( 'taxes_amount <= ', $taxes_search ['amount'] );
+						$this->db->where('taxes_amount <= ', $taxes_search ['amount']);
 						break;
 				}
 			}
 			
 			$rate_operator = $taxes_search ['rate_operator'];
 			
-			if (! empty ( $taxes_search ['rate'] )) {
+			if ( ! empty ($taxes_search ['rate'])) {
 				switch ($rate_operator) {
 					case "1" :
-						$this->db->where ( 'taxes_rate == ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate == ', $taxes_search ['rate']);
 						break;
 					case "2" :
-						$this->db->where ( 'taxes_rate <>', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate <>', $taxes_search ['rate']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_rate > ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate > ', $taxes_search ['rate']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_rate < ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate < ', $taxes_search ['rate']);
 						break;
 					case "5" :
-						$this->db->where ( 'taxes_rate >= ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate >= ', $taxes_search ['rate']);
 						break;
 					case "6" :
-						$this->db->where ( 'taxes_rate <= ', $taxes_search ['rate'] );
+						$this->db->where('taxes_rate <= ', $taxes_search ['rate']);
 						break;
 				}
 			}
 			
 			$description_operator = $taxes_search ['description_operator'];
-			if (! empty ( $taxes_search ['description'] )) {
+			if ( ! empty ($taxes_search ['description'])) {
 				switch ($description_operator) {
 					case "1" :
-						$this->db->like ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->like('taxes_description', $taxes_search ['description']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->not_like('taxes_description', $taxes_search ['description']);
 						break;
 					case "3" :
-						$this->db->where ( 'taxes_description', $taxes_search ['description'] );
+						$this->db->where('taxes_description', $taxes_search ['description']);
 						break;
 					case "4" :
-						$this->db->where ( 'taxes_description <>', $taxes_search ['description'] );
+						$this->db->where('taxes_description <>', $taxes_search ['description']);
 						break;
 				}
 			}
 		}
-		$this->db->limit ( $limit, $start );
-		$this->db->order_by ( "taxes_priority,taxes_description desc" );
-		$this->db->from ( 'taxes' );
-		$query = $this->db->get ();
+		$this->db->limit($limit, $start);
+		$this->db->order_by("taxes_priority,taxes_description desc");
+		$this->db->from('taxes');
+		$query = $this->db->get();
 		// echo $this->db->last_query();
 		return $query;
 	}
 	function getAuthInfo() {
-		$this->db->where ( 'name', 'auth' );
-		$this->db->limit ( 1 );
-		$query = $this->db->get ( 'system' );
-		if ($query->num_rows () > 0) {
-			return $query->result ();
+		$this->db->where('name', 'auth');
+		$this->db->limit(1);
+		$query = $this->db->get('system');
+		if ($query->num_rows() > 0) {
+			return $query->result();
 		}
 	}
 	function get_template_count() {
 		if ($this->session->userdata ['userlevel_logintype'] == 1 || $this->session->userdata ['userlevel_logintype'] == 4 || $this->session->userdata ['userlevel_logintype'] == 5) {
 			$acountid = $this->session->userdata ['accountinfo'] ['accountid'];
-			$this->db->where ( 'accountid', $acountid );
+			$this->db->where('accountid', $acountid);
 		}
-		return $this->db->get ( 'templates' );
+		return $this->db->get('templates');
 	}
 	function get_templates() {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
-			$templatesearch = $this->session->userdata ( 'template_search' );
+		if ($this->session->userdata('advance_search') == 1) {
+			$templatesearch = $this->session->userdata('template_search');
 			$template_name_operator = $templatesearch ['template_name_operator'];
 			
-			if (! empty ( $templatesearch ['template_name'] )) {
+			if ( ! empty ($templatesearch ['template_name'])) {
 				switch ($template_name_operator) {
 					case "1" :
-						$this->db->like ( 'name', $templatesearch ['template_name'] );
+						$this->db->like('name', $templatesearch ['template_name']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'name', $templatesearch ['template_name'] );
+						$this->db->not_like('name', $templatesearch ['template_name']);
 						break;
 					case "3" :
-						$this->db->where ( 'name', $templatesearch ['template_name'] );
+						$this->db->where('name', $templatesearch ['template_name']);
 						break;
 					case "4" :
-						$this->db->where ( 'name <>', $templatesearch ['template_name'] );
+						$this->db->where('name <>', $templatesearch ['template_name']);
 						break;
 				}
 			}
 			
 			$template_subject = $templatesearch ['subject_operator'];
-			if (! empty ( $templatesearch ['subject'] )) {
+			if ( ! empty ($templatesearch ['subject'])) {
 				switch ($template_subject) {
 					case "1" :
-						$this->db->like ( 'subject', $templatesearch ['subject'] );
+						$this->db->like('subject', $templatesearch ['subject']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'subject', $templatesearch ['subject'] );
+						$this->db->not_like('subject', $templatesearch ['subject']);
 						break;
 					case "3" :
-						$this->db->where ( 'subject', $templatesearch ['subject'] );
+						$this->db->where('subject', $templatesearch ['subject']);
 						break;
 					case "4" :
-						$this->db->where ( 'subject <>', $templatesearch ['subject'] );
+						$this->db->where('subject <>', $templatesearch ['subject']);
 						break;
 				}
 			}
 			$template_op = $templatesearch ['template_operator'];
-			if (! empty ( $templatesearch ['template_desc'] )) {
+			if ( ! empty ($templatesearch ['template_desc'])) {
 				
 				switch ($template_op) {
 					case "1" :
-						$this->db->like ( 'template', mysql_real_escape_string ( ($templatesearch ['template_desc']) ) );
+						$this->db->like('template', mysql_real_escape_string(($templatesearch ['template_desc'])));
 						break;
 					case "2" :
-						$this->db->not_like ( 'template', mysql_real_escape_string ( $templatesearch ['template_desc'] ) );
+						$this->db->not_like('template', mysql_real_escape_string($templatesearch ['template_desc']));
 						break;
 					case "3" :
-						$this->db->where ( 'template', mysql_real_escape_string ( $templatesearch ['template_desc'] ) );
+						$this->db->where('template', mysql_real_escape_string($templatesearch ['template_desc']));
 						break;
 					case "4" :
-						$this->db->where ( 'template <>', mysql_real_escape_string ( $templatesearch ['template_desc'] ) );
+						$this->db->where('template <>', mysql_real_escape_string($templatesearch ['template_desc']));
 						break;
 				}
 			}
 			
-			if (! empty ( $templatesearch ['accountid'] )) {
-				$this->db->like ( 'accountid', $templatesearch ['accountid'] );
+			if ( ! empty ($templatesearch ['accountid'])) {
+				$this->db->like('accountid', $templatesearch ['accountid']);
 			}
 		}
 		
 		if ($this->session->userdata ['userlevel_logintype'] == 1 || $this->session->userdata ['userlevel_logintype'] == 4 || $this->session->userdata ['userlevel_logintype'] == 5) {
 			$acountid = $this->session->userdata ['accountinfo'] ['accountid'];
-			$this->db->where ( 'accountid', $acountid );
+			$this->db->where('accountid', $acountid);
 		}
-		return $this->db->get ( 'templates' );
+		return $this->db->get('templates');
 	}
 	function get_template_by_id($id) {
-		$this->db->delete ( 'templates', array (
+		$this->db->delete('templates', array(
 				'id' => $id 
-		) );
+		));
 		return true;
 	}
 	function get_template_by_id_all($id) {
-		$this->db->where ( 'id', $id );
-		$query = $this->db->get ( 'templates' );
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
+		$this->db->where('id', $id);
+		$query = $this->db->get('templates');
+		if ($query->num_rows() > 0)
+			return $query->row_array();
 		else
 			return false;
 	}
 	function edit_template($edit_id, $data) {
-		$updatedata = array (
-				"name" => trim ( $data ['tem_name'] ),
-				"template" => trim ( $data ['template'] ),
-				"subject" => trim ( $data ['subject'] ),
-				"modified_date" => trim ( date ( 'Y-m-d H:i:s' ) ) 
+		$updatedata = array(
+				"name" => trim($data ['tem_name']),
+				"template" => trim($data ['template']),
+				"subject" => trim($data ['subject']),
+				"modified_date" => trim(date('Y-m-d H:i:s')) 
 		);
-		$this->db->where ( 'id', $edit_id );
-		$this->db->update ( 'templates', $updatedata );
+		$this->db->where('id', $edit_id);
+		$this->db->update('templates', $updatedata);
 		return true;
 	}
 	function build_systems_configuration() {
-		if ($this->session->userdata ( 'advance_search' ) == 1) {
-			$configuration_search = $this->session->userdata ( 'configuration_search' );
+		if ($this->session->userdata('advance_search') == 1) {
+			$configuration_search = $this->session->userdata('configuration_search');
 			
-			if (! empty ( $configuration_search ['reseller'] )) {
-				$this->db->where ( 'reseller ', $configuration_search ['reseller'] );
+			if ( ! empty ($configuration_search ['reseller'])) {
+				$this->db->where('reseller ', $configuration_search ['reseller']);
 			}
-			if (! empty ( $configuration_search ['brand'] )) {
-				$this->db->where ( 'brand', $configuration_search ['brand'] );
+			if ( ! empty ($configuration_search ['brand'])) {
+				$this->db->where('brand', $configuration_search ['brand']);
 			}
-			if (! empty ( $configuration_search ['group_title'] )) {
-				$this->db->where ( 'group_title', $configuration_search ['group_title'] );
+			if ( ! empty ($configuration_search ['group_title'])) {
+				$this->db->where('group_title', $configuration_search ['group_title']);
 			}
 			
 			$name_operator = $configuration_search ['name_operator'];
 			
-			if (! empty ( $configuration_search ['name'] )) {
+			if ( ! empty ($configuration_search ['name'])) {
 				switch ($name_operator) {
 					case "1" :
-						$this->db->like ( 'name', $configuration_search ['name'] );
+						$this->db->like('name', $configuration_search ['name']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'name', $configuration_search ['name'] );
+						$this->db->not_like('name', $configuration_search ['name']);
 						break;
 					case "3" :
-						$this->db->where ( 'name', $configuration_search ['name'] );
+						$this->db->where('name', $configuration_search ['name']);
 						break;
 					case "4" :
-						$this->db->where ( 'name <>', $configuration_search ['name'] );
+						$this->db->where('name <>', $configuration_search ['name']);
 						break;
 				}
 			}
 			
 			$value_operator = $configuration_search ['value_operator'];
 			
-			if (! empty ( $configuration_search ['value'] )) {
+			if ( ! empty ($configuration_search ['value'])) {
 				switch ($value_operator) {
 					case "1" :
-						$this->db->like ( 'value', $configuration_search ['value'] );
+						$this->db->like('value', $configuration_search ['value']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'value', $configuration_search ['value'] );
+						$this->db->not_like('value', $configuration_search ['value']);
 						break;
 					case "3" :
-						$this->db->where ( 'value', $configuration_search ['value'] );
+						$this->db->where('value', $configuration_search ['value']);
 						break;
 					case "4" :
-						$this->db->where ( 'value <>', $configuration_search ['value'] );
+						$this->db->where('value <>', $configuration_search ['value']);
 						break;
 				}
 			}
 			
 			$comment_operator = $configuration_search ['comment_operator'];
 			
-			if (! empty ( $configuration_search ['comment'] )) {
+			if ( ! empty ($configuration_search ['comment'])) {
 				switch ($comment_operator) {
 					case "1" :
-						$this->db->like ( 'comment', $configuration_search ['comment'] );
+						$this->db->like('comment', $configuration_search ['comment']);
 						break;
 					case "2" :
-						$this->db->not_like ( 'comment', $configuration_search ['comment'] );
+						$this->db->not_like('comment', $configuration_search ['comment']);
 						break;
 					case "3" :
-						$this->db->where ( 'comment', $configuration_search ['comment'] );
+						$this->db->where('comment', $configuration_search ['comment']);
 						break;
 					case "4" :
-						$this->db->where ( 'comment <>', $configuration_search ['comment'] );
+						$this->db->where('comment <>', $configuration_search ['comment']);
 						break;
 				}
 			}
 		}
 	}
 	function systems_configuration($flag, $start = '', $limit = '') {
-		$this->build_systems_configuration ();
-		$this->db->from ( 'system' );
+		$this->build_systems_configuration();
+		$this->db->from('system');
 		if ($flag) {
-			$this->db->order_by ( "id ASC" );
-			$this->db->limit ( $limit, $start );
-			$query = $this->db->get ();
+			$this->db->order_by("id ASC");
+			$this->db->limit($limit, $start);
+			$query = $this->db->get();
 		} else {
-			$query = $this->db->count_all_results ();
+			$query = $this->db->count_all_results();
 		}
 		return $query;
 	}

Braces +15 added lines, -12 removed lines

@@ -46,10 +46,11 @@ 
 		$this->db->where ( "id", $id );
 		$query = $this->db->get ( "system" );
 		
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
-		else
-			return false;
+		if ($query->num_rows () > 0) {
+					return $query->row_array ();
+		} else {
+					return false;
+		}
 	}
 	function remove_config($data) {
 		$this->load->library ( "curl" );
@@ -80,10 +81,11 @@ 
 		$this->db->where ( "taxes_id", $id );
 		$query = $this->db->get ( "taxes" );
 		
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
-		else
-			return false;
+		if ($query->num_rows () > 0) {
+					return $query->row_array ();
+		} else {
+					return false;
+		}
 	}
 	function remove_tax($data) {
 		$this->load->library ( "curl" );
@@ -355,10 +357,11 @@ 
 	function get_template_by_id_all($id) {
 		$this->db->where ( 'id', $id );
 		$query = $this->db->get ( 'templates' );
-		if ($query->num_rows () > 0)
-			return $query->row_array ();
-		else
-			return false;
+		if ($query->num_rows () > 0) {
+					return $query->row_array ();
+		} else {
+					return false;
+		}
 	}
 	function edit_template($edit_id, $data) {
 		$updatedata = array (