Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -37,6 +37,7 @@ header('Content-Type: text/html; charset=utf-8');
 		public function __construct(){
 			parent::__construct();
 			$this->load->model('Webservice_model');
+        	$this->load->helper('access');
 
 		}
 

application/helpers/access_helper.php

@@ -31,6 +31,12 @@ else{
 	
 }
 
+function get_settings(){
+	$CI = & get_instance();
+	$query = $CI->db->where('settings',array('id'=>'1'))->row();
+	return $query
+}
+
 
 
 

application/models/Webservice_model.php

@@ -190,17 +190,17 @@ function get_cars_details(){
 
           if ($query) { 
 
-
+        $settings = get_settings();
 
         
 
         $this->load->library('email');
         $config = Array(
                 'protocol' => 'mail',
-                'smtp_host' => 'techlabz.in',
+                'smtp_host' => $settings->smtp_host,
                 'smtp_port' => 25,
-                'smtp_user' => '[email protected]', // change it to yours
-                'smtp_pass' => 'Golden_123', // change it to yours
+                'smtp_user' => $settings->smtp_username, // change it to yours
+                'smtp_pass' => $settings->smtp_password, // change it to yours
                 'smtp_timeout'=>20,
                 'mailtype' => 'html',
                 'charset' => 'iso-8859-1',
@@ -214,7 +214,7 @@ function get_cars_details(){
       //$mailTemplate=$data->message;
 
         //$this->email->set_newline("\r\n");
-        $this->email->from('[email protected]');
+        $this->email->from($settings->admin_email);
         $this->email->to($email);
         $this->email->subject("Verify Your Email Adress - Tukkibi");
         $this->email->message("Click the Link to verify your Email Adress:".$link);  

application/views/Chat/chatusers.php

@@ -6,10 +6,11 @@
     authDomain: "joyride-9b774.firebaseapp.com",
     databaseURL: "https://joyride-9b774.firebaseio.com",
     projectId: "joyride-9b774",
-    storageBucket: "",
+    storageBucket: "joyride-9b774.appspot.com",
     messagingSenderId: "1094203463203"
   };
   firebase.initializeApp(config);
+  //firebase settings can be get from Firebase Console->Authentication->Web setup
 </script>
 <div  ng-app='myApp'>
   <div ng-controller="mainCtrl" ng-init="load_recent_chat()">
@@ -44,7 +45,7 @@
                 <!-- /.box -->
                 <div class="box">
                    <div class="box-header">
-                      <h3 class="box-title"> Chat Users</h3>
+                      <h3 class="box-title">Chat Users</h3>
                    </div>
                    <!-- /.box-header -->
                    <div class="box-body">