iNextrix / ASTPP

web_interface/astpp/application/modules/systems/views/view_systemconf.php

Indentation +15 added lines, -15 removed lines

@@ -180,25 +180,25 @@
                     <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>

                     <?php foreach($details as$key=>$val){ ?>

                           <?php if($count==$i){

-                              echo '</div><div style="width:50%;float:left;">';

-                              $class="tright";

-                          } ?>

+							  echo '</div><div style="width:50%;float:left;">';

+							  $class="tright";

+						  } ?>

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

                             <div class="<?=$class?>" href='#'>

                             <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>

                             <?php if(method_exists($this->common,$val['field_type'])){

-                                $option_array =  $this->common->$val['field_type'](); 

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

-                                      foreach($option_array as $option_key=>$option_val){

-                                        $selected = ($val['value'] == $option_key)? "selected='selected'":"";

-                                        $drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

-                                      }

-                                $drpstr .= '</select>';

-                                echo $drpstr;

-                                unset($drpstr);

-                            } else{

-                                echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

-                            }?>

+								$option_array =  $this->common->$val['field_type'](); 

+								$drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';

+									  foreach($option_array as $option_key=>$option_val){

+										$selected = ($val['value'] == $option_key)? "selected='selected'":"";

+										$drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

+									  }

+								$drpstr .= '</select>';

+								echo $drpstr;

+								unset($drpstr);

+							} else{

+								echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

+							}?>

                               <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>

 

                             </div>

web_interface/astpp/application/modules/systems/models/system_model.php

Indentation +166 added lines, -166 removed lines

@@ -22,33 +22,33 @@ 
 ###############################################################################
 class System_model extends CI_Model {
 
-    function System_model() {
-        parent::__construct();
-    }
+	function System_model() {
+		parent::__construct();
+	}
 
-    function getsystem_list($flag, $start, $limit) {
+	function getsystem_list($flag, $start, $limit) {
 
-        $this->db_model->build_search('configuration_search');
-        $where = "group_title NOT IN ('asterisk','osc','freepbx')";
-        $this->db->where($where);
-        if ($flag) {
-            $query = $this->db_model->select("*", "system", "", "group_title,name", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "system", "");
-        }
-        return $query;
-    }
+		$this->db_model->build_search('configuration_search');
+		$where = "group_title NOT IN ('asterisk','osc','freepbx')";
+		$this->db->where($where);
+		if ($flag) {
+			$query = $this->db_model->select("*", "system", "", "group_title,name", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "system", "");
+		}
+		return $query;
+	}
 
-    function gettemplate_list($flag="", $start, $limit="") {
+	function gettemplate_list($flag="", $start, $limit="") {
 
          
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $this->db->where('reseller_id',$reseller);
-            $query = $this->db_model->select("*", "default_templates","","","","","");
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$this->db->where('reseller_id',$reseller);
+			$query = $this->db_model->select("*", "default_templates","","","","","");
 
-            if($query->num_rows() >0){
+			if($query->num_rows() >0){
 		$result =$query->result_array();
 		$match_array =array();
 		$unmatch_array= array();
@@ -56,14 +56,14 @@ 
 		$str=0;
 		foreach($result as $value)
 		{
-		    $this->db->where('name',$value['name']);
-		    $this->db->where('reseller_id',0);
-		    $query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
-		    $innerresult =$query->result_array();
-		    foreach($innerresult as $value)
-		    {                   
-		      $str.=$value['id'].",";
-		    }		
+			$this->db->where('name',$value['name']);
+			$this->db->where('reseller_id',0);
+			$query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
+			$innerresult =$query->result_array();
+			foreach($innerresult as $value)
+			{                   
+			  $str.=$value['id'].",";
+			}		
 		}            
 		$str= rtrim($str,',');
 		
@@ -71,164 +71,164 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-            }
-            else
-            {
-               $this->db->where('reseller_id',0);
-            }
+			}
+			else
+			{
+			   $this->db->where('reseller_id',0);
+			}
               
-            if($flag) {
+			if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-	     }else {
+		 }else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
-	     }
+		 }
 	  } 
 	  else {
           
-            $where = array('reseller_id' => 0);
-            $this->db->where($where);
-            $this->db_model->build_search('template_search');
+			$where = array('reseller_id' => 0);
+			$this->db->where($where);
+			$this->db_model->build_search('template_search');
 		if ($flag) {
-		    $query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
+			$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
 		} else {
-		    $query = $this->db_model->countQuery("*", "default_templates","");
+			$query = $this->db_model->countQuery("*", "default_templates","");
 		}
 	  }
 
 	  return $query;
-    }
+	}
  
