Inspection of "[FIX] Nginx error log for astpp server block #0007..." - iNextrix/ASTPP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — v3.0 (#136)

unknown

created 2016-10-21 13:26 UTC

Status

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -21,62 +21,62 @@
 block discarded – undo
 # 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;
+	}
 
 }
 

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 class Taxes_form {
@@ -28,13 +28,13 @@  discard block
 block discarded – undo
         $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['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('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('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'),
 
         );
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
         $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('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');
@@ -58,14 +58,14 @@  discard block
 block discarded – undo
 
     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"),
+		$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"),
 			array("Action", "175", "", "", "", array("EDIT" => array("url" => "taxes/taxes_edit/", "mode" => "popup"),
                     "DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))
                 ));
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
     }
 
     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/")));
+        $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;
     }
 

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -22,8 +22,9 @@
 block discarded – undo
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
+if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 class Package_form {
 

Please login to merge, or discard this patch.

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

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -22,46 +22,46 @@
 block discarded – undo
 ###############################################################################
 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));
+	}
 
 }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -30,8 +30,8 @@  discard block
 block discarded – undo
         $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);
+        } else {
+	    $where = array("reseller_id"=>0);
         }
         if ($flag) {
             $query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
         $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{
-	  $data['reseller_id'] =0;
+         } else {
+	  $data['reseller_id'] = 0;
          }
         $this->db->insert("taxes", $data);
     }
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
     }
 
     function remove_taxes($id) {
-        $this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
-        return $this->db->delete("taxes",array('id'=>$id));
+        $this->db->delete('taxes_to_accounts', array('taxes_id'=>$id));
+        return $this->db->delete("taxes", array('id'=>$id));
     }
 
 }

Please login to merge, or discard this patch.

Braces +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -30,7 +30,7 @@  discard block
 block discarded – undo
         $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{
+        } else{
 	    $where =array("reseller_id"=>0);
         }
         if ($flag) {
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

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

Indentation +307 added lines, -307 removed lines patch added patch discarded remove patch

@@ -24,45 +24,45 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	} 
 	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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		flush();
 		readfile(getcwd().'/attachments/'.$file_name);
 	}
-    }
+	}
 
 }
 ?>

Please login to merge, or discard this patch.

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch

@@ -36,7 +36,7 @@  discard block
 block discarded – undo
         $this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+            redirect(base_url().'/astpp/login');
     }
 
     function email_edit($edit_id = '') {
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
             $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/');
         }
-            redirect(base_url() . 'email/email_history_list/');
+            redirect(base_url().'email/email_history_list/');
     }
 
     function email_resend() {
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
             foreach ($account->result_array() as $key => $value) {
                 $edit_data = $value;
             }
-	    $add_array=array('accountid'=>$edit_data['accountid'],
+	    $add_array = array('accountid'=>$edit_data['accountid'],
 			     'subject'=>$add_array['subject'],
 			     'body'=>$add_array['body'],
 			     'from'=>$edit_data['from'],
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
                 $this->email_re_send($add_array);		
         
 	    $this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-            redirect(base_url() . 'email/email_history_list/');
+            redirect(base_url().'email/email_history_list/');
     }
     function email_resend_edit($edit_id = '') {
 	$data['page_title'] = 'Resend Email';
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 
             $this->load->view('view_email_add_edit', $data);
         } else {
-            redirect(base_url() . 'email/email_history_list/');
+            redirect(base_url().'email/email_history_list/');
         }
 
     }
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 
             $this->load->view('view_email_add_edit', $data);
         } else {
-            redirect(base_url() . 'email/email_history_list/');
+            redirect(base_url().'email/email_history_list/');
         }
 
     }
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
             foreach ($account->result_array() as $key => $value) {
                 $edit_data = $value;
             }
-	    $add_array=array('accountid'=>$edit_data['accountid'],
+	    $add_array = array('accountid'=>$edit_data['accountid'],
 			     'subject'=>$add_array['subject'],
 			     'body'=>$add_array['body'],
 			     'from'=>$edit_data['from'],
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
 			     'attachment'=>$edit_data['attachment'],
 			    );
             $this->email_model->add_email($add_array);
-	        $this->email_lib->send_email('',$add_array,'','',1);
+	        $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"]);
+            redirect(base_url().'accounts/customer_edit/'.$value["accountid"]);
     }
     function email_add($type = "") {
 
@@ -189,9 +189,9 @@  discard block
 block discarded – undo
         }
     }
     function email_re_send($edit_data) {
-	$this->email_lib->send_email('',$edit_data,'',$edit_data['attachment'],1);
+	$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/');
+        redirect(base_url().'/email/email_history_list/');
     }
     function email_view($edit_id = '') {
 	$data['page_title'] = 'View Email';
@@ -201,16 +201,16 @@  discard block
 block discarded – undo
             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';
+			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);
 
             $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_view_customer($edit_id = '') {
@@ -224,141 +224,141 @@  discard block
 block discarded – undo
             $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);
+            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/');
+        redirect(base_url().'/email/email_history_list/');
     }
-    function email_delete_customer($accounttype,$accountid,$id) {
+    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;
 	}
-        $url ="accounts/".$accounttype."_emailhistory/$accountid/";
+        $url = "accounts/".$accounttype."_emailhistory/$accountid/";
         $this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
 	$this->load->module('accounts/accounts');
-        redirect(base_url() . $url);
+        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/');
+        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(), '');
-	$this->load->view('view_email_client_area',$data); 
+	$this->load->view('view_email_client_area', $data); 
     }
  /*Mass Email*/
-   function attachment_icons($select = "", $table = "", $attachement="") {
-	if($attachement!="")
+   function attachment_icons($select = "", $table = "", $attachement = "") {
+	if ($attachement != "")
 	{
-		$array=explode(",", $attachement);
-		$str='';
-		foreach($array as $key =>$val){
-			$link = base_url() . "email/email_history_list_attachment/".$val;
-			$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
+		$array = explode(",", $attachement);
+		$str = '';
+		foreach ($array as $key =>$val) {
+			$link = base_url()."email/email_history_list_attachment/".$val;
+			$str .= "<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
 		}
 		return $str;
 	}
-	else{
+	else {
 		return "";
 	}
     }
     function email_client_get()
       {
-	       $files=$_FILES;
+	       $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){
+	       $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].',';
+			       $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)) {
+			       $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{
+			       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']);   
+	       $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/');
+               redirect(base_url().'email/email_history_list/');
                exit; 
         }
     
        function email_client_area() {
         $add_array = $this->input->post();
-        if($add_array['temp'] == ''){
+        if ($add_array['temp'] == '') {
 	 	$subject = '';
-		$body ='';	
+		$body = '';	
              }
-		else{
+		else {
                 $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']:'';
-		$body = isset($account_data[0]['template'])?$account_data[0]['template']:'';	
+		$account_data = $account->result_array();
+                $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);
 	$email_arr = array();
 	$id_arr = array();
-	foreach($count_all as $key=>$value){
+	foreach ($count_all as $key=>$value) {
 		$value = $value;
-		if($value['email']!=''){
-		$email_arr[$value['email']]= $value['email'];
-		$id_arr[]= $value['id'];}
+		if ($value['email'] != '') {
+		$email_arr[$value['email']] = $value['email'];
+		$id_arr[] = $value['id']; }
 	} 
 	if (empty($email_arr))
 	{
         	$this->session->set_flashdata('astpp_notification', 'No record found! ');
-	        redirect(base_url() . 'email/email_mass/');
+	        redirect(base_url().'email/email_mass/');
 	}
 	$to_email = $email_arr;
 	
 	$to_id = $id_arr;
-	$to_send_mail = implode(",",$to_email);
-	if($to_send_mail != ''){
-		$add_arr['email']= $email_arr;
+	$to_send_mail = implode(",", $to_email);
+	if ($to_send_mail != '') {
+		$add_arr['email'] = $email_arr;
 	}
 	$data['username'] = $this->session->userdata('user_name');	
 	$data['page_title'] = 'Compose Email';
 	$send_id = $this->db_model->getSelect("emailaddress", "invoice_conf", array());
-	$send_id =$send_id->result_array();
-	$send_id =$send_id[0]['emailaddress'];
+	$send_id = $send_id->result_array();
+	$send_id = $send_id[0]['emailaddress'];
 	$add_arr['template'] = $body;
 	$add_arr['subject'] = $subject;
         $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'];
+	$add_arr['to'] = $to_send_mail;
+	$add_arr['temp'] = $add_array['temp'];
         $this->load->view('view_email_brod', $add_arr);
     }
 
@@ -371,10 +371,10 @@  discard block
 block discarded – undo
                 $edit_data = $value;
             }
 	    $this->load->module('accounts/accounts');
-            redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
+            redirect(base_url().'accounts/customer_edit/'.$value['accountid']);
     }
     function email_history_list() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$data['logintype'] = $this->session->userdata('logintype');
         $data['username'] = $this->session->userdata('user_name');
         $data['search_flag'] = true;
         $this->session->set_userdata('advance_search', 0);
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
 	$this->load->view('view_email_list', $data);
     }
     function email_history_list_json() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$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']);
@@ -396,13 +396,13 @@  discard block
 block discarded – undo
         echo json_encode($json_data);
     }
 
-    function customer_mail_record($accountid,$accounttype){
+    function customer_mail_record($accountid, $accounttype) {
         $json_data = array();
-        $count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
+        $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));
+        $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);
     }    
