// Fixed norm

modules/gapi/gapi.php

@@ -29,8 +29,8 @@ if (!defined('_PS_VERSION_'))
 
 class Gapi extends Module
 {
-    public function __construct($type = null)
+	public function __construct()
-    {
+	{
 		$this->name = 'gapi';
 		$this->tab = 'administration';
 		$this->version = 0.9;
@@ -40,7 +40,7 @@ class Gapi extends Module
 		parent::__construct();
 
 		$this->displayName = $this->l('Google Analytics API');
-    }
+	}
 
 	public function isConfigured()
 	{
@@ -64,7 +64,7 @@ class Gapi extends Module
 				'.(($curl && $allow_url_fopen) ? '' : '<li>'.$this->l('You are not allowed to open external URLs').'</li>').'
 				'.(($curl && $allow_url_fopen) ? '' : '<li>'.$this->l('cURL is not enabled').'</li>').'
 				'.($openssl ? '' : '<li>'.$this->l('OpenSSL is not enabled').'</li>').'
-				'.(($allow_url_fopen AND $openssl AND !$ping) ? '<li>'.$this->l('Google is unreachable').' ('.$this->l('check your firewall').')</li>' : '').'
+				'.(($allow_url_fopen && $openssl && !$ping) ? '<li>'.$this->l('Google is unreachable').' ('.$this->l('check your firewall').')</li>' : '').'
 				'.($online ? '' : '<li>'.$this->l('Your store is not online').'</li>').'
 			</ul>');
 		}
@@ -338,7 +338,7 @@ class Gapi extends Module
 		{
 			$metrics = array();
 			$dimensions = array();
-			foreach($row as $key => $value)
+			foreach ($row as $key => $value)
 				if ($response['columnHeaders'][$key]['columnType'] == 'DIMENSION')
 					$dimensions[str_replace('ga:', '', $response['columnHeaders'][$key]['name'])] = $value;
 				elseif ($response['columnHeaders'][$key]['columnType'] == 'METRIC')
@@ -453,7 +453,7 @@ class Gapi extends Module
 		$stream_context = stream_context_create(array(
 			'http' => array(
 				'method'=> 'GET',
-				'header'  => "Authorization: GoogleLogin auth=".$this->auth_token."\r\n",
+				'header'  => 'Authorization: GoogleLogin auth='.$this->auth_token."\r\n",
 				'timeout' => 5,
 			)
 		));
@@ -486,16 +486,16 @@ class Gapi extends Module
 			$metrics = array();
 			foreach ($entry->children('http://schemas.google.com/analytics/2009')->metric as $metric)
 			{
-				$key = str_replace('ga:','',$metric->attributes()->name);
+				$key = str_replace('ga:', '', $metric->attributes()->name);
 				$metric_value = strval($metric->attributes()->value);
-				if (preg_match('/^(\d+\.\d+)|(\d+E\d+)|(\d+.\d+E\d+)$/',$metric_value))
+				if (preg_match('/^(\d+\.\d+)|(\d+E\d+)|(\d+.\d+E\d+)$/', $metric_value))
 					$metrics[$key] = floatval($metric_value);
 				else
 					$metrics[$key] = intval($metric_value);
 			}
 
 			$dimensions = array();
-			foreach($entry->children('http://schemas.google.com/analytics/2009')->dimension as $dimension)
+			foreach ($entry->children('http://schemas.google.com/analytics/2009')->dimension as $dimension)
 				$dimensions[str_replace('ga:', '', $dimension->attributes()->name)] = strval($dimension->attributes()->value);
 
 			$result[] = array('metrics' => $metrics, 'dimensions' => $dimensions);

modules/gapi/oauth2callback.php

@@ -1,4 +1,28 @@
 <?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
 
 include(dirname(__FILE__).'/../../config/config.inc.php');
 include(dirname(__FILE__).'/gapi.php');