-    function edit_configuration($add_array, $name) {
-        unset($add_array["action"]);
+	function edit_configuration($add_array, $name) {
+		unset($add_array["action"]);
                         
-        $this->db->where("name", $name);
-        $this->db->update("system", $add_array);
-        if($name == 'base_currency'){
+		$this->db->where("name", $name);
+		$this->db->update("system", $add_array);
+		if($name == 'base_currency'){
             
-            $screen_path = getcwd() . "/cron";
-            $screen_filename = "CurrencyUpdate" . strtotime('now');
-            $command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
-            exec($command);
-            $this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
-        }
-    }
-
-    function edit_template($data, $id) {
-        unset($data["action"]);
-        $data["last_modified_date"] = date("Y-m-d H:i:s");
-        $this->db->where("id", $id);
-        $this->db->update("default_templates", $data);
-    }
-    function edit_resellertemplate($data, $id) {
-        $arraydata = $data;
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-	    $array = $data; 	
-            $data = array('reseller_id' => $reseller);
-            $this->db->where("id", $id);
-        } 
-        unset($arraydata["action"]);
-        unset($arraydata["form"]);
-        unset($arraydata["page_title"]);       
-        $this->db->update("default_templates", $arraydata);
-    }
-    function remove_template($id) {
-        $this->db->where("id", $id);
-        $this->db->update("default_templates", array("status" => 2));
-        return true;
-    }
-    function add_resellertemplate($data)
-    {
-         unset($data["action"]);
-         unset($data['id']);
-         $this->db->insert('default_templates', $data);
-         return true;
-    }
-    function getcountry_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('country_list_search');
-        if ($flag) {
-            $query = $this->db_model->select("*", "countrycode", '', "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "countrycode", '');
-        }
-        return $query;
-    }
-
-    function add_country($add_array) {
-        unset($add_array["action"]);
-        $this->db->insert("countrycode", $add_array);
-        return true;
-    }
-
-     function edit_country($data, $id) {
-        unset($data["action"]);
-        $this->db->where("id", $id);
-        $this->db->update("countrycode", $data);
-    }
-
-    function remove_country($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("countrycode");
-        return true;
-    }
-
-    function getcurrency_list($flag, $start = 0, $limit = 0) {
-         $this->db_model->build_search('currency_list_search');
+			$screen_path = getcwd() . "/cron";
+			$screen_filename = "CurrencyUpdate" . strtotime('now');
+			$command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
+			exec($command);
+			$this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
+		}
+	}
+
+	function edit_template($data, $id) {
+		unset($data["action"]);
+		$data["last_modified_date"] = date("Y-m-d H:i:s");
+		$this->db->where("id", $id);
+		$this->db->update("default_templates", $data);
+	}
+	function edit_resellertemplate($data, $id) {
+		$arraydata = $data;
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+		$array = $data; 	
+			$data = array('reseller_id' => $reseller);
+			$this->db->where("id", $id);
+		} 
+		unset($arraydata["action"]);
+		unset($arraydata["form"]);
+		unset($arraydata["page_title"]);       
+		$this->db->update("default_templates", $arraydata);
+	}
+	function remove_template($id) {
+		$this->db->where("id", $id);
+		$this->db->update("default_templates", array("status" => 2));
+		return true;
+	}
+	function add_resellertemplate($data)
+	{
+		 unset($data["action"]);
+		 unset($data['id']);
+		 $this->db->insert('default_templates', $data);
+		 return true;
+	}
+	function getcountry_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('country_list_search');
+		if ($flag) {
+			$query = $this->db_model->select("*", "countrycode", '', "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "countrycode", '');
+		}
+		return $query;
+	}
+
+	function add_country($add_array) {
+		unset($add_array["action"]);
+		$this->db->insert("countrycode", $add_array);
+		return true;
+	}
+
+	 function edit_country($data, $id) {
+		unset($data["action"]);
+		$this->db->where("id", $id);
+		$this->db->update("countrycode", $data);
+	}
+
+	function remove_country($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("countrycode");
+		return true;
+	}
+
+	function getcurrency_list($flag, $start = 0, $limit = 0) {
+		 $this->db_model->build_search('currency_list_search');
 	
 	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
-        if ($flag) {
-            $query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "currency", $where);
-        }
-        return $query;
-    }
-
-    function add_currency($add_array) {
-        unset($add_array["action"]);
-        $this->db->insert("currency", $add_array);
-        return true;
-    }
-
-     function edit_currency($data, $id) {
-        unset($data["action"]);
-        $this->db->where("id", $id);
-        $this->db->update("currency", $data);
-    }
-
-    function remove_currency($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("currency");
-        return true;
-    }
-    function backup_insert($add_array='')
-    {
+		if ($flag) {
+			$query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "currency", $where);
+		}
+		return $query;
+	}
+
+	function add_currency($add_array) {
+		unset($add_array["action"]);
+		$this->db->insert("currency", $add_array);
+		return true;
+	}
+
+	 function edit_currency($data, $id) {
+		unset($data["action"]);
+		$this->db->where("id", $id);
+		$this->db->update("currency", $data);
+	}
+
+	function remove_currency($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("currency");
+		return true;
+	}
+	function backup_insert($add_array='')
+	{
 	 unset($add_array["action"]);
-        $this->db->insert("backup_database", $add_array);
-        return true;
-    }
-     function getbackup_list($flag, $start, $limit) {
-
-        if ($flag) {
-            $query = $this->db_model->select("*", "backup_database", "", "date", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "backup_database", "");
-        }
-        return $query;
-    }
-    function get_backup_data($id)
-    {
-      $where=array('id'=>$id);
-      $query = $this->db_model->getSelect("*", "backup_database", $where);
-      return $query;
-    }
+		$this->db->insert("backup_database", $add_array);
+		return true;
+	}
+	 function getbackup_list($flag, $start, $limit) {
+
+		if ($flag) {
+			$query = $this->db_model->select("*", "backup_database", "", "date", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "backup_database", "");
+		}
+		return $query;
+	}
+	function get_backup_data($id)
+	{
+	  $where=array('id'=>$id);
+	  $query = $this->db_model->getSelect("*", "backup_database", $where);
+	  return $query;
+	}
    function import_database($filename,$target_path)
-    {
+	{
 		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
-        	return true;
-    }
+			return true;
+	}
 }

web_interface/astpp/application/modules/taxes/controllers/taxes.php

Indentation +124 added lines, -124 removed lines