@@ -413,11 +413,11 @@  discard block
 block discarded – undo
         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'] == ''){
+	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);
 	$screen_path = "/var/www/html/ITPLATP/cron";
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
 	$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/');
+    	redirect(base_url().'email/email_history_list/');
 
     }
     function email_history_list_search() {
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
             $this->session->set_userdata('email_search_list', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'email/email_history_list/');
+            redirect(base_url().'email/email_history_list/');
         }
     }
 
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
 	* Version 2.1
     */
     function email_history_list_attachment($file_name) {
-	if(file_exists(getcwd().'/attachments/'.$file_name)){
+	if (file_exists(getcwd().'/attachments/'.$file_name)) {
 		header('Content-Type: application/octet-stream');
 		header('Content-Disposition: attachment; filename='.$file_name);
 		ob_clean();

Please login to merge, or discard this patch.

Braces +10 added lines, -11 removed lines patch added patch discarded remove patch

@@ -35,8 +35,9 @@  discard block
 block discarded – undo
         $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 = '') {
@@ -203,7 +204,7 @@  discard block
 block discarded – undo
             }  
 			if($edit_data['status'] == 1){
 				$edit_data['status']='Not Sent';
-			}else{
+			} else{
 				$edit_data['status']='Sent';
 			}
             $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
@@ -246,8 +247,9 @@  discard block
 block discarded – undo
     }
     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/');
+        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(), '');
@@ -264,8 +266,7 @@  discard block
 block discarded – undo
 			$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
 		}
 		return $str;
-	}
-	else{
+	} else{
 		return "";
 	}
     }
@@ -292,8 +293,7 @@  discard block
 block discarded – undo
 			       $path =$dir_path.$actual_file_name;
 			       if (move_uploaded_file($uploadedFile1,$path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
-			       }
-			       else{
+			       } else{
 				    $this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
 			       }
 		       }
@@ -316,8 +316,7 @@  discard block
 block discarded – undo
         if($add_array['temp'] == ''){
 	 	$subject = '';
 		$body ='';	
-             }
-		else{
+             } else{
                 $where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
 		$account_data =$account->result_array();

Please login to merge, or discard this patch.

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

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -23,144 +23,144 @@  discard block
 block discarded – undo
 ###############################################################################
 
 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 @@  discard block
 block discarded – undo
 
 	
        
-        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 @@  discard block
 block discarded – undo
 	 $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;
+	}
 
 }
 

Please login to merge, or discard this patch.

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 class Email_form {
@@ -31,13 +31,13 @@  discard block
 block discarded – undo
     }
 
   function get_form_fields_email() {
-         $form['forms'] = array(base_url() . 'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
+         $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('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', '', ''),
 	           
@@ -49,15 +49,15 @@  discard block
 block discarded – undo
     }
 
     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'));
+	 $readable = 'disabled';
+         $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('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('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', ''),
 	           
 	 );
 	 $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\')');
@@ -66,48 +66,48 @@  discard block
 block discarded – undo
     }
     
     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'));
+	    $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('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', ''),   
+			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('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() {
-	 $readable='disabled';
-         $form['forms'] = array(base_url() . 'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
+	 $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', ''),
-	   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('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('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'));
+	    $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('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', ''),           
 );
         $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');
@@ -117,49 +117,49 @@  discard block
 block discarded – undo
     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("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"),
+		    "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) {
+    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("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"),
+                            "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(){
+    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'];
 
-        }else{
+        } else {
             $loginid = "0";
         }
-         $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
+         $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('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'),
 	);
@@ -174,27 +174,27 @@  discard block
 block discarded – undo
         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');
+	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');
 	}
