mirrors
/
easyappointments
mirror of https://github.com/alextselegidis/easyappointments.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Do not use start_session directly as the required options from app config are not being used (#334).

This commit is contained in:
alext 2017-06-11 21:12:21 +02:00
parent 2777be03da
commit f67d4768bb
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/application/controllers/Google.php
View File

@ -24,7 +24,8 @@ class Google extends CI_Controller {
*/ */
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
} $this->load->library('session');
}
/** /**
* Authorize Google Calendar API usage for a specific provider. * Authorize Google Calendar API usage for a specific provider.
@ -37,9 +38,6 @@ class Google extends CI_Controller {
*/ */
public function oauth($provider_id) { public function oauth($provider_id) {
// Store the provider id for use on the callback function. // Store the provider id for use on the callback function.
if (!isset($_SESSION)) {
@session_start();
}
$_SESSION['oauth_provider_id'] = $provider_id; $_SESSION['oauth_provider_id'] = $provider_id;
// Redirect browser to google user content page. // Redirect browser to google user content page.
@ -67,10 +65,6 @@ class Google extends CI_Controller {
$token = $this->google_sync->authenticate($_GET['code']); $token = $this->google_sync->authenticate($_GET['code']);
// Store the token into the database for future reference. // Store the token into the database for future reference.
if (!isset($_SESSION)) {
@session_start();
}
if (isset($_SESSION['oauth_provider_id'])) { if (isset($_SESSION['oauth_provider_id'])) {
$this->load->model('providers_model'); $this->load->model('providers_model');
$this->providers_model->set_setting('google_sync', TRUE, $this->providers_model->set_setting('google_sync', TRUE,

4
src/application/libraries/Google_sync.php
View File

@ -55,9 +55,7 @@ class Google_Sync {
public function __construct() { public function __construct() {
$this->CI =& get_instance(); $this->CI =& get_instance();
if (!isset($_SESSION)) { $this->CI->load->library('session');
@session_start();
}
// Initialize google client and calendar service. // Initialize google client and calendar service.
$this->client = new Google_Client(); $this->client = new Google_Client();