@@ -22,133 +22,133 @@
 ###############################################################################
 class Taxes extends CI_Controller {
 
-    function Taxes() {
-        parent::__construct();
-
-        $this->load->helper('template_inheritance');
-
-        $this->load->library('session');
-        $this->load->library("taxes_form");
-        $this->load->library('astpp/form');
-        $this->load->model('taxes_model');
-
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
-    }
-
-    function taxes_add() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Create Tax';
-        $data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), '');
-
-        $this->load->view('view_taxes_add_edit', $data);
-    }
-
-    function taxes_edit($edit_id = '') {
-        $data['page_title'] = 'Edit Tax ';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "taxes", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $edit_data['taxes_amount'] = $this->common_model->to_calculate_currency($edit_data['taxes_amount'], '', '', true, false);
-        $data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), $edit_data);
-        $this->load->view('view_taxes_add_edit', $data);
-    }
-
-    function taxes_save() {
-        $add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Tax';
-                if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $add_array['taxes_amount'] = $this->common_model->add_calculate_currency($add_array['taxes_amount'], '', '', false, false);
-                $this->taxes_model->edit_tax($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> $add_array["taxes_description"]." Tax updated successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Add Tax';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $add_array['taxes_amount'] = $this->common_model->add_calculate_currency($add_array['taxes_amount'], '', '', false, false);
-                $this->taxes_model->add_tax($add_array);
-                echo json_encode(array("SUCCESS"=> $add_array["taxes_description"]." Tax added successfully!"));
-                exit;
-            }
-        }
-    }
-
-    function taxes_delete($id) {
+	function Taxes() {
+		parent::__construct();
+
+		$this->load->helper('template_inheritance');
+
+		$this->load->library('session');
+		$this->load->library("taxes_form");
+		$this->load->library('astpp/form');
+		$this->load->model('taxes_model');
+
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . '/astpp/login');
+	}
+
+	function taxes_add() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Create Tax';
+		$data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), '');
+
+		$this->load->view('view_taxes_add_edit', $data);
+	}
+
+	function taxes_edit($edit_id = '') {
+		$data['page_title'] = 'Edit Tax ';
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "taxes", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$edit_data['taxes_amount'] = $this->common_model->to_calculate_currency($edit_data['taxes_amount'], '', '', true, false);
+		$data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), $edit_data);
+		$this->load->view('view_taxes_add_edit', $data);
+	}
+
+	function taxes_save() {
+		$add_array = $this->input->post();
+		$data['form'] = $this->form->build_form($this->taxes_form->get_taxes_form_fields(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Tax';
+				if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$add_array['taxes_amount'] = $this->common_model->add_calculate_currency($add_array['taxes_amount'], '', '', false, false);
+				$this->taxes_model->edit_tax($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> $add_array["taxes_description"]." Tax updated successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Add Tax';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$add_array['taxes_amount'] = $this->common_model->add_calculate_currency($add_array['taxes_amount'], '', '', false, false);
+				$this->taxes_model->add_tax($add_array);
+				echo json_encode(array("SUCCESS"=> $add_array["taxes_description"]." Tax added successfully!"));
+				exit;
+			}
+		}
+	}
+
+	function taxes_delete($id) {
 		$this->db->select('taxes_description');
 		$this->db->where('id',$id);
 		$taxes_name=(array)$this->db->get('taxes')->first_row();
-        $this->taxes_model->remove_taxes($id);
-        $this->session->set_flashdata('astpp_notification', $taxes_name["taxes_description"].' Tax removed successfully!');
-        redirect(base_url() . 'taxes/taxes_list/');
-    }
-
-    function taxes_list() {
-        $data['page_title'] = 'Taxes';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->taxes_form->build_taxes_list_for_admin();
-        $data["grid_buttons"] = $this->taxes_form->build_grid_buttons();
-        $data['form_search'] = $this->form->build_serach_form($this->taxes_form->get_search_taxes_form());
-        $this->load->view('view_taxes_list', $data);
-    }
-
-    function taxes_list_json() {
-        $json_data = array();
-        $count_all = $this->taxes_model->get_taxes_list(false);
-        $paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-
-        $query = $this->taxes_model->get_taxes_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->taxes_form->build_taxes_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    }
-
-    function taxes_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action']);
-            unset($_POST['advance_search']);
-            if (isset($action['taxes_amount']['taxes_amount']) && $action['taxes_amount']['taxes_amount'] != '') {
-                $action['taxes_amount']['taxes_amount'] = $this->common_model->add_calculate_currency($action['taxes_amount']['taxes_amount'], "", '', true, false);
-            }
-        $this->session->set_userdata('taxes_list_search', $this->input->post());
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'taxes/taxes_list/');
-        }
-    }
-
-    function taxes_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('taxes_list_search', "");
-    }
-
-    function taxes_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $taxes_where="taxes_id IN(".$ids.")";
-        $this->db->where($taxes_where);
-        $this->db->delete('taxes_to_accounts');
-        $this->db->where($where);
-        echo $this->db->delete("taxes");
-    }
+		$this->taxes_model->remove_taxes($id);
+		$this->session->set_flashdata('astpp_notification', $taxes_name["taxes_description"].' Tax removed successfully!');
+		redirect(base_url() . 'taxes/taxes_list/');
+	}
+
+	function taxes_list() {
+		$data['page_title'] = 'Taxes';
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->taxes_form->build_taxes_list_for_admin();
+		$data["grid_buttons"] = $this->taxes_form->build_grid_buttons();
+		$data['form_search'] = $this->form->build_serach_form($this->taxes_form->get_search_taxes_form());
+		$this->load->view('view_taxes_list', $data);
+	}
+
+	function taxes_list_json() {
+		$json_data = array();
+		$count_all = $this->taxes_model->get_taxes_list(false);
+		$paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+
+		$query = $this->taxes_model->get_taxes_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->taxes_form->build_taxes_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	}
+
+	function taxes_list_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action']);
+			unset($_POST['advance_search']);
+			if (isset($action['taxes_amount']['taxes_amount']) && $action['taxes_amount']['taxes_amount'] != '') {
+				$action['taxes_amount']['taxes_amount'] = $this->common_model->add_calculate_currency($action['taxes_amount']['taxes_amount'], "", '', true, false);
+			}
+		$this->session->set_userdata('taxes_list_search', $this->input->post());
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'taxes/taxes_list/');
+		}
+	}
+
+	function taxes_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('taxes_list_search', "");
+	}
+
+	function taxes_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$taxes_where="taxes_id IN(".$ids.")";
+		$this->db->where($taxes_where);
+		$this->db->delete('taxes_to_accounts');
+		$this->db->where($where);
+		echo $this->db->delete("taxes");
+	}
 
 }
 

web_interface/astpp/application/modules/taxes/libraries/taxes_form.php

Indentation +45 added lines, -45 removed lines

@@ -21,62 +21,62 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 if (!defined('BASEPATH'))

-    exit('No direct script access allowed');

+	exit('No direct script access allowed');

 

 class Taxes_form {

 	function __construct() {

-        $this->CI = & get_instance();

-    }

-    function get_taxes_form_fields() {

-        $form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));

-        $form['Tax Information'] = array(

-            array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-            array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-            array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim|required|numeric', 'tOOL TIP', ''),

-            array('Amount', 'INPUT', array('name' => 'taxes_amount', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

-            array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

-            array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),

+		$this->CI = & get_instance();

+	}

+	function get_taxes_form_fields() {

+		$form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));

+		$form['Tax Information'] = array(

+			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+			array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim|required|numeric', 'tOOL TIP', ''),

+			array('Amount', 'INPUT', array('name' => 'taxes_amount', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),

 

-        );

-        $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

-        $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-        return $form;

-    }

+		);

+		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

+		$form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		return $form;

+	}

 

-    function get_search_taxes_form() {

-        $form['forms'] = array("", array('id' => "taxes_search"));

-        $form['Search'] = array(

-            array('Name', 'INPUT', array('name' => 'taxes_description[taxes_description]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'taxes_description[taxes_description-string]', '', '', '', 'search_string_type', ''),

-            array('Amount', 'INPUT', array('name' => 'taxes_amount[taxes_amount]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_amount[taxes_amount-integer]', '', '', '', 'search_int_type', ''),

-            array('Rate(%)', 'INPUT', array('name' => 'taxes_rate[taxes_rate]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_rate[taxes_rate-integer]', '', '', '', 'search_int_type', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),   array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

-            array('', 'HIDDEN', 'advance_search', '1', '', '', '')

-        );

-        $form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

-        $form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

-        return $form;

-    }

+	function get_search_taxes_form() {

+		$form['forms'] = array("", array('id' => "taxes_search"));

+		$form['Search'] = array(

+			array('Name', 'INPUT', array('name' => 'taxes_description[taxes_description]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'taxes_description[taxes_description-string]', '', '', '', 'search_string_type', ''),

+			array('Amount', 'INPUT', array('name' => 'taxes_amount[taxes_amount]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_amount[taxes_amount-integer]', '', '', '', 'search_int_type', ''),

+			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate[taxes_rate]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_rate[taxes_rate-integer]', '', '', '', 'search_int_type', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),   array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('', 'HIDDEN', 'advance_search', '1', '', '', '')

+		);

+		$form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

+		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

+		return $form;

+	}

 

-    function build_taxes_list_for_admin() {

+	function build_taxes_list_for_admin() {

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

 		$currency_id=$account_info['currency_id'];

 		$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);

-        $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

-            array("Name", "270", "taxes_description", "", "", "","","true","center"),

-            array("Priority", "145", "taxes_priority", "", "", "","","true","center"),

-            array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),

-            array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),

-            array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),

+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+			array("Name", "270", "taxes_description", "", "", "","","true","center"),

+			array("Priority", "145", "taxes_priority", "", "", "","","true","center"),

+			array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),

+			array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),

+			array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),

 			array("Action", "175", "", "", "", array("EDIT" => array("url" => "taxes/taxes_edit/", "mode" => "popup"),

-                    "DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))

-                ));

-        return $grid_field_arr;

-    }

+					"DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))

+				));

+		return $grid_field_arr;

+	}

 

-    function build_grid_buttons() {

-        $buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),

-            array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));

-        return $buttons_json;

-    }

+	function build_grid_buttons() {

+		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),

+			array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));

+		return $buttons_json;

+	}

 

 }

 

web_interface/astpp/application/modules/taxes/models/taxes_model.php

