refactoring php pageView tracker request call to include user agent n…

…ad accept headers. Refactoring setcooie function to work properly with php 7.3+, fixes #8.
Open-Web-Analytics · Dec 2, 2022 · ae0704a · ae0704a
1 parent b9eb438
commit ae0704a
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 13 deletions.
diff --git a/src/OwaClient.php b/src/OwaClient.php
@@ -203,7 +203,7 @@ public function makeRequest( $params ) {
 
 	    } 
 
-	    catch( RequestException | ConnectException | ClientException $e ) {
+	    catch( \GuzzleHttp\Exception\RequestException | \GuzzleHttp\Exception\ConnectException | \GuzzleHttp\Exception\ClientException $e ) {
 
 		    $r = $e->getRequest();
 		  	$res = null;

diff --git a/src/Tracker/State.php b/src/Tracker/State.php
@@ -35,7 +35,7 @@ function __construct( $config = []) {
 			'cookie_domain' => ''
 		];
 
-		// merge incomming config params
+		// merge incoming config params
 		$this->config = array_merge( $this->config, $config );
 
 
@@ -346,7 +346,11 @@ public static function implode_assoc($inner_glue, $outer_glue, $array) {
     }
 
     private function createCookie($cookie_name, $cookie_value, $expires = 0, $path = '/', $domain = '') {
-
+
+        $samesite = 'lax';
+        $secure = false;
+        $httponly = false;
+
         if (! $domain ) {
 
             $domain = $this->getSetting( 'cookie_domain' );
@@ -364,13 +368,28 @@ private function createCookie($cookie_name, $cookie_value, $expires = 0, $path =
         sdk::debug(sprintf('Setting cookie %s with values: %s under domain: %s', $cookie_name, $cookie_value, $domain));
 
         // makes cookie to session cookie only
-        if ( !$this->getSetting( 'cookie_persistence' ) ) {
+        if ( ! $this->getSetting( 'cookie_persistence' ) ) {
             $expires = 0;
         }
-
-		$path .= '; SameSite=lax';
-
-        setcookie($cookie_name, $cookie_value, $expires, $path, $domain);
+
+        // check for php version to set samesite attribute.
+        //php 7.2
+        if (PHP_VERSION_ID < 70300) {
+
+            $path .= '; SameSite='.$samesite;            
+            setcookie($cookie_name, $cookie_value, $expires, $path, $domain);    
+
+        } else {
+            //php 7.3+
+            setcookie($cookie_name, $cookie_value, [
+                'expires' => $expires,
+                'path' => $path,
+                'domain' => $domain,
+                'samesite' => $samesite,
+                'secure' => $secure,
+                'httponly' => $httponly,
+            ]);
+        }
     }
 
     private function deleteCookie($cookie_name, $path = '/', $domain = '') {

diff --git a/src/Tracker/TrackerClient.php b/src/Tracker/TrackerClient.php
@@ -1172,11 +1172,37 @@ private function logEvent($event_type, $event) {
 
 		$params = $this->applyNamespaceToKeys( $params );
 
-		$res = $http->request(
-			'GET', 'log.php', 
-			['query' => $params ] 
-		);
-
+        try {
+		    $res = $http->request(
+			    'GET', 'log.php', 
+			    [
+                    'query' => $params,
+                    'headers' => [
+                        'User-Agent' => 'OWA SDK Client',
+                        'accept' => 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
+                    ]
+                ] 
+		    );
+		} catch( \GuzzleHttp\Exception\RequestException | \GuzzleHttp\Exception\ConnectException | \GuzzleHttp\Exception\ClientException $e ) {
+
+            $r = $e->getRequest();
+              $res = null;
+
+              error_log( print_r( $r, true ) );
+
+              if ( $e->hasResponse() ) {
+
+                  $res = $e->getResponse();
+
+                  error_log( print_r( $res, true ) );
+              }
+
+            if ( $this->getSetting( 'debug' ) ) {
+
+                 print_r($r);
+                 print_r($res);   
+            }
+        }
 		return $res;
 	}