Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

application/models/Organizer_model.php

@@ -459,9 +459,8 @@ class Organizer_model extends CI_Model {
  			if($data['user_type'] == '2'){
  				$sql = $this->db->query("SELECT USR.* FROM users AS USR INNER JOIN provider AS PDR ON (PDR.provider_id = USR.id) WHERE USR.password='".md5($data['password'])."' AND PDR.email='".$data['email_id']."' AND USR.user_type='".$data['user_type']."'");
  			}else{
- 				$sql = $this->db->query("SELECT * FROM checker WHERE username='".$data['email_id']."' AND password='".$data['password']."' AND status='1'");
+ 				$sql = $this->db->query("SELECT * FROM checker WHERE username='".$data['email_id']."' AND password='".md5($data['password'])."' AND status='1'");
  			}
-
  			if(empty($sql) || empty($custData = $sql->row_array())){
  				$res = array('status'=>0,'message'=>'User Does not Exist','code'=>'ER09');
  				return $res;
@@ -546,7 +545,6 @@ class Organizer_model extends CI_Model {
 	                           'seat_pricing'=>$postData['seat_pricing'],
 	                           'custom_seat_layout'=>$postData['custom_seat_layout'],
 	                       	   'status'=>3);
-	        
 	 		$evtName = json_decode($postData['event_name'],true);
 	 		$evtDesc = json_decode($postData['event_desc'],true);
 	        $status = $this->db->insert('events',$eventData);
@@ -735,7 +733,7 @@ class Organizer_model extends CI_Model {
 
     public function getLanguages(){
     	try{
-    		$sql = "SELECT country_id AS lang_id,language_code AS lang,language,country_name,country_code FROM country WHERE status='1' ORDER BY language_code ASC";
+    		$sql = "SELECT country_id AS lang_id,language,language_code AS lang,country_name,country_code FROM country WHERE status='1' GROUP BY language ORDER BY language_code ASC";
     		$lang = $this->db->query($sql);
     		if(empty($lang) || empty($lang = $lang->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER05');