Indentation +35 added lines, -35 removed lines

@@ -22,46 +22,46 @@
 ###############################################################################
 class Taxes_model extends CI_Model {
 
-    function Taxes_model() {
-        parent::__construct();
-    }
+	function Taxes_model() {
+		parent::__construct();
+	}
 
-    function get_taxes_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('taxes_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
-        }else{
-	    $where =array("reseller_id"=>0);
-        }
-        if ($flag) {
-            $query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "taxes", $where);
-        }
-        return $query;
-    }
+	function get_taxes_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('taxes_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
+		}else{
+		$where =array("reseller_id"=>0);
+		}
+		if ($flag) {
+			$query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "taxes", $where);
+		}
+		return $query;
+	}
 
-    function add_tax($data) {
-        unset($data["action"]);
-        $data["creation_date"] = date("Y-m-d H:i:s");
-         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+	function add_tax($data) {
+		unset($data["action"]);
+		$data["creation_date"] = date("Y-m-d H:i:s");
+		 if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 	  $data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
-         }else{
+		 }else{
 	  $data['reseller_id'] =0;
-         }
-        $this->db->insert("taxes", $data);
-    }
+		 }
+		$this->db->insert("taxes", $data);
+	}
 
-    function edit_tax($data, $id) {
-        unset($data["action"]);
-        $data["last_modified_date"] = date("Y-m-d H:i:s");
-        $this->db->where("id", $id);
-        $this->db->update("taxes", $data);
-    }
+	function edit_tax($data, $id) {
+		unset($data["action"]);
+		$data["last_modified_date"] = date("Y-m-d H:i:s");
+		$this->db->where("id", $id);
+		$this->db->update("taxes", $data);
+	}
 
-    function remove_taxes($id) {
-        $this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
-        return $this->db->delete("taxes",array('id'=>$id));
-    }
+	function remove_taxes($id) {
+		$this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
+		return $this->db->delete("taxes",array('id'=>$id));
+	}
 
 }

web_interface/astpp/application/modules/email/controllers/email.php

Indentation +307 added lines, -307 removed lines

@@ -24,45 +24,45 @@ 
 
 class Email extends MX_Controller {
 
-    function Email() {
-        parent::__construct();
+	function Email() {
+		parent::__construct();
 
-        $this->load->helper('template_inheritance');
+		$this->load->helper('template_inheritance');
 
-        $this->load->library('session');
-        $this->load->library('email_form');
-        $this->load->library('astpp/form');
-        $this->load->model('email_model');
-        $this->load->library('csvreader');
+		$this->load->library('session');
+		$this->load->library('email_form');
+		$this->load->library('astpp/form');
+		$this->load->model('email_model');
+		$this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
-    }
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . '/astpp/login');
+	}
 
-    function email_edit($edit_id = '') {
-        $data['page_title'] = 'Edit Email List';
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array('id' => $edit_id, "reseller_id" => $reseller);
-        } else {
-            $where = array('id' => $edit_id);
-        }
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-        if ($account->num_rows > 0) {
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-            $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $edit_data);
-            $this->load->view('view_email_add_edit', $data);
-        } else {
-            redirect(base_url() . 'email/email_history_list/');
-        }
-            redirect(base_url() . 'email/email_history_list/');
-    }
+	function email_edit($edit_id = '') {
+		$data['page_title'] = 'Edit Email List';
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array('id' => $edit_id, "reseller_id" => $reseller);
+		} else {
+			$where = array('id' => $edit_id);
+		}
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+		if ($account->num_rows > 0) {
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $edit_data);
+			$this->load->view('view_email_add_edit', $data);
+		} else {
+			redirect(base_url() . 'email/email_history_list/');
+		}
+			redirect(base_url() . 'email/email_history_list/');
+	}
 
-    function email_resend() {
-        $add_array = $this->input->post();
+	function email_resend() {
+		$add_array = $this->input->post();
 /**
 ASTPP  3.0 
 For Signup Email broadcast link change 
@@ -72,187 +72,187 @@ 
 	$add_array = $add_array[0];
 /************************************************************/
 
-        $data['page_title'] = 'Resand Email';
-            $where = array('id' => $add_array['id']);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-	    $add_array=array('accountid'=>$edit_data['accountid'],
-			     'subject'=>$add_array['subject'],
-			     'body'=>$add_array['body'],
-			     'from'=>$edit_data['from'],
-			     'to'=>$edit_data['to'],
-			     'status'=>$edit_data['status'],
-			     'template'=>$edit_data['template'],
-			     'attachment'=>$edit_data['attachment'],
+		$data['page_title'] = 'Resand Email';
+			$where = array('id' => $add_array['id']);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+		$add_array=array('accountid'=>$edit_data['accountid'],
+				 'subject'=>$add_array['subject'],
+				 'body'=>$add_array['body'],
+				 'from'=>$edit_data['from'],
+				 'to'=>$edit_data['to'],
+				 'status'=>$edit_data['status'],
+				 'template'=>$edit_data['template'],
+				 'attachment'=>$edit_data['attachment'],
 			
-			    );
-                $this->email_re_send($add_array);		
+				);
+				$this->email_re_send($add_array);		
         
-	    $this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-            redirect(base_url() . 'email/email_history_list/');
-    }
-    function email_resend_edit($edit_id = '') {
+		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
+			redirect(base_url() . 'email/email_history_list/');
+	}
+	function email_resend_edit($edit_id = '') {
 	$data['page_title'] = 'Resend Email';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-      if ($account->num_rows > 0) {
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-            $data['maildata'] = $edit_data['attachment'];            
-            $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_edit(), $edit_data);
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+	  if ($account->num_rows > 0) {
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+			$data['maildata'] = $edit_data['attachment'];            
+			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_edit(), $edit_data);
 
-            $this->load->view('view_email_add_edit', $data);
-        } else {
-            redirect(base_url() . 'email/email_history_list/');
-        }
+			$this->load->view('view_email_add_edit', $data);
+		} else {
+			redirect(base_url() . 'email/email_history_list/');
+		}
 
-    }
-    function email_resend_edit_customer($edit_id = '') {
+	}
+	function email_resend_edit_customer($edit_id = '') {
 	$data['page_title'] = 'Resent Email';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-      if ($account->num_rows > 0) {
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-            $data['maildata'] = $edit_data['attachment'];
-            $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus_edit(), $edit_data);
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+	  if ($account->num_rows > 0) {
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+			$data['maildata'] = $edit_data['attachment'];
+			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus_edit(), $edit_data);
 
-            $this->load->view('view_email_add_edit', $data);
-        } else {
-            redirect(base_url() . 'email/email_history_list/');
-        }
+			$this->load->view('view_email_add_edit', $data);
+		} else {
+			redirect(base_url() . 'email/email_history_list/');
+		}
 
-    }
+	}
 