-	else{
-	 $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');
+	else {
+	 $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['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', ''),
+			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', ''),
 );
-	$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_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(){
+    function build_grid_buttons_email() {
 	$buttons_json = json_encode(array(
 				    ));
 	return $buttons_json;
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
  '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', '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('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', '', '', '')
         );

Please login to merge, or discard this patch.

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,8 +22,9 @@  discard block
 block discarded – undo
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
+if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 class Email_form {
     function __construct($library_name = '') {
@@ -153,7 +154,7 @@  discard block
 block discarded – undo
             $account_data = $this->CI->session->userdata("accountinfo");
             $loginid = $account_data['id'];
 
-        }else{
+        } else{
             $loginid = "0";
         }
          $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
@@ -176,8 +177,7 @@  discard block
 block discarded – undo
     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');
-	}
-	else{
+	} else{
 	 $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');
 	}
 

Please login to merge, or discard this patch.

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

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -237,8 +237,8 @@
 block discarded – undo
  <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">

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 <!--***************************************************************-->
 
 
-	<script type="text/javascript" src="<?php echo base_url();?>assets/markup/markitup/sets/default/set.js"></script>
+	<script type="text/javascript" src="<?php echo base_url(); ?>assets/markup/markitup/sets/default/set.js"></script>
 <script type="text/javascript">
 $(function() {
 	$('#template').markItUp(mySettings);
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
  <div class="container">
  <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)) {
+                    <? if (isset($error) && ! empty($error)) {
                         echo $error;
                     }?>
                  </span>

Please login to merge, or discard this patch.

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

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -27,15 +27,15 @@
 block discarded – undo
             <?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>

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -26,10 +26,10 @@
 block discarded – undo
             </div>
             <?php echo $form; ?>
         </div>    
-        <?php if(isset($maildata) && $maildata != ''){
+        <?php if (isset($maildata) && $maildata != '') {
           echo "<div class='col-md-12 no-padding'>Attachments :</div>";
-          $imgArr = explode(",",$maildata);
-          foreach($imgArr as $key => $imgname){
+          $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>

Please login to merge, or discard this patch.

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,10 @@
 block discarded – undo
     <section class="slice color-three no-margin">
 	<div class="w-section inverse no-padding">
             <div style="color:red;margin-left: 60px;">
-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 
+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 
             </div>
             <?php echo $form; ?>
         </div>      

Please login to merge, or discard this patch.

astpp/application/modules/email/views/view_email_client_area.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
    $(".country_id").val(<?=$country_id?>);
    $(".timezone_id").val(<?=$timezone_id?>);
    $(".currency_id").val(<?=$currency_id?>);
-   <?php if($entity_name != 'admin' && $entity_name !='subadmin'){ ?>
+   <?php if ($entity_name != 'admin' && $entity_name != 'subadmin') { ?>
    document.getElementsByName("sweep_id")[0].selectedIndex = <?=1?>;
 
 	 $(".sweep_id").change(function(e){
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 			<div class="w-section inverse no-padding">
 				     <?php echo $form; ?>
 				     <?php
-					if(isset($validation_errors) && $validation_errors != ''){ ?>
+					if (isset($validation_errors) && $validation_errors != '') { ?>
 					    <script>
 						var ERR_STR = '<?php echo $validation_errors; ?>';
 						print_error(ERR_STR);

Please login to merge, or discard this patch.

astpp/application/modules/email/views/view_template_add_edit.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@
 block discarded – undo
 <? extend('master.php') ?>
-<?php error_reporting(E_ERROR);?>
+<?php error_reporting(E_ERROR); ?>
 <? startblock('extra_head') ?>
 
 <!--

Please login to merge, or discard this patch.

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,10 @@
 block discarded – undo
     <section class="slice color-three no-margin">
 	<div class="w-section inverse no-padding">
             <div style="color:red;margin-left: 60px;">
-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 
+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 
             </div>
             <?php echo $form; ?>
         </div>      

Please login to merge, or discard this patch.

web_interface/astpp/application/modules/email/models/email_model.php 3 patches

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -24,14 +24,14 @@  discard block
 block discarded – undo
 
 class Email_model extends CI_Model {
 
-    function Email_model() {
-        parent::__construct();
-    }
+	function Email_model() {
+		parent::__construct();
+	}
 
 /**
 For Email History show in Reseller login    
 **/
-    function get_email_list($flag, $start = 0, $limit = 0) {
+	function get_email_list($flag, $start = 0, $limit = 0) {
 	$account_data = $this->session->userdata("accountinfo");
 
 	$account_id = $account_data['id'];
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
 	}
 	if($account_type == 1){
 	  $this->db->where_in('reseller_id');
-          $this->db->select('id');
-          $email_address=$this->db->get('accounts');
+		  $this->db->select('id');
+		  $email_address=$this->db->get('accounts');
 
-          $email_address=$email_address->result_array();
+		  $email_address=$email_address->result_array();
 
 	  if(empty($email_address)){
 		$this->db->or_where('accountid',0);
@@ -54,43 +54,43 @@  discard block
 block discarded – undo
 		$this->db->where('reseller_id',$account_id);
 	  }
 	  }
-          $this->db_model->build_search('email_search_list');
-          if ($flag) {
-	       $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
-          } else {
-            $query = $this->db_model->countQuery("*", "mail_details",'');
-          }
-        return $query;
-    }
-    function add_email($add_array) {
-        $this->db->insert("mail_details", $add_array);
-        return true;
-    }
+		  $this->db_model->build_search('email_search_list');
+		  if ($flag) {
+		   $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
+		  } else {
+			$query = $this->db_model->countQuery("*", "mail_details",'');
+		  }
+		return $query;
+	}
+	function add_email($add_array) {
+		$this->db->insert("mail_details", $add_array);
+		return true;
+	}
 
-    function remove_email($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("mail_details");
-        return true;
-    }
+	function remove_email($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("mail_details");
+		return true;
+	}
 
 
-    function edit_email($data, $id) {
-        $this->db->where("id", $id);
-        $this->db->update("mail_details", $data);
-    }
+	function edit_email($data, $id) {
+		$this->db->where("id", $id);
+		$this->db->update("mail_details", $data);
+	}
    function customer_get_email_list($flag,$accountid, $start = 0, $limit = 0) {
 
 	  $this->db->where('accountid',$accountid);
-       	    if ($flag) {
-            $query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "mail_details", '');
-        }
+	   		if ($flag) {
+			$query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "mail_details", '');
+		}
 
 
-        return $query;
-    }
-    function get_email_client_data($data, $start = 0, $limit = 0){
+		return $query;
+	}
+	function get_email_client_data($data, $start = 0, $limit = 0){
 	if($data['type'] == ''){
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
 	}
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
 	}
 	
-        $query = $this->db_model->getSelect("email,id", "accounts", $where);
-        $query = $query->result_array();
+		$query = $this->db_model->getSelect("email,id", "accounts", $where);
+		$query = $query->result_array();
 	return $query;	
-    }
-    /*Mass mail*/
-    function multipal_email($data){
-       $mail_ids=explode(',',$data['to']);
+	}
+	/*Mass mail*/
+	function multipal_email($data){
+	   $mail_ids=explode(',',$data['to']);
 	foreach($mail_ids as $key=>$val)
 	{
 		if($val!='')
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
 				$account_info=$res_data[0];
 				$account_info['accountid']=$account_info['id'];
 			}
-		    $account_info['password'] = $this->common->decode($account_info['password']);	
-		    $this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
+			$account_info['password'] = $this->common->decode($account_info['password']);	
+			$this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
 		}
 	}
-        return true;
+		return true;
    }
 	/*************************************************************/
 }

Please login to merge, or discard this patch.

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -38,27 +38,27 @@  discard block
 block discarded – undo
 	$account_email = $account_data['email'];
 	$account_type = $account_data['type'];
 	
-	if($account_type == 0){
-		$this->db->where('accountid',$account_id);	
+	if ($account_type == 0) {
+		$this->db->where('accountid', $account_id);	
 	}
-	if($account_type == 1){
+	if ($account_type == 1) {
 	  $this->db->where_in('reseller_id');
           $this->db->select('id');
-          $email_address=$this->db->get('accounts');
+          $email_address = $this->db->get('accounts');
 
-          $email_address=$email_address->result_array();
+          $email_address = $email_address->result_array();
 
-	  if(empty($email_address)){
-		$this->db->or_where('accountid',0);
-	  }else{
-		$this->db->where('reseller_id',$account_id);
+	  if (empty($email_address)) {
+		$this->db->or_where('accountid', 0);
+	  } else {
+		$this->db->where('reseller_id', $account_id);
 	  }
 	  }
           $this->db_model->build_search('email_search_list');
           if ($flag) {
 	       $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
           } else {
-            $query = $this->db_model->countQuery("*", "mail_details",'');
+            $query = $this->db_model->countQuery("*", "mail_details", '');
           }
         return $query;
     }
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
         $this->db->where("id", $id);
         $this->db->update("mail_details", $data);
     }
-   function customer_get_email_list($flag,$accountid, $start = 0, $limit = 0) {
+   function customer_get_email_list($flag, $accountid, $start = 0, $limit = 0) {
 
-	  $this->db->where('accountid',$accountid);
+	  $this->db->where('accountid', $accountid);
        	    if ($flag) {
             $query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
         } else {
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
 
         return $query;
     }
-    function get_email_client_data($data, $start = 0, $limit = 0){
-	if($data['type'] == ''){
-		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
+    function get_email_client_data($data, $start = 0, $limit = 0) {
+	if ($data['type'] == '') {
+		$where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'deleted'=>'0');
 	}
-	else{
-		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
+	else {
+		$where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'type'=>$data['type'], 'deleted'=>'0');
 	}
 	
         $query = $this->db_model->getSelect("email,id", "accounts", $where);
@@ -103,29 +103,29 @@  discard block
 block discarded – undo
 	return $query;	
     }
     /*Mass mail*/
-    function multipal_email($data){
-       $mail_ids=explode(',',$data['to']);
-	foreach($mail_ids as $key=>$val)
+    function multipal_email($data) {
+       $mail_ids = explode(',', $data['to']);
+	foreach ($mail_ids as $key=>$val)
 	{
-		if($val!='')
+		if ($val != '')
 		{
-			$template_type['message']=$data['template'];
-			$template_type['subject']=$data['subject'];
-			$act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val,"deleted"=>0));
-			$count=$act_details->num_rows();
-			$account_info=array();
-			if($count<=0)
+			$template_type['message'] = $data['template'];
+			$template_type['subject'] = $data['subject'];
+			$act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val, "deleted"=>0));
+			$count = $act_details->num_rows();
+			$account_info = array();
+			if ($count <= 0)
 			{
-				$account_info['email']=$val;
-				$account_info['accountid']='0';
+				$account_info['email'] = $val;
+				$account_info['accountid'] = '0';
 			}
-			else{
+			else {
 				$res_data = $act_details->result_array();
-				$account_info=$res_data[0];
-				$account_info['accountid']=$account_info['id'];
+				$account_info = $res_data[0];
+				$account_info['accountid'] = $account_info['id'];
 			}
 		    $account_info['password'] = $this->common->decode($account_info['password']);	
-		    $this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
+		    $this->email_lib->send_email($template_type, $account_info, '', $data['file'], 0, 1);
 		}
 	}
         return true;

Please login to merge, or discard this patch.

Braces +3 added lines, -5 removed lines patch added patch discarded remove patch

@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 
 	  if(empty($email_address)){
 		$this->db->or_where('accountid',0);
-	  }else{
+	  } else{
 		$this->db->where('reseller_id',$account_id);
 	  }
 	  }
@@ -93,8 +93,7 @@  discard block
 block discarded – undo
     function get_email_client_data($data, $start = 0, $limit = 0){
 	if($data['type'] == ''){
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
-	}
-	else{
+	} else{
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
 	}
 	
@@ -118,8 +117,7 @@  discard block
 block discarded – undo
 			{
 				$account_info['email']=$val;
 				$account_info['accountid']='0';
-			}
-			else{
+			} else{
 				$res_data = $act_details->result_array();
 				$account_info=$res_data[0];
 				$account_info['accountid']=$account_info['id'];

Please login to merge, or discard this patch.

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

		@@ -21,62 +21,62 @@
		block discarded – undo
21	21	# along with this program. If not, see <http://www.gnu.org/licenses/>.
22	22	###############################################################################
23	23	if (!defined('BASEPATH'))
24		- exit('No direct script access allowed');
	24	+ exit('No direct script access allowed');
25	25
26	26	class Taxes_form {
27	27	function __construct() {
28		- $this->CI = & get_instance();
29		- }
30		- function get_taxes_form_fields() {
31		- $form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));
32		- $form['Tax Information'] = array(
33		- array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
34		- array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
35		- array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim\|required\|numeric', 'tOOL TIP', ''),
36		- array('Amount', 'INPUT', array('name' => 'taxes_amount', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim\|required\|numeric\|xss_clean', 'tOOL TIP', ''),
37		- array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim\|numeric\|xss_clean', 'tOOL TIP', ''),
38		- array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),
	28	+ $this->CI = & get_instance();
	29	+ }
	30	+ function get_taxes_form_fields() {
	31	+ $form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));
	32	+ $form['Tax Information'] = array(
	33	+ array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
	34	+ array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
	35	+ array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim\|required\|numeric', 'tOOL TIP', ''),
	36	+ array('Amount', 'INPUT', array('name' => 'taxes_amount', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim\|required\|numeric\|xss_clean', 'tOOL TIP', ''),
	37	+ array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim\|numeric\|xss_clean', 'tOOL TIP', ''),
	38	+ array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),
39	39
40		- );
41		- $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');
42		- $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\')');
43		- return $form;
44		- }
	40	+ );
	41	+ $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');
	42	+ $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\')');
	43	+ return $form;
	44	+ }
45	45
46		- function get_search_taxes_form() {
47		- $form['forms'] = array("", array('id' => "taxes_search"));
48		- $form['Search'] = array(
49		- 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', ''),
50		- 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', ''),
51		- 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', '', '', ''),
52		- array('', 'HIDDEN', 'advance_search', '1', '', '', '')
53		- );
54		- $form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
55		- $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');
56		- return $form;
57		- }
	46	+ function get_search_taxes_form() {
	47	+ $form['forms'] = array("", array('id' => "taxes_search"));
	48	+ $form['Search'] = array(
	49	+ 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', ''),
	50	+ 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', ''),
	51	+ 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', '', '', ''),
	52	+ array('', 'HIDDEN', 'advance_search', '1', '', '', '')
	53	+ );
	54	+ $form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
	55	+ $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');
	56	+ return $form;
	57	+ }
58	58
59		- function build_taxes_list_for_admin() {
	59	+ function build_taxes_list_for_admin() {
60	60	$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
61	61	$currency_id=$account_info['currency_id'];
62	62	$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
63		- $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
64		- array("Name", "270", "taxes_description", "", "", "","","true","center"),
65		- array("Priority", "145", "taxes_priority", "", "", "","","true","center"),
66		- array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),
67		- array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),
68		- array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),
	63	+ $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
	64	+ array("Name", "270", "taxes_description", "", "", "","","true","center"),
	65	+ array("Priority", "145", "taxes_priority", "", "", "","","true","center"),
	66	+ array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),
	67	+ array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),
	68	+ array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),
69	69	array("Action", "175", "", "", "", array("EDIT" => array("url" => "taxes/taxes_edit/", "mode" => "popup"),
70		- "DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))
71		- ));
72		- return $grid_field_arr;
73		- }
	70	+ "DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))
	71	+ ));
	72	+ return $grid_field_arr;
	73	+ }
