maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Removed config.php from google_sync.php, config is loaded at the beginning.

Browse source
This commit is contained in:
Alex Tselegidis 2015-04-09 21:47:00 +02:00
parent ead6e3d32a
commit e2222ac0bf
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/application/libraries/google_sync.php
View file

@ -1,9 +1,8 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
// Google API PHP Client is necessary to perform sync operations. // Google API PHP Client is necessary to perform sync operations.
require_once dirname(__FILE__) . '/external/google-api-php-client/Google_Client.php'; require_once __DIR__ . '/external/google-api-php-client/Google_Client.php';
require_once dirname(__FILE__) . '/external/google-api-php-client/contrib/Google_CalendarService.php'; require_once __DIR__ . '/external/google-api-php-client/contrib/Google_CalendarService.php';
require_once dirname(dirname(dirname(__FILE__))) . '/configuration.php';
/** /**
* Google Synchronization Class * Google Synchronization Class
@ -34,10 +33,10 @@ class Google_Sync {
$this->client = new Google_Client(); $this->client = new Google_Client();
$this->client->setUseObjects(true); $this->client->setUseObjects(true);
$this->client->setApplicationName(SystemConfiguration::$google_product_name); $this->client->setApplicationName(Config::$google_product_name);
$this->client->setClientId(SystemConfiguration::$google_client_id); $this->client->setClientId(Config::$google_client_id);
$this->client->setClientSecret(SystemConfiguration::$google_client_secret); $this->client->setClientSecret(Config::$google_client_secret);
$this->client->setDeveloperKey(SystemConfiguration::$google_api_key); $this->client->setDeveloperKey(Config::$google_api_key);
$this->client->setRedirectUri($this->CI->config->item('base_url') . '/google/oauth_callback'); $this->client->setRedirectUri($this->CI->config->item('base_url') . '/google/oauth_callback');
$this->service = new Google_CalendarService($this->client); $this->service = new Google_CalendarService($this->client);