-    function email_resend_customer($edit_id = '') {
-        $add_array = $this->input->post();
-        $data['page_title'] = 'Resand Email';
-            $where = array('id' => $add_array['id']);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-	    $add_array=array('accountid'=>$edit_data['accountid'],
-			     'subject'=>$add_array['subject'],
-			     'body'=>$add_array['body'],
-			     'from'=>$edit_data['from'],
-			     'to'=>$edit_data['to'],
-			     'status'=>$edit_data['status'],
-			     'template'=>$edit_data['template'],
-			     'attachment'=>$edit_data['attachment'],
-			    );
-            $this->email_model->add_email($add_array);
-	        $this->email_lib->send_email('',$add_array,'','',1);
+	function email_resend_customer($edit_id = '') {
+		$add_array = $this->input->post();
+		$data['page_title'] = 'Resand Email';
+			$where = array('id' => $add_array['id']);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+		$add_array=array('accountid'=>$edit_data['accountid'],
+				 'subject'=>$add_array['subject'],
+				 'body'=>$add_array['body'],
+				 'from'=>$edit_data['from'],
+				 'to'=>$edit_data['to'],
+				 'status'=>$edit_data['status'],
+				 'template'=>$edit_data['template'],
+				 'attachment'=>$edit_data['attachment'],
+				);
+			$this->email_model->add_email($add_array);
+			$this->email_lib->send_email('',$add_array,'','',1);
 
-            $this->load->module('accounts/accounts');
-	    $this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-            redirect(base_url() . 'accounts/customer_edit/'.$value["accountid"]);
-    }
-    function email_add($type = "") {
+			$this->load->module('accounts/accounts');
+		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
+			redirect(base_url() . 'accounts/customer_edit/'.$value["accountid"]);
+	}
+	function email_add($type = "") {
 
-        $data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Create Commission Rate';
-        $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), '');
+		$data['username'] = $this->session->userdata('user_name');
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Create Commission Rate';
+		$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), '');
 
-        $this->load->view('view_email_add_edit', $data);
-    }
-    function email_save() {
-        $add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit email List';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->email_model->edit_email($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> "Email list updated successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Create Email List';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->email_model->add_email($add_array);
-                echo json_encode(array("SUCCESS"=> "Email list added successfully!"));
-                exit;
-            }
-        }
-    }
-    function email_re_send($edit_data) {
+		$this->load->view('view_email_add_edit', $data);
+	}
+	function email_save() {
+		$add_array = $this->input->post();
+		$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit email List';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->email_model->edit_email($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> "Email list updated successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Create Email List';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->email_model->add_email($add_array);
+				echo json_encode(array("SUCCESS"=> "Email list added successfully!"));
+				exit;
+			}
+		}
+	}
+	function email_re_send($edit_data) {
 	$this->email_lib->send_email('',$edit_data,'',$edit_data['attachment'],1);
 	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-        redirect(base_url() . '/email/email_history_list/');
-    }
-    function email_view($edit_id = '') {
+		redirect(base_url() . '/email/email_history_list/');
+	}
+	function email_view($edit_id = '') {
 	$data['page_title'] = 'View Email';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-      if ($account->num_rows > 0) {
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }  
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+	  if ($account->num_rows > 0) {
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}  
 			if($edit_data['status'] == 1){
 				$edit_data['status']='Not Sent';
 			}else{
 				$edit_data['status']='Sent';
 			}
-            $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
+			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
 
-            $this->load->view('view_email_add_edit', $data);
-        } else {
-            redirect(base_url() . 'email/email_history_list/');
-        }
-    }
-    function email_view_customer($edit_id = '') {
+			$this->load->view('view_email_add_edit', $data);
+		} else {
+			redirect(base_url() . 'email/email_history_list/');
+		}
+	}
+	function email_view_customer($edit_id = '') {
 	$data['page_title'] = 'View Email';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-      if ($account->num_rows > 0) {
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-            $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus(), $edit_data);
-            $this->load->view('view_email_add_edit', $data);
-        } else {
-            redirect(base_url() . 'email/email_history_list/'.$edit_id);
-        }
-    }
-    function email_delete($id) {
-        $this->email_model->remove_email($id);
-        $this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
-        redirect(base_url() . '/email/email_history_list/');
-    }
-    function email_delete_customer($accounttype,$accountid,$id) {
-        $this->email_model->remove_email($id);
-        $where = array('id' => $id);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+	  if ($account->num_rows > 0) {
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus(), $edit_data);
+			$this->load->view('view_email_add_edit', $data);
+		} else {
+			redirect(base_url() . 'email/email_history_list/'.$edit_id);
+		}
+	}
+	function email_delete($id) {
+		$this->email_model->remove_email($id);
+		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
+		redirect(base_url() . '/email/email_history_list/');
+	}
+	function email_delete_customer($accounttype,$accountid,$id) {
+		$this->email_model->remove_email($id);
+		$where = array('id' => $id);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
 	foreach ($account->result_array() as $key => $value) {
-	    $edit_data = $value;
+		$edit_data = $value;
 	}
-        $url ="accounts/".$accounttype."_emailhistory/$accountid/";
-        $this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
+		$url ="accounts/".$accounttype."_emailhistory/$accountid/";
+		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
 	$this->load->module('accounts/accounts');
-        redirect(base_url() . $url);
-    }
-    function email_mass() {
-        $account_data = $this->session->userdata("accountinfo");
-        if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
-            redirect(base_url() . '/astpp/dashboard/');
+		redirect(base_url() . $url);
+	}
+	function email_mass() {
+		$account_data = $this->session->userdata("accountinfo");
+		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
+			redirect(base_url() . '/astpp/dashboard/');
 	$data['username'] = $this->session->userdata('user_name');	
-        $data['page_title'] = 'Email Mass';
-        $data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
+		$data['page_title'] = 'Email Mass';
+		$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
 	$this->load->view('view_email_client_area',$data); 
-    }
+	}
  /*Mass Email*/
    function attachment_icons($select = "", $table = "", $attachement="") {
 	if($attachement!="")
@@ -268,65 +268,65 @@ 
 	else{
 		return "";
 	}
-    }
-    function email_client_get()
-      {
-	       $files=$_FILES;
-	       $add_array = $this->input->post();
-	       $add_array['page_title'] = 'Compose email';
-	       $nooffile= $files['file']['name'];
-	       $count=count($nooffile);
-	       $add_array['attachment']='';
-	       $add_array['file']='';
-	       for($i=0;$i<$count;$i++){
-		       $tmp_name[]= $files['file']['tmp_name'][$i];
-		       if($files['file']['error'][$i]==0){
-			       $cur_name = $files['file']['name'][$i];
-			       $parts = explode(".", $cur_name);
-			       $add_array['attachment'].=date('ymdhis').$i.'.'.$parts[1].',';
-			       $add_array['file'].=date('ymdhis').$i.'.'.$parts[1].',';
-		     	       $uploadedFile1 = $files['file']['tmp_name'][$i];
-			       $user_name='inextrix';
-			       $actual_file_name=date('ymdhis').$i.'.'.$parts[1];
-			       $dir_path=  getcwd()."/attachments/";
-			       $path =$dir_path.$actual_file_name;
-			       if (move_uploaded_file($uploadedFile1,$path)) {
+	}
+	function email_client_get()
+	  {
+		   $files=$_FILES;
+		   $add_array = $this->input->post();
+		   $add_array['page_title'] = 'Compose email';
+		   $nooffile= $files['file']['name'];
+		   $count=count($nooffile);
+		   $add_array['attachment']='';
+		   $add_array['file']='';
+		   for($i=0;$i<$count;$i++){
+			   $tmp_name[]= $files['file']['tmp_name'][$i];
+			   if($files['file']['error'][$i]==0){
+				   $cur_name = $files['file']['name'][$i];
+				   $parts = explode(".", $cur_name);
+				   $add_array['attachment'].=date('ymdhis').$i.'.'.$parts[1].',';
+				   $add_array['file'].=date('ymdhis').$i.'.'.$parts[1].',';
+			 		   $uploadedFile1 = $files['file']['tmp_name'][$i];
+				   $user_name='inextrix';
+				   $actual_file_name=date('ymdhis').$i.'.'.$parts[1];
+				   $dir_path=  getcwd()."/attachments/";
+				   $path =$dir_path.$actual_file_name;
+				   if (move_uploaded_file($uploadedFile1,$path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
-			       }
-			       else{
-				    $this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
-			       }
-		       }
-	       }
-	       $add_array['attachment']=trim($add_array['attachment'],',');
-	       $add_array['file']=trim($add_array['file'],',');
-               $add_array['email']= explode(",",$add_array['to']);   
-               $this->email_model->multipal_email($add_array);
-               $screen_path = getcwd()."/cron";
-               $screen_filename = "Email_Broadcast_".strtotime('now');
-               $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-               exec($command);
-               $this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-               redirect(base_url() . 'email/email_history_list/');
-               exit; 
-        }
+				   }
+				   else{
+					$this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
+				   }
+			   }
+		   }
+		   $add_array['attachment']=trim($add_array['attachment'],',');
+		   $add_array['file']=trim($add_array['file'],',');
+			   $add_array['email']= explode(",",$add_array['to']);   
+			   $this->email_model->multipal_email($add_array);
+			   $screen_path = getcwd()."/cron";
+			   $screen_filename = "Email_Broadcast_".strtotime('now');
+			   $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
+			   exec($command);
+			   $this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
+			   redirect(base_url() . 'email/email_history_list/');
+			   exit; 
+		}
     