74	74
75		- function build_grid_buttons() {
76		- $buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),
77		- array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));
78		- return $buttons_json;
79		- }
	75	+ function build_grid_buttons() {
	76	+ $buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),
	77	+ array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));
	78	+ return $buttons_json;
	79	+ }
80	80
81	81	}
82	82

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	# You should have received a copy of the GNU Affero General Public License
21	21	# along with this program. If not, see <http://www.gnu.org/licenses/>.
22	22	###############################################################################
23		-if (!defined('BASEPATH'))
	23	+if ( ! defined('BASEPATH'))
24	24	exit('No direct script access allowed');
25	25
26	26	class Taxes_form {
		@@ -28,13 +28,13 @@ discard block
		block discarded – undo
28	28	$this->CI = & get_instance();
29	29	}
30	30	function get_taxes_form_fields() {
31		- $form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));
	31	+ $form['forms'] = array(base_url().'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));
32	32	$form['Tax Information'] = array(
33	33	array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
34		- array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
	34	+ array('Name', 'INPUT', array('name' => 'taxes_description', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
35	35	array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim\|required\|numeric', 'tOOL TIP', ''),
36	36	array('Amount', 'INPUT', array('name' => 'taxes_amount', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim\|required\|numeric\|xss_clean', 'tOOL TIP', ''),
37		- array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim\|numeric\|xss_clean', 'tOOL TIP', ''),
	37	+ array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim\|numeric\|xss_clean', 'tOOL TIP', ''),
38	38	array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_status'),
39	39
40	40	);
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	$form['Search'] = array(
49	49	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', ''),
50	50	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', ''),
51		- 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', '', '', ''),
	51	+ 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', '', '', ''),
52	52	array('', 'HIDDEN', 'advance_search', '1', '', '', '')
53	53	);
54	54	$form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');
		@@ -58,14 +58,14 @@ discard block
		block discarded – undo
58	58
59	59	function build_taxes_list_for_admin() {
60	60	$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
61		- $currency_id=$account_info['currency_id'];
62		- $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
63		- $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),
64		- array("Name", "270", "taxes_description", "", "", "","","true","center"),
65		- array("Priority", "145", "taxes_priority", "", "", "","","true","center"),
66		- array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),
67		- array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),
68		- array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),
	61	+ $currency_id = $account_info['currency_id'];
	62	+ $currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
	63	+ $grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),
	64	+ array("Name", "270", "taxes_description", "", "", "", "", "true", "center"),
	65	+ array("Priority", "145", "taxes_priority", "", "", "", "", "true", "center"),
	66	+ array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency", "", "true", "right"),
	67	+ array("Rate(%)", "230", "taxes_rate", "", "", "", "", "true", "right"),
	68	+ array("Status", "160", "status", "status", "taxes", "get_status", "", "true", "center"),
69	69	array("Action", "175", "", "", "", array("EDIT" => array("url" => "taxes/taxes_edit/", "mode" => "popup"),
70	70	"DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))
71	71	));
		@@ -73,8 +73,8 @@ discard block
		block discarded – undo
73	73	}
74	74
75	75	function build_grid_buttons() {
76		- $buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),
77		- array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));
	76	+ $buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/taxes/taxes_add/", "popup"),
	77	+ array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));
78	78	return $buttons_json;
79	79	}
80	80

		@@ -22,8 +22,9 @@
		block discarded – undo
22	22	# along with this program. If not, see <http://www.gnu.org/licenses/>.
23	23	###############################################################################
24	24
25		-if (!defined('BASEPATH'))
26		- exit('No direct script access allowed');
	25	+if (!defined('BASEPATH')) {
	26	+ exit('No direct script access allowed');
	27	+}
27	28
28	29	class Package_form {
29	30

		@@ -22,46 +22,46 @@
		block discarded – undo
22	22	###############################################################################
23	23	class Taxes_model extends CI_Model {
24	24
25		- function Taxes_model() {
26		- parent::__construct();
27		- }
	25	+ function Taxes_model() {
	26	+ parent::__construct();
	27	+ }
28	28
29		- function get_taxes_list($flag, $start = 0, $limit = 0) {
30		- $this->db_model->build_search('taxes_list_search');
31		- if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
32		- $where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
33		- }else{
34		- $where =array("reseller_id"=>0);
35		- }
36		- if ($flag) {
37		- $query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
38		- } else {
39		- $query = $this->db_model->countQuery("*", "taxes", $where);
40		- }
41		- return $query;
42		- }
	29	+ function get_taxes_list($flag, $start = 0, $limit = 0) {
	30	+ $this->db_model->build_search('taxes_list_search');
	31	+ if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
	32	+ $where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
	33	+ }else{
	34	+ $where =array("reseller_id"=>0);
	35	+ }
	36	+ if ($flag) {
	37	+ $query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
	38	+ } else {
	39	+ $query = $this->db_model->countQuery("*", "taxes", $where);
	40	+ }
	41	+ return $query;
	42	+ }
43	43
44		- function add_tax($data) {
45		- unset($data["action"]);
46		- $data["creation_date"] = date("Y-m-d H:i:s");
47		- if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
	44	+ function add_tax($data) {
	45	+ unset($data["action"]);
	46	+ $data["creation_date"] = date("Y-m-d H:i:s");
	47	+ if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
48	48	$data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
49		- }else{
	49	+ }else{
50	50	$data['reseller_id'] =0;
51		- }
52		- $this->db->insert("taxes", $data);
53		- }
	51	+ }
	52	+ $this->db->insert("taxes", $data);
	53	+ }
54	54
55		- function edit_tax($data, $id) {
56		- unset($data["action"]);
57		- $data["last_modified_date"] = date("Y-m-d H:i:s");
58		- $this->db->where("id", $id);
59		- $this->db->update("taxes", $data);
60		- }
	55	+ function edit_tax($data, $id) {
	56	+ unset($data["action"]);
	57	+ $data["last_modified_date"] = date("Y-m-d H:i:s");
	58	+ $this->db->where("id", $id);
	59	+ $this->db->update("taxes", $data);
	60	+ }
61	61
62		- function remove_taxes($id) {
63		- $this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
64		- return $this->db->delete("taxes",array('id'=>$id));
65		- }
	62	+ function remove_taxes($id) {
	63	+ $this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
	64	+ return $this->db->delete("taxes",array('id'=>$id));
	65	+ }
66	66
67	67	}

		@@ -30,8 +30,8 @@ discard block
		block discarded – undo
30	30	$this->db_model->build_search('taxes_list_search');
31	31	if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
32	32	$where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
33		- }else{
34		- $where =array("reseller_id"=>0);
	33	+ } else {
	34	+ $where = array("reseller_id"=>0);
35	35	}
36	36	if ($flag) {
37	37	$query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
		@@ -46,8 +46,8 @@ discard block
		block discarded – undo
46	46	$data["creation_date"] = date("Y-m-d H:i:s");
47	47	if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
48	48	$data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
49		- }else{
50		- $data['reseller_id'] =0;
	49	+ } else {
	50	+ $data['reseller_id'] = 0;
51	51	}
52	52	$this->db->insert("taxes", $data);
53	53	}
		@@ -60,8 +60,8 @@ discard block
		block discarded – undo
