From e2222ac0bf9c621fc6e263508c445cdf9d4721bf Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 9 Apr 2015 21:47:00 +0200
Subject: [PATCH] Removed config.php from google_sync.php, config is loaded at
 the beginning.

---
 src/application/libraries/google_sync.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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