-       function email_client_area() {
-        $add_array = $this->input->post();
-        if($add_array['temp'] == ''){
+	   function email_client_area() {
+		$add_array = $this->input->post();
+		if($add_array['temp'] == ''){
 	 	$subject = '';
 		$body ='';	
-             }
+			 }
 		else{
-                $where = array('id' => $add_array['temp']);
+				$where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
 		$account_data =$account->result_array();
-                $subject = isset($account_data[0]['subject'])?$account_data[0]['subject']:'';
+				$subject = isset($account_data[0]['subject'])?$account_data[0]['subject']:'';
 		$body = isset($account_data[0]['template'])?$account_data[0]['template']:'';	
 	
             
-        }
-       	$count_all = $this->email_model->get_email_client_data($add_array);
+		}
+	   	$count_all = $this->email_model->get_email_client_data($add_array);
 	$email_arr = array();
 	$id_arr = array();
 	foreach($count_all as $key=>$value){
@@ -337,8 +337,8 @@ 
 	} 
 	if (empty($email_arr))
 	{
-        	$this->session->set_flashdata('astpp_notification', 'No record found! ');
-	        redirect(base_url() . 'email/email_mass/');
+			$this->session->set_flashdata('astpp_notification', 'No record found! ');
+			redirect(base_url() . 'email/email_mass/');
 	}
 	$to_email = $email_arr;
 	
@@ -354,104 +354,104 @@ 
 	$send_id =$send_id[0]['emailaddress'];
 	$add_arr['template'] = $body;
 	$add_arr['subject'] = $subject;
-        $add_arr['accountid'] = $id_arr;
+		$add_arr['accountid'] = $id_arr;
 	$add_arr['from'] = $send_id;
 	$add_arr['temp'] = $add_array['temp'];
 	$add_arr['to']=$to_send_mail;
 	$add_arr['temp']=$add_array['temp'];
-        $this->load->view('view_email_brod', $add_arr);
-    }
+		$this->load->view('view_email_brod', $add_arr);
+	}
 
 /********************************************************/
-    function email_history_list_customer() {
+	function email_history_list_customer() {
 	$add_array = $this->input->post();
-            $where = array('id' => $add_array['id']);
-        $account = $this->db_model->getSelect("*", "mail_details", $where);
-            foreach ($account->result_array() as $key => $value) {
-                $edit_data = $value;
-            }
-	    $this->load->module('accounts/accounts');
-            redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
-    }
-    function email_history_list() {
+			$where = array('id' => $add_array['id']);
+		$account = $this->db_model->getSelect("*", "mail_details", $where);
+			foreach ($account->result_array() as $key => $value) {
+				$edit_data = $value;
+			}
+		$this->load->module('accounts/accounts');
+			redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
+	}
+	function email_history_list() {
 	$data['logintype']=$this->session->userdata('logintype');
-        $data['username'] = $this->session->userdata('user_name');
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
+		$data['username'] = $this->session->userdata('user_name');
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
 	$data['page_title'] = 'Email History List';
 	$data['grid_fields'] = $this->email_form->build_list_for_email();
 	$data["grid_buttons"] = $this->email_form->build_grid_buttons_email();
-        $data['form_search'] = $this->form->build_serach_form($this->email_form->get_email_history_search_form());
+		$data['form_search'] = $this->form->build_serach_form($this->email_form->get_email_history_search_form());
 	$this->load->view('view_email_list', $data);
-    }
-    function email_history_list_json() {
+	}
+	function email_history_list_json() {
 	$data['logintype']=$this->session->userdata('logintype');
-        $json_data = array();
-        $count_all = $this->email_model->get_email_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->email_model->get_email_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$json_data = array();
+		$count_all = $this->email_model->get_email_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->email_model->get_email_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 	$grid_fields = json_decode($this->email_form->build_list_for_email());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}
 
-    function customer_mail_record($accountid,$accounttype){
-        $json_data = array();
-        $count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->email_model->customer_get_email_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+	function customer_mail_record($accountid,$accounttype){
+		$json_data = array();
+		$count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->email_model->customer_get_email_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 	$grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid,$accounttype));
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-        echo json_encode($json_data);
-    }    
-    function email_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $this->db->where($where);
-        echo $this->db->delete("email");
-    }
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
+	}    
+	function email_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$this->db->where($where);
+		echo $this->db->delete("email");
+	}
 
-    function email_send_multipal(){
+	function email_send_multipal(){
 	$add_array = $this->input->post();
 	if($add_array['email'] == '' || $add_array['subject'] == '' || $add_array['template'] == ''){
 		$this->session->set_flashdata('astpp_notification', 'Email address not found!');
-	        redirect(base_url() . '/email/email_client_area/');
+			redirect(base_url() . '/email/email_client_area/');
 	}
-        $this->email_model->multipal_email($add_array);
+		$this->email_model->multipal_email($add_array);
 	$screen_path = "/var/www/html/ITPLATP/cron";
 	$screen_filename = "Email_Broadcast_".strtotime('now');
 	$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-        exec($command);
+		exec($command);
 	$this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-    	redirect(base_url() . 'email/email_history_list/');
+		redirect(base_url() . 'email/email_history_list/');
 
-    }
-    function email_history_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
+	}
+	function email_history_list_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
 
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('email_search_list', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'email/email_history_list/');
-        }
-    }
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('email_search_list', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'email/email_history_list/');
+		}
+	}
 