60	60	}
61	61
62	62	function remove_taxes($id) {
63		- $this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
64		- return $this->db->delete("taxes",array('id'=>$id));
	63	+ $this->db->delete('taxes_to_accounts', array('taxes_id'=>$id));
	64	+ return $this->db->delete("taxes", array('id'=>$id));
65	65	}
66	66
67	67	}

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	$this->db_model->build_search('taxes_list_search');
31	31	if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
32	32	$where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
33		- }else{
	33	+ } else{
34	34	$where =array("reseller_id"=>0);
35	35	}
36	36	if ($flag) {
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	$data["creation_date"] = date("Y-m-d H:i:s");
47	47	if ($this->session->userdata('logintype') == 1 \|\| $this->session->userdata('logintype') == 5) {
48	48	$data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
49		- }else{
	49	+ } else{
50	50	$data['reseller_id'] =0;
51	51	}
52	52	$this->db->insert("taxes", $data);

		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	$this->load->library('csvreader');
37	37	$this->load->library('astpp/email_lib');
38	38	if ($this->session->userdata('user_login') == FALSE)
39		- redirect(base_url() . '/astpp/login');
	39	+ redirect(base_url().'/astpp/login');
40	40	}
41	41
42	42	function email_edit($edit_id = '') {
		@@ -56,9 +56,9 @@ discard block
		block discarded – undo
56	56	$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $edit_data);
57	57	$this->load->view('view_email_add_edit', $data);
58	58	} else {
59		- redirect(base_url() . 'email/email_history_list/');
	59	+ redirect(base_url().'email/email_history_list/');
60	60	}
61		- redirect(base_url() . 'email/email_history_list/');
	61	+ redirect(base_url().'email/email_history_list/');