-    function email_history_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('email_search', "");
-    }
-    /*
+	function email_history_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('email_search', "");
+	}
+	/*
 	* Purpose : Add following code for download attached file
 	* Version 2.1
     */
-    function email_history_list_attachment($file_name) {
+	function email_history_list_attachment($file_name) {
 	if(file_exists(getcwd().'/attachments/'.$file_name)){
 		header('Content-Type: application/octet-stream');
 		header('Content-Disposition: attachment; filename='.$file_name);
@@ -459,7 +459,7 @@ 
 		flush();
 		readfile(getcwd().'/attachments/'.$file_name);
 	}
-    }
+	}
 
 }
 ?>

web_interface/astpp/application/modules/email/libraries/email_form.php

Indentation +128 added lines, -128 removed lines

@@ -23,144 +23,144 @@ 
 ###############################################################################

 

 if (!defined('BASEPATH'))

-    exit('No direct script access allowed');

+	exit('No direct script access allowed');

 

 class Email_form {

-    function __construct($library_name = '') {

-        $this->CI = & get_instance();

-    }

+	function __construct($library_name = '') {

+		$this->CI = & get_instance();

+	}

 

   function get_form_fields_email() {

-         $form['forms'] = array(base_url() . 'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-        $form['Resend Email'] = array(

-            array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-            array('To', 'INPUT', array('name' => 'to', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-            array('From', 'INPUT', array('name' => 'from', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-            array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-            array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		 $form['forms'] = array(base_url() . 'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$form['Resend Email'] = array(

+			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+			array('To', 'INPUT', array('name' => 'to', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('From', 'INPUT', array('name' => 'from', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

             

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

 	           

 );

-        $form['button_cancel'] = array('name' => 'action', 'content' => 'Cancel', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-        $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

+		$form['button_cancel'] = array('name' => 'action', 'content' => 'Cancel', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

 

-        return $form;

-    }

+		return $form;

+	}

 

-    function get_form_fields_email_edit() {

+	function get_form_fields_email_edit() {

 	 $readable='disabled';

-         $form['forms'] = array(base_url() . 'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url() . 'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 	 $form['Resent Email'] = array(

-           array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-           array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

-           array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-           array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+		   array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 		   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-           array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 	           

 	 );

 	 $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-         $form['button_save'] = array('name' => 'action', 'content' => 'Sent', 'value' => 'save', 'id' => 'button', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

-         return $form;

-    }

+		 $form['button_save'] = array('name' => 'action', 'content' => 'Sent', 'value' => 'save', 'id' => 'button', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

+		 return $form;

+	}

     

-    function get_form_fields_email_view() {

-	    $readable='disabled';

-         $form['forms'] = array(base_url() . 'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-        $form['View Email'] = array(

-            array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-            array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

+	function get_form_fields_email_view() {

+		$readable='disabled';

+		 $form['forms'] = array(base_url() . 'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$form['View Email'] = array(

+			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+			array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

 			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,'style'=>'margin-top: 3px;' ,'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-            array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('Status', 'INPUT', array('name' => 'status', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'width: 18% !important;margin-top: 3px;' , 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),   

 	           

 );

-        $form['button_save'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-        return $form;

-    }

-    function get_form_fields_email_view_cus() {

+		$form['button_save'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		return $form;

+	}

+	function get_form_fields_email_view_cus() {

 	 $readable='disabled';

-         $form['forms'] = array(base_url() . 'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-         $form['View Email'] = array(

-           array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-           array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

-           array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-           array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		 $form['forms'] = array(base_url() . 'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['View Email'] = array(

+		   array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+		   array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 	   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-           array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

             

-	    array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;','class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

+		array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;','class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

 	           

 );

-        $form['button_save'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-        return $form;

-    }

-    function get_form_fields_email_view_cus_edit() {

-	    $readable='disabled';

-         $form['forms'] = array(base_url() . 'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-        $form['Resent Email'] = array(

-            array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-            array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

+		$form['button_save'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		return $form;

+	}

+	function get_form_fields_email_view_cus_edit() {

+		$readable='disabled';

+		 $form['forms'] = array(base_url() . 'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$form['Resent Email'] = array(

+			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

+			array('', 'HIDDEN', array('name' => 'status'), '', '', '', ''),

 			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-            array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),           

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),           

 );

-        $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

-         $form['button_save'] = array('name' => 'action', 'content' => 'Sent', 'value' => 'save', 'id' => 'button', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

-        return $form;

-    }

+		$form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

+		 $form['button_save'] = array('name' => 'action', 'content' => 'Sent', 'value' => 'save', 'id' => 'button', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

+		return $form;

+	}

 

-    function build_list_for_email() {

-        // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-        $grid_field_arr = json_encode(array(

-            array("Date", "100", "date", "", "", "","","true","center"),

-            array("Account", "99", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

-            array("From", "145", "from", "", "", "","","true","center"),

-            array("To", "140", "to", "", "", "","","true","center"),

-            array("Subject", "180", "subject", "", "", "","","true","center"),

-            array("Body", "320", "body", "", "", "","","true","center"),

-            array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

-            array("Status", "70", "status", "status", "status", "email_status","","true","center"),

-            array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit/", "mode" => "popup"),

-		    "VIEW" => array("url" => "email/email_view/", "mode" => "popup","layout"=>"medium"),

-                    "DELETE" => array("url" => "/email/email_delete/", "mode" => "single")))

-                ));

-        return $grid_field_arr;

-    }

+	function build_list_for_email() {

+		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

+		$grid_field_arr = json_encode(array(

+			array("Date", "100", "date", "", "", "","","true","center"),

+			array("Account", "99", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

+			array("From", "145", "from", "", "", "","","true","center"),

+			array("To", "140", "to", "", "", "","","true","center"),

+			array("Subject", "180", "subject", "", "", "","","true","center"),

+			array("Body", "320", "body", "", "", "","","true","center"),

+			array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

+			array("Status", "70", "status", "status", "status", "email_status","","true","center"),

+			array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit/", "mode" => "popup"),

+			"VIEW" => array("url" => "email/email_view/", "mode" => "popup","layout"=>"medium"),

+					"DELETE" => array("url" => "/email/email_delete/", "mode" => "single")))

+				));

+		return $grid_field_arr;

+	}

 

-    function build_list_for_email_customer($accountid,$accounttype) {

-        // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-               $grid_field_arr = json_encode(array(

-                    array("Date", "140", "date", "", "", "","","true","center"),

-                    array("Subject", "230", "subject", "", "", "","","true","center"),

-                    array("Body", "350", "body", "", "", "","","true","center"),

-                    array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

-                    array("Status", "100", "status", "status", "status", "email_status","","true","center"),

-                    array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit_customer/", "mode" => "popup"),

-                            "VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup","layout"=>"medium"),

-                            "DELETE" => array("url" => "email/email_delete_customer/".$accounttype."/".$accountid."/", "mode" => "single")))

-                    ));

-        return $grid_field_arr;

-    }

+	function build_list_for_email_customer($accountid,$accounttype) {

+		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

+			   $grid_field_arr = json_encode(array(

+					array("Date", "140", "date", "", "", "","","true","center"),

+					array("Subject", "230", "subject", "", "", "","","true","center"),

+					array("Body", "350", "body", "", "", "","","true","center"),

+					array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

+					array("Status", "100", "status", "status", "status", "email_status","","true","center"),

+					array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit_customer/", "mode" => "popup"),

+							"VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup","layout"=>"medium"),

+							"DELETE" => array("url" => "email/email_delete_customer/".$accounttype."/".$accountid."/", "mode" => "single")))

+					));

+		return $grid_field_arr;

+	}

 

-    function build_list_for_email_client_area(){

-        $logintype = $this->CI->session->userdata('logintype');

+	function build_list_for_email_client_area(){

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

 	if ($logintype == 1 || $logintype == 5) {

-            $account_data = $this->CI->session->userdata("accountinfo");

-            $loginid = $account_data['id'];

+			$account_data = $this->CI->session->userdata("accountinfo");

+			$loginid = $account_data['id'];

 

-        }else{

-            $loginid = "0";

-        }

-         $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-        $form['Filter'] = array(

-          array('Rate Group', 'pricelist_id', 'SELECT', '',array("name"=>"pricelist_id","rules"=>"required"), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id" => $loginid)),

-          array('Account Type',array('name' => 'posttoexternal','class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

-          array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),

+		}else{

+			$loginid = "0";

+		}

+		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$form['Filter'] = array(

+		  array('Rate Group', 'pricelist_id', 'SELECT', '',array("name"=>"pricelist_id","rules"=>"required"), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id" => $loginid)),

+		  array('Account Type',array('name' => 'posttoexternal','class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

+		  array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),

 	  array('Entity Type', 'type', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_entity_type_email_mass'),

 	);

 	$form['Email Template'] = array(

@@ -171,9 +171,9 @@ 
 

 	

        

-        return $form;

-    } 

-    function get_form_fields_email_view_client($add_arr) {

+		return $form;

+	} 

+	function get_form_fields_email_view_client($add_arr) {

 	if($add_arr['type'] == ''){

 	   $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

 	}

@@ -181,42 +181,42 @@ 
 	 $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id'],'type'=>$add_arr['type']), 'multi');

 	}

 

-         $form['forms'] = array(base_url() . 'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

-        $form['Compose Email'] = array(

-            array('', 'HIDDEN', array('name' => 'accountid'), '', '', '', ''),

-            array('', 'HIDDEN', array('name' => 'temp'), '', '', '', ''),

+		 $form['forms'] = array(base_url() . 'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$form['Compose Email'] = array(

+			array('', 'HIDDEN', array('name' => 'accountid'), '', '', '', ''),

+			array('', 'HIDDEN', array('name' => 'temp'), '', '', '', ''),

 			array('From', 'INPUT', array('name' => 'from', 'size' => '20','readonly'=>true,'value'=>'',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

 			$email_add,

-            array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20', 'class' => "text field medium"), 'trim|required', 'tOOL TIP', ''),

-            array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

+			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20', 'class' => "text field medium"), 'trim|required', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

 );

 	$form['button_cancel'] = array('name' => 'action', 'content' => 'Cancel', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10',  'onclick' => 'return redirect_page(\'/email/email_mass/\')');

-        $form['button_save'] = array('name' => 'action', 'content' => 'Send', 'value' => 'save', 'id' => 'submit', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

-        return $form;

-    }

-    function build_grid_buttons_email(){

+		$form['button_save'] = array('name' => 'action', 'content' => 'Send', 'value' => 'save', 'id' => 'submit', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

+		return $form;

+	}

+	function build_grid_buttons_email(){

 	$buttons_json = json_encode(array(

-				    ));

+					));

 	return $buttons_json;

-    }

-    function get_email_history_search_form() {

-        $form['forms'] = array("", array('id' => "email_search"));

-        $form['Search'] = array(

+	}

+	function get_email_history_search_form() {

+		$form['forms'] = array("", array('id' => "email_search"));

+		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'date[]', 'id' => 'customer_cdr_from_date', 'size' => '20',

  'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

-            array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'customer_cdr_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

-            array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "deleted" => "0")),

-            array('From', 'INPUT', array('name' => 'from[from]', '','id'=>'from', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'from[from-string]', '', '', '', 'search_string_type', ''),

+			array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'customer_cdr_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

+			array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "deleted" => "0")),

+			array('From', 'INPUT', array('name' => 'from[from]', '','id'=>'from', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'from[from-string]', '', '', '', 'search_string_type', ''),

 			array('To', 'INPUT', array('name' => 'to[to]', '','id'=>'to', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'to[to-string]', '', '', '', 'search_string_type', ''),			

 			array('Subject', 'INPUT', array('name' => 'subject[subject]', '','id'=>'body', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''),  

 			array('Body', 'INPUT', array('name' => 'body[body]', '','id'=>'body', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'body[body-string]', '', '', '', 'search_string_type', ''),  

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),         

-            array('', 'HIDDEN', 'advance_search', '1', '', '', '')

-        );

-        $form['button_search'] = array('name' => 'action', 'id' => "email_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

-        $form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

-        return $form;

-    }

+			array('', 'HIDDEN', 'advance_search', '1', '', '', '')

+		);

+		$form['button_search'] = array('name' => 'action', 'id' => "email_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

+		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

+		return $form;

+	}

 

 }

 

web_interface/astpp/application/modules/email/views/view_email_brod.php

Indentation +2 added lines, -2 removed lines

@@ -237,8 +237,8 @@
  <form method="post" action="<?= base_url()?>email/email_client_get/" enctype="multipart/form-data" name="myform" id="myform" onsubmit="return(regvalidate())">
      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                     <? if(isset($error) && !empty($error)) {
-                        echo $error;
-                    }?>
+						echo $error;
+					}?>
                  </span>
  
    <div class="col-md-12 no-padding margin-t-15 margin-b-10">

web_interface/astpp/application/modules/email/views/view_email_add_edit.php

Indentation +7 added lines, -7 removed lines

@@ -27,15 +27,15 @@
             <?php echo $form; ?>

         </div>    

         <?php if(isset($maildata) && $maildata != ''){

-          echo "<div class='col-md-12 no-padding'>Attachments :</div>";

-          $imgArr = explode(",",$maildata);

-          foreach($imgArr as $key => $imgname){

-            $imgpath = base_url()."email/email_history_list_attachment/".$imgname;

-            echo "<div class='col-md-4 no-padding'>

+		  echo "<div class='col-md-12 no-padding'>Attachments :</div>";

+		  $imgArr = explode(",",$maildata);

+		  foreach($imgArr as $key => $imgname){

+			$imgpath = base_url()."email/email_history_list_attachment/".$imgname;

+			echo "<div class='col-md-4 no-padding'>

                   <a href='".$imgpath."'>".$imgname."</a>

                 </div>";

-          }

-        } ?>          

+		  }

+		} ?>          

     </section>

   </div>

 </div>