62	62	}
63	63
64	64	function email_resend() {
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	foreach ($account->result_array() as $key => $value) {
79	79	$edit_data = $value;
80	80	}
81		- $add_array=array('accountid'=>$edit_data['accountid'],
	81	+ $add_array = array('accountid'=>$edit_data['accountid'],
82	82	'subject'=>$add_array['subject'],
83	83	'body'=>$add_array['body'],
84	84	'from'=>$edit_data['from'],
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	$this->email_re_send($add_array);
92	92
93	93	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
94		- redirect(base_url() . 'email/email_history_list/');
	94	+ redirect(base_url().'email/email_history_list/');
95	95	}
96	96	function email_resend_edit($edit_id = '') {
97	97	$data['page_title'] = 'Resend Email';
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106
107	107	$this->load->view('view_email_add_edit', $data);
108	108	} else {
109		- redirect(base_url() . 'email/email_history_list/');
	109	+ redirect(base_url().'email/email_history_list/');
110	110	}
111	111
112	112	}
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123
124	124	$this->load->view('view_email_add_edit', $data);
125	125	} else {
126		- redirect(base_url() . 'email/email_history_list/');
	126	+ redirect(base_url().'email/email_history_list/');
127	127	}
128	128
129	129	}
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	foreach ($account->result_array() as $key => $value) {
137	137	$edit_data = $value;
138	138	}
139		- $add_array=array('accountid'=>$edit_data['accountid'],
	139	+ $add_array = array('accountid'=>$edit_data['accountid'],
140	140	'subject'=>$add_array['subject'],
141	141	'body'=>$add_array['body'],
142	142	'from'=>$edit_data['from'],
		@@ -146,11 +146,11 @@ discard block
		block discarded – undo
146	146	'attachment'=>$edit_data['attachment'],
147	147	);
148	148	$this->email_model->add_email($add_array);
149		- $this->email_lib->send_email('',$add_array,'','',1);
	149	+ $this->email_lib->send_email('', $add_array, '', '', 1);
150	150
151	151	$this->load->module('accounts/accounts');
152	152	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
153		- redirect(base_url() . 'accounts/customer_edit/'.$value["accountid"]);
	153	+ redirect(base_url().'accounts/customer_edit/'.$value["accountid"]);
154	154	}
155	155	function email_add($type = "") {
156	156
		@@ -189,9 +189,9 @@ discard block
		block discarded – undo
189	189	}
190	190	}
191	191	function email_re_send($edit_data) {
192		- $this->email_lib->send_email('',$edit_data,'',$edit_data['attachment'],1);
	192	+ $this->email_lib->send_email('', $edit_data, '', $edit_data['attachment'], 1);
193	193	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
194		- redirect(base_url() . '/email/email_history_list/');
	194	+ redirect(base_url().'/email/email_history_list/');
195	195	}
196	196	function email_view($edit_id = '') {
197	197	$data['page_title'] = 'View Email';
		@@ -201,16 +201,16 @@ discard block
		block discarded – undo
201	201	foreach ($account->result_array() as $key => $value) {
202	202	$edit_data = $value;
203	203	}
204		- if($edit_data['status'] == 1){
205		- $edit_data['status']='Not Sent';
206		- }else{
207		- $edit_data['status']='Sent';
	204	+ if ($edit_data['status'] == 1) {
	205	+ $edit_data['status'] = 'Not Sent';
	206	+ } else {
	207	+ $edit_data['status'] = 'Sent';
208	208	}
209	209	$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
210	210
211	211	$this->load->view('view_email_add_edit', $data);
212	212	} else {
213		- redirect(base_url() . 'email/email_history_list/');
	213	+ redirect(base_url().'email/email_history_list/');
214	214	}
215	215	}
216	216	function email_view_customer($edit_id = '') {
		@@ -224,141 +224,141 @@ discard block
		block discarded – undo
224	224	$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus(), $edit_data);
225	225	$this->load->view('view_email_add_edit', $data);
226	226	} else {
227		- redirect(base_url() . 'email/email_history_list/'.$edit_id);
	227	+ redirect(base_url().'email/email_history_list/'.$edit_id);
228	228	}
229	229	}
230	230	function email_delete($id) {
231	231	$this->email_model->remove_email($id);
232	232	$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
233		- redirect(base_url() . '/email/email_history_list/');
	233	+ redirect(base_url().'/email/email_history_list/');
234	234	}
235		- function email_delete_customer($accounttype,$accountid,$id) {
	235	+ function email_delete_customer($accounttype, $accountid, $id) {
236	236	$this->email_model->remove_email($id);
237	237	$where = array('id' => $id);
238	238	$account = $this->db_model->getSelect("*", "mail_details", $where);
239	239	foreach ($account->result_array() as $key => $value) {
240	240	$edit_data = $value;
241	241	}
242		- $url ="accounts/".$accounttype."_emailhistory/$accountid/";
	242	+ $url = "accounts/".$accounttype."_emailhistory/$accountid/";
243	243	$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
244	244	$this->load->module('accounts/accounts');
245		- redirect(base_url() . $url);
	245	+ redirect(base_url().$url);
246	246	}
247	247	function email_mass() {
248	248	$account_data = $this->session->userdata("accountinfo");
249		- if ($account_data['type'] == '1' \|\| $account_data['type']== 0 \|\| $account_data['type']==3)
250		- redirect(base_url() . '/astpp/dashboard/');
	249	+ if ($account_data['type'] == '1' \|\| $account_data['type'] == 0 \|\| $account_data['type'] == 3)
	250	+ redirect(base_url().'/astpp/dashboard/');
251	251	$data['username'] = $this->session->userdata('user_name');
252	252	$data['page_title'] = 'Email Mass';
253	253	$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
254		- $this->load->view('view_email_client_area',$data);
	254	+ $this->load->view('view_email_client_area', $data);
255	255	}
256	256	/Mass Email/
257		- function attachment_icons($select = "", $table = "", $attachement="") {
258		- if($attachement!="")
	257	+ function attachment_icons($select = "", $table = "", $attachement = "") {
	258	+ if ($attachement != "")
259	259	{
260		- $array=explode(",", $attachement);
261		- $str='';
262		- foreach($array as $key =>$val){
263		- $link = base_url() . "email/email_history_list_attachment/".$val;
264		- $str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>  ";
	260	+ $array = explode(",", $attachement);
	261	+ $str = '';
	262	+ foreach ($array as $key =>$val) {
	263	+ $link = base_url()."email/email_history_list_attachment/".$val;
	264	+ $str .= "<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>  ";
265	265	}
266	266	return $str;
267	267	}
268		- else{
	268	+ else {
269	269	return "";
270	270	}
271	271	}
272	272	function email_client_get()
273	273	{
274		- $files=$_FILES;
	274	+ $files = $_FILES;
275	275	$add_array = $this->input->post();
276	276	$add_array['page_title'] = 'Compose email';
277		- $nooffile= $files['file']['name'];
278		- $count=count($nooffile);
279		- $add_array['attachment']='';
280		- $add_array['file']='';
281		- for($i=0;$i<$count;$i++){
282		- $tmp_name[]= $files['file']['tmp_name'][$i];
283		- if($files['file']['error'][$i]==0){
	277	+ $nooffile = $files['file']['name'];
	278	+ $count = count($nooffile);
	279	+ $add_array['attachment'] = '';
	280	+ $add_array['file'] = '';
	281	+ for ($i = 0; $i < $count; $i++) {
	282	+ $tmp_name[] = $files['file']['tmp_name'][$i];
	283	+ if ($files['file']['error'][$i] == 0) {
284	284	$cur_name = $files['file']['name'][$i];
285	285	$parts = explode(".", $cur_name);
286		- $add_array['attachment'].=date('ymdhis').$i.'.'.$parts[1].',';
287		- $add_array['file'].=date('ymdhis').$i.'.'.$parts[1].',';
	286	+ $add_array['attachment'] .= date('ymdhis').$i.'.'.$parts[1].',';
	287	+ $add_array['file'] .= date('ymdhis').$i.'.'.$parts[1].',';
288	288	$uploadedFile1 = $files['file']['tmp_name'][$i];
289		- $user_name='inextrix';
290		- $actual_file_name=date('ymdhis').$i.'.'.$parts[1];
291		- $dir_path= getcwd()."/attachments/";
292		- $path =$dir_path.$actual_file_name;
293		- if (move_uploaded_file($uploadedFile1,$path)) {
	289	+ $user_name = 'inextrix';
	290	+ $actual_file_name = date('ymdhis').$i.'.'.$parts[1];
	291	+ $dir_path = getcwd()."/attachments/";
	292	+ $path = $dir_path.$actual_file_name;
	293	+ if (move_uploaded_file($uploadedFile1, $path)) {
294	294	$this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
295	295	}
296		- else{
	296	+ else {
297	297	$this->session->set_flashdata('astpp_errormsg', 'Please try again !');
298	298	}
299	299	}
300	300	}
301		- $add_array['attachment']=trim($add_array['attachment'],',');
302		- $add_array['file']=trim($add_array['file'],',');
303		- $add_array['email']= explode(",",$add_array['to']);
	301	+ $add_array['attachment'] = trim($add_array['attachment'], ',');
	302	+ $add_array['file'] = trim($add_array['file'], ',');
	303	+ $add_array['email'] = explode(",", $add_array['to']);
304	304	$this->email_model->multipal_email($add_array);
305	305	$screen_path = getcwd()."/cron";
306	306	$screen_filename = "Email_Broadcast_".strtotime('now');
307	307	$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S $screen_filename php cron.php BroadcastEmail";
308	308	exec($command);
309	309	$this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
310		- redirect(base_url() . 'email/email_history_list/');
	310	+ redirect(base_url().'email/email_history_list/');
311	311	exit;
312	312	}
313	313
314	314	function email_client_area() {
315	315	$add_array = $this->input->post();
316		- if($add_array['temp'] == ''){
	316	+ if ($add_array['temp'] == '') {
317	317	$subject = '';
318		- $body ='';
	318	+ $body = '';
319	319	}
320		- else{
	320	+ else {
321	321	$where = array('id' => $add_array['temp']);
322	322	$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
323		- $account_data =$account->result_array();
324		- $subject = isset($account_data[0]['subject'])?$account_data[0]['subject']:'';
325		- $body = isset($account_data[0]['template'])?$account_data[0]['template']:'';
	323	+ $account_data = $account->result_array();
	324	+ $subject = isset($account_data[0]['subject']) ? $account_data[0]['subject'] : '';
	325	+ $body = isset($account_data[0]['template']) ? $account_data[0]['template'] : '';
326	326
327	327
328	328	}
329	329	$count_all = $this->email_model->get_email_client_data($add_array);
330	330	$email_arr = array();
331	331	$id_arr = array();
332		- foreach($count_all as $key=>$value){
	332	+ foreach ($count_all as $key=>$value) {
333	333	$value = $value;
334		- if($value['email']!=''){
335		- $email_arr[$value['email']]= $value['email'];
336		- $id_arr[]= $value['id'];}
	334	+ if ($value['email'] != '') {
	335	+ $email_arr[$value['email']] = $value['email'];
	336	+ $id_arr[] = $value['id']; }
337	337	}
338	338	if (empty($email_arr))
339	339	{
340	340	$this->session->set_flashdata('astpp_notification', 'No record found! ');
341		- redirect(base_url() . 'email/email_mass/');
	341	+ redirect(base_url().'email/email_mass/');
342	342	}
343	343	$to_email = $email_arr;
344	344
345	345	$to_id = $id_arr;
346		- $to_send_mail = implode(",",$to_email);
347		- if($to_send_mail != ''){
348		- $add_arr['email']= $email_arr;
	346	+ $to_send_mail = implode(",", $to_email);
	347	+ if ($to_send_mail != '') {
	348	+ $add_arr['email'] = $email_arr;
349	349	}
350	350	$data['username'] = $this->session->userdata('user_name');
351	351	$data['page_title'] = 'Compose Email';
352	352	$send_id = $this->db_model->getSelect("emailaddress", "invoice_conf", array());
353		- $send_id =$send_id->result_array();
354		- $send_id =$send_id[0]['emailaddress'];
	353	+ $send_id = $send_id->result_array();
	354	+ $send_id = $send_id[0]['emailaddress'];
355	355	$add_arr['template'] = $body;
356	356	$add_arr['subject'] = $subject;
357	357	$add_arr['accountid'] = $id_arr;
358	358	$add_arr['from'] = $send_id;
359	359	$add_arr['temp'] = $add_array['temp'];
360		- $add_arr['to']=$to_send_mail;
361		- $add_arr['temp']=$add_array['temp'];
	360	+ $add_arr['to'] = $to_send_mail;
	361	+ $add_arr['temp'] = $add_array['temp'];
362	362	$this->load->view('view_email_brod', $add_arr);
363	363	}
364	364
		@@ -371,10 +371,10 @@ discard block
		block discarded – undo
371	371	$edit_data = $value;
372	372	}
373	373	$this->load->module('accounts/accounts');
374		- redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
	374	+ redirect(base_url().'accounts/customer_edit/'.$value['accountid']);
375	375	}
376	376	function email_history_list() {
377		- $data['logintype']=$this->session->userdata('logintype');
	377	+ $data['logintype'] = $this->session->userdata('logintype');
378	378	$data['username'] = $this->session->userdata('user_name');
379	379	$data['search_flag'] = true;
380	380	$this->session->set_userdata('advance_search', 0);
		@@ -385,7 +385,7 @@ discard block
		block discarded – undo
385	385	$this->load->view('view_email_list', $data);
386	386	}
387	387	function email_history_list_json() {
388		- $data['logintype']=$this->session->userdata('logintype');
	388	+ $data['logintype'] = $this->session->userdata('logintype');
389	389	$json_data = array();
390	390	$count_all = $this->email_model->get_email_list(false);
391	391	$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
		@@ -396,13 +396,13 @@ discard block
		block discarded – undo
396	396	echo json_encode($json_data);
397	397	}
398	398
399		- function customer_mail_record($accountid,$accounttype){
	399	+ function customer_mail_record($accountid, $accounttype) {
400	400	$json_data = array();
401		- $count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
	401	+ $count_all = $this->email_model->customer_get_email_list(false, $accountid, "", "");
402	402	$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
403	403	$json_data = $paging_data["json_paging"];
404		- $query = $this->email_model->customer_get_email_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
405		- $grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid,$accounttype));
	404	+ $query = $this->email_model->customer_get_email_list(true, $accountid, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
	405	+ $grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid, $accounttype));
406	406	$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
407	407	echo json_encode($json_data);
408	408	}
		@@ -413,11 +413,11 @@ discard block
		block discarded – undo
413	413	echo $this->db->delete("email");
414	414	}
415	415
416		- function email_send_multipal(){
	416	+ function email_send_multipal() {
417	417	$add_array = $this->input->post();
418		- if($add_array['email'] == '' \|\| $add_array['subject'] == '' \|\| $add_array['template'] == ''){
	418	+ if ($add_array['email'] == '' \|\| $add_array['subject'] == '' \|\| $add_array['template'] == '') {
419	419	$this->session->set_flashdata('astpp_notification', 'Email address not found!');
420		- redirect(base_url() . '/email/email_client_area/');
	420	+ redirect(base_url().'/email/email_client_area/');
421	421	}
422	422	$this->email_model->multipal_email($add_array);
423	423	$screen_path = "/var/www/html/ITPLATP/cron";
		@@ -425,7 +425,7 @@ discard block
		block discarded – undo
425	425	$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S $screen_filename php cron.php BroadcastEmail";
426	426	exec($command);
427	427	$this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
428		- redirect(base_url() . 'email/email_history_list/');
	428	+ redirect(base_url().'email/email_history_list/');
429	429
430	430	}
431	431	function email_history_list_search() {
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	$this->session->set_userdata('email_search_list', $action);
440	440	}
441	441	if (@$ajax_search != 1) {
442		- redirect(base_url() . 'email/email_history_list/');
	442	+ redirect(base_url().'email/email_history_list/');
443	443	}
444	444	}
445	445
		@@ -452,7 +452,7 @@ discard block
		block discarded – undo
452	452	* Version 2.1
453	453	*/
454	454	function email_history_list_attachment($file_name) {
455		- if(file_exists(getcwd().'/attachments/'.$file_name)){
	455	+ if (file_exists(getcwd().'/attachments/'.$file_name)) {
456	456	header('Content-Type: application/octet-stream');
457	457	header('Content-Disposition: attachment; filename='.$file_name);
458	458	ob_clean();

		@@ -35,8 +35,9 @@ discard block
		block discarded – undo
35	35	$this->load->model('email_model');
36	36	$this->load->library('csvreader');
37	37	$this->load->library('astpp/email_lib');
38		- if ($this->session->userdata('user_login') == FALSE)
39		- redirect(base_url() . '/astpp/login');
	38	+ if ($this->session->userdata('user_login') == FALSE) {
	39	+ redirect(base_url() . '/astpp/login');
	40	+ }
40	41	}
41	42
42	43	function email_edit($edit_id = '') {
		@@ -203,7 +204,7 @@ discard block
		block discarded – undo
203	204	}
204	205	if($edit_data['status'] == 1){
205	206	$edit_data['status']='Not Sent';
206		- }else{
	207	+ } else{
207	208	$edit_data['status']='Sent';
208	209	}
209	210	$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
		@@ -246,8 +247,9 @@ discard block
		block discarded – undo
246	247	}
247	248	function email_mass() {
248	249	$account_data = $this->session->userdata("accountinfo");
249		- if ($account_data['type'] == '1' \|\| $account_data['type']== 0 \|\| $account_data['type']==3)
250		- redirect(base_url() . '/astpp/dashboard/');
	250	+ if ($account_data['type'] == '1' \|\| $account_data['type']== 0 \|\| $account_data['type']==3) {
	251	+ redirect(base_url() . '/astpp/dashboard/');
	252	+ }
251	253	$data['username'] = $this->session->userdata('user_name');
252	254	$data['page_title'] = 'Email Mass';
253	255	$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
		@@ -264,8 +266,7 @@ discard block
		block discarded – undo
264	266	$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>  ";
265	267	}
266	268	return $str;
267		- }
268		- else{
	269	+ } else{
269	270	return "";
270	271	}
271	272	}
		@@ -292,8 +293,7 @@ discard block
		block discarded – undo
292	293	$path =$dir_path.$actual_file_name;
293	294	if (move_uploaded_file($uploadedFile1,$path)) {
294	295	$this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
295		- }
296		- else{
	296	+ } else{
297	297	$this->session->set_flashdata('astpp_errormsg', 'Please try again !');
298	298	}
299	299	}
		@@ -316,8 +316,7 @@ discard block
		block discarded – undo
316	316	if($add_array['temp'] == ''){
317	317	$subject = '';
318	318	$body ='';
319		- }
320		- else{
	319	+ } else{
321	320	$where = array('id' => $add_array['temp']);
322	321	$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
323	322	$account_data =$account->result_array();

		@@ -22,8 +22,9 @@ discard block
		block discarded – undo
22	22	# along with this program. If not, see <http://www.gnu.org/licenses/>.
23	23	###############################################################################
24	24
25		-if (!defined('BASEPATH'))
26		- exit('No direct script access allowed');
	25	+if (!defined('BASEPATH')) {
	26	+ exit('No direct script access allowed');
	27	+}
27	28
28	29	class Email_form {
29	30	function __construct($library_name = '') {
		@@ -153,7 +154,7 @@ discard block
		block discarded – undo
153	154	$account_data = $this->CI->session->userdata("accountinfo");
154	155	$loginid = $account_data['id'];
155	156
156		- }else{
	157	+ } else{
157	158	$loginid = "0";
158	159	}
159	160	$form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));
		@@ -176,8 +177,7 @@ discard block
		block discarded – undo
176	177	function get_form_fields_email_view_client($add_arr) {
177	178	if($add_arr['type'] == ''){
178	179	$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');
179		- }
180		- else{
	180	+ } else{
181	181	$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');
182	182	}
183	183

		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	<!--***************************************************************-->
47	47
48	48
49		- <script type="text/javascript" src="<?php echo base_url();?>assets/markup/markitup/sets/default/set.js"></script>
	49	+ <script type="text/javascript" src="<?php echo base_url(); ?>assets/markup/markitup/sets/default/set.js"></script>
50	50	<script type="text/javascript">
51	51	$(function() {
52	52	$('#template').markItUp(mySettings);
		@@ -236,7 +236,7 @@ discard block
		block discarded – undo
236	236	<div class="container">
237	237	<form method="post" action="<?= base_url()?>email/email_client_get/" enctype="multipart/form-data" name="myform" id="myform" onsubmit="return(regvalidate())">
238	238	<span style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
239		- <? if(isset($error) && !empty($error)) {
	239	+ <? if (isset($error) && ! empty($error)) {
240	240	echo $error;
241	241	}?>
242	242	</span>

		@@ -27,15 +27,15 @@
		block discarded – undo
27	27	<?php echo $form; ?>
28	28	</div>
29	29	<?php if(isset($maildata) && $maildata != ''){
30		- echo "<div class='col-md-12 no-padding'>Attachments :</div>";
31		- $imgArr = explode(",",$maildata);
32		- foreach($imgArr as $key => $imgname){
33		- $imgpath = base_url()."email/email_history_list_attachment/".$imgname;
34		- echo "<div class='col-md-4 no-padding'>
	30	+ echo "<div class='col-md-12 no-padding'>Attachments :</div>";
	31	+ $imgArr = explode(",",$maildata);
	32	+ foreach($imgArr as $key => $imgname){
	33	+ $imgpath = base_url()."email/email_history_list_attachment/".$imgname;
	34	+ echo "<div class='col-md-4 no-padding'>
35	35	<a href='".$imgpath."'>".$imgname."</a>
36	36	</div>";
37		- }
38		- } ?>
	37	+ }
	38	+ } ?>
39	39	</section>
40	40	</div>
41	41	</div>

		@@ -26,10 +26,10 @@
		block discarded – undo
26	26	</div>
27	27	<?php echo $form; ?>
28	28	</div>
29		- <?php if(isset($maildata) && $maildata != ''){
	29	+ <?php if (isset($maildata) && $maildata != '') {
30	30	echo "<div class='col-md-12 no-padding'>Attachments :</div>";
31		- $imgArr = explode(",",$maildata);
32		- foreach($imgArr as $key => $imgname){
	31	+ $imgArr = explode(",", $maildata);
	32	+ foreach ($imgArr as $key => $imgname) {
33	33	$imgpath = base_url()."email/email_history_list_attachment/".$imgname;
34	34	echo "<div class='col-md-4 no-padding'>
35	35	<a href='".$imgpath."'>".$imgname."</a>

		@@ -20,7 +20,10 @@
		block discarded – undo
20	20	<section class="slice color-three no-margin">
21	21	<div class="w-section inverse no-padding">
22	22	<div style="color:red;margin-left: 60px;">
23		- <?php if (isset($validation_errors)) echo $validation_errors; ?>
	23	+ <?php if (isset($validation_errors)) {
	24	+ echo $validation_errors;
	25	+}
	26	+?>
24	27	</div>
25	28	<?php echo $form; ?>
26	29	</div>

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	$(".country_id").val(<?=$country_id?>);
7	7	$(".timezone_id").val(<?=$timezone_id?>);
8	8	$(".currency_id").val(<?=$currency_id?>);
9		- <?php if($entity_name != 'admin' && $entity_name !='subadmin'){ ?>
	9	+ <?php if ($entity_name != 'admin' && $entity_name != 'subadmin') { ?>
10	10	document.getElementsByName("sweep_id")[0].selectedIndex = <?=1?>;
11	11
12	12	$(".sweep_id").change(function(e){
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	<div class="w-section inverse no-padding">
43	43	<?php echo $form; ?>
44	44	<?php
45		- if(isset($validation_errors) && $validation_errors != ''){ ?>
	45	+ if (isset($validation_errors) && $validation_errors != '') { ?>
46	46	<script>
47	47	var ERR_STR = '<?php echo $validation_errors; ?>';
48	48	print_error(ERR_STR);

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<? extend('master.php') ?>
2		-<?php error_reporting(E_ERROR);?>
	2	+<?php error_reporting(E_ERROR); ?>
3	3	<? startblock('extra_head') ?>
4	4
5	5	<!--

		@@ -24,14 +24,14 @@ discard block
		block discarded – undo
24	24
25	25	class Email_model extends CI_Model {
26	26
27		- function Email_model() {
28		- parent::__construct();
29		- }
	27	+ function Email_model() {
	28	+ parent::__construct();
	29	+ }
30	30
31	31	/**
32	32	For Email History show in Reseller login
33	33	**/
34		- function get_email_list($flag, $start = 0, $limit = 0) {
	34	+ function get_email_list($flag, $start = 0, $limit = 0) {
35	35	$account_data = $this->session->userdata("accountinfo");
36	36
37	37	$account_id = $account_data['id'];
		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	}
44	44	if($account_type == 1){
45	45	$this->db->where_in('reseller_id');
46		- $this->db->select('id');
47		- $email_address=$this->db->get('accounts');
	46	+ $this->db->select('id');
	47	+ $email_address=$this->db->get('accounts');
48	48
49		- $email_address=$email_address->result_array();
	49	+ $email_address=$email_address->result_array();
50	50
51	51	if(empty($email_address)){
52	52	$this->db->or_where('accountid',0);
		@@ -54,43 +54,43 @@ discard block
		block discarded – undo
54	54	$this->db->where('reseller_id',$account_id);
55	55	}
56	56	}
57		- $this->db_model->build_search('email_search_list');
58		- if ($flag) {
59		- $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
60		- } else {
61		- $query = $this->db_model->countQuery("*", "mail_details",'');
62		- }
63		- return $query;
64		- }
65		- function add_email($add_array) {
66		- $this->db->insert("mail_details", $add_array);
67		- return true;
68		- }
	57	+ $this->db_model->build_search('email_search_list');
	58	+ if ($flag) {
	59	+ $query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
	60	+ } else {
	61	+ $query = $this->db_model->countQuery("*", "mail_details",'');
	62	+ }
	63	+ return $query;
	64	+ }
	65	+ function add_email($add_array) {
	66	+ $this->db->insert("mail_details", $add_array);
	67	+ return true;
	68	+ }
69	69
70		- function remove_email($id) {
71		- $this->db->where("id", $id);
72		- $this->db->delete("mail_details");
73		- return true;
74		- }
	70	+ function remove_email($id) {
	71	+ $this->db->where("id", $id);
	72	+ $this->db->delete("mail_details");
	73	+ return true;
	74	+ }
75	75
76	76
77		- function edit_email($data, $id) {
78		- $this->db->where("id", $id);
79		- $this->db->update("mail_details", $data);
80		- }
	77	+ function edit_email($data, $id) {
	78	+ $this->db->where("id", $id);
	79	+ $this->db->update("mail_details", $data);
	80	+ }
81	81	function customer_get_email_list($flag,$accountid, $start = 0, $limit = 0) {
82	82
83	83	$this->db->where('accountid',$accountid);
84		- if ($flag) {
85		- $query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
86		- } else {
87		- $query = $this->db_model->countQuery("*", "mail_details", '');
88		- }
	84	+ if ($flag) {
	85	+ $query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
	86	+ } else {
	87	+ $query = $this->db_model->countQuery("*", "mail_details", '');
	88	+ }
89	89
90	90
91		- return $query;
92		- }
93		- function get_email_client_data($data, $start = 0, $limit = 0){
	91	+ return $query;
	92	+ }
	93	+ function get_email_client_data($data, $start = 0, $limit = 0){
94	94	if($data['type'] == ''){
95	95	$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
96	96	}
		@@ -98,13 +98,13 @@ discard block
		block discarded – undo
98	98	$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
99	99	}
100	100
101		- $query = $this->db_model->getSelect("email,id", "accounts", $where);
102		- $query = $query->result_array();
	101	+ $query = $this->db_model->getSelect("email,id", "accounts", $where);
	102	+ $query = $query->result_array();
103	103	return $query;
104		- }
105		- /Mass mail/
106		- function multipal_email($data){
107		- $mail_ids=explode(',',$data['to']);
	104	+ }
	105	+ /Mass mail/
	106	+ function multipal_email($data){
	107	+ $mail_ids=explode(',',$data['to']);
108	108	foreach($mail_ids as $key=>$val)
109	109	{
110	110	if($val!='')
		@@ -124,11 +124,11 @@ discard block
		block discarded – undo
124	124	$account_info=$res_data[0];
125	125	$account_info['accountid']=$account_info['id'];
126	126	}
127		- $account_info['password'] = $this->common->decode($account_info['password']);
128		- $this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
	127	+ $account_info['password'] = $this->common->decode($account_info['password']);
	128	+ $this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
129	129	}
130	130	}
131		- return true;
	131	+ return true;
132	132	}
133	133	/*************************************************************/
134	134	}

		@@ -38,27 +38,27 @@ discard block
		block discarded – undo
38	38	$account_email = $account_data['email'];
39	39	$account_type = $account_data['type'];
40	40
41		- if($account_type == 0){
42		- $this->db->where('accountid',$account_id);
	41	+ if ($account_type == 0) {
	42	+ $this->db->where('accountid', $account_id);
43	43	}
44		- if($account_type == 1){
	44	+ if ($account_type == 1) {
45	45	$this->db->where_in('reseller_id');
46	46	$this->db->select('id');
47		- $email_address=$this->db->get('accounts');
	47	+ $email_address = $this->db->get('accounts');
48	48
49		- $email_address=$email_address->result_array();
	49	+ $email_address = $email_address->result_array();
50	50
51		- if(empty($email_address)){
52		- $this->db->or_where('accountid',0);
53		- }else{
54		- $this->db->where('reseller_id',$account_id);
	51	+ if (empty($email_address)) {
	52	+ $this->db->or_where('accountid', 0);
	53	+ } else {
	54	+ $this->db->where('reseller_id', $account_id);
55	55	}
56	56	}
57	57	$this->db_model->build_search('email_search_list');
58	58	if ($flag) {
59	59	$query = $this->db_model->select("*", "mail_details", '', "id", "DESC", $limit, $start);
60	60	} else {
61		- $query = $this->db_model->countQuery("*", "mail_details",'');
	61	+ $query = $this->db_model->countQuery("*", "mail_details", '');
62	62	}
63	63	return $query;
64	64	}
		@@ -78,9 +78,9 @@ discard block
		block discarded – undo
78	78	$this->db->where("id", $id);
79	79	$this->db->update("mail_details", $data);
80	80	}
81		- function customer_get_email_list($flag,$accountid, $start = 0, $limit = 0) {
	81	+ function customer_get_email_list($flag, $accountid, $start = 0, $limit = 0) {
82	82
83		- $this->db->where('accountid',$accountid);
	83	+ $this->db->where('accountid', $accountid);
84	84	if ($flag) {
85	85	$query = $this->db_model->select("*", "mail_details", '', "id", "desc", $limit, $start);
86	86	} else {
		@@ -90,12 +90,12 @@ discard block
		block discarded – undo
90	90
91	91	return $query;
92	92	}
93		- function get_email_client_data($data, $start = 0, $limit = 0){
94		- if($data['type'] == ''){
95		- $where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
	93	+ function get_email_client_data($data, $start = 0, $limit = 0) {
	94	+ if ($data['type'] == '') {
	95	+ $where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'deleted'=>'0');
96	96	}
97		- else{
98		- $where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
	97	+ else {
	98	+ $where = array('pricelist_id'=>$data['pricelist_id'], 'posttoexternal'=>$data['posttoexternal'], 'status'=>$data['status'], 'type'=>$data['type'], 'deleted'=>'0');
99	99	}
100	100
101	101	$query = $this->db_model->getSelect("email,id", "accounts", $where);
		@@ -103,29 +103,29 @@ discard block
		block discarded – undo
103	103	return $query;
104	104	}
105	105	/Mass mail/
106		- function multipal_email($data){
107		- $mail_ids=explode(',',$data['to']);
108		- foreach($mail_ids as $key=>$val)
	106	+ function multipal_email($data) {
	107	+ $mail_ids = explode(',', $data['to']);
	108	+ foreach ($mail_ids as $key=>$val)
109	109	{
110		- if($val!='')
	110	+ if ($val != '')
111	111	{
112		- $template_type['message']=$data['template'];
113		- $template_type['subject']=$data['subject'];
114		- $act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val,"deleted"=>0));
115		- $count=$act_details->num_rows();
116		- $account_info=array();
117		- if($count<=0)
	112	+ $template_type['message'] = $data['template'];
	113	+ $template_type['subject'] = $data['subject'];
	114	+ $act_details = $this->db_model->getSelect("*", "accounts", array('email'=>$val, "deleted"=>0));
	115	+ $count = $act_details->num_rows();
	116	+ $account_info = array();
	117	+ if ($count <= 0)
118	118	{
119		- $account_info['email']=$val;
120		- $account_info['accountid']='0';
	119	+ $account_info['email'] = $val;
	120	+ $account_info['accountid'] = '0';
121	121	}
122		- else{
	122	+ else {
123	123	$res_data = $act_details->result_array();
124		- $account_info=$res_data[0];
125		- $account_info['accountid']=$account_info['id'];
	124	+ $account_info = $res_data[0];
	125	+ $account_info['accountid'] = $account_info['id'];
126	126	}
127	127	$account_info['password'] = $this->common->decode($account_info['password']);
128		- $this->email_lib->send_email($template_type,$account_info,'',$data['file'],0,1);
	128	+ $this->email_lib->send_email($template_type, $account_info, '', $data['file'], 0, 1);
129	129	}
130	130	}
131	131	return true;

		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50
51	51	if(empty($email_address)){
52	52	$this->db->or_where('accountid',0);
53		- }else{
	53	+ } else{
54	54	$this->db->where('reseller_id',$account_id);
55	55	}
56	56	}
		@@ -93,8 +93,7 @@ discard block
		block discarded – undo
93	93	function get_email_client_data($data, $start = 0, $limit = 0){
94	94	if($data['type'] == ''){
95	95	$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
96		- }
97		- else{
	96	+ } else{
98	97	$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
99	98	}
100	99
		@@ -118,8 +117,7 @@ discard block
		block discarded – undo
118	117	{
119	118	$account_info['email']=$val;
120	119	$account_info['accountid']='0';
121		- }
122		- else{
	120	+ } else{
123	121	$res_data = $act_details->result_array();
124	122	$account_info=$res_data[0];
125	123	$account_info['accountid']=$account_info['id'];

iNextrix / ASTPP

Pull Request — v3.0 (#136)

Status

Category

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +307 added lines, -307 removed lines patch added patch discarded remove patch

Spacing +84 added lines, -84 removed lines patch added patch discarded remove patch

Braces +10 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

Spacing +65 added lines, -65 removed lines patch added patch discarded remove patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Braces +3 added lines, -5 removed lines patch added patch discarded remove patch