From 7bcb1bd5ceeec855765d22115dca29dd8b835d94 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 2 Jun 2021 09:00:50 +0200
Subject: [PATCH] Popravek detekcije naprave v pogojih

---
 main/survey/app/Controllers/InitClass.php    |  2 +-
 main/survey/app/Controllers/JsController.php | 34 +++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php
index 09aa12126..afed69e85 100644
--- a/main/survey/app/Controllers/InitClass.php
+++ b/main/survey/app/Controllers/InitClass.php
@@ -847,7 +847,7 @@ class InitClass extends Controller
                         if ($ip == 0) $_ip = Helper::remote_address(); else $ip = "";
                         if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
                         if ($referal == 0) $_referer = $referer; else $_referer = '';
-                        if ($browser == 0) $_useragent = $_SERVER[HTTP_USER_AGENT]; else $_useragent = '';
+                        if ($browser == 0) $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
 
                         // Ce dovolimo useragent in ce je instaliran browscap
                         $_browser = '';
diff --git a/main/survey/app/Controllers/JsController.php b/main/survey/app/Controllers/JsController.php
index 790c3855f..8a2bcac73 100644
--- a/main/survey/app/Controllers/JsController.php
+++ b/main/survey/app/Controllers/JsController.php
@@ -2702,13 +2702,37 @@ class JsController extends Controller
 				
 				if (in_array($row['text'], array('0','1','2','3'))){
 				
-					$sqlU = sisplet_query("SELECT device FROM srv_user WHERE ank_id='".get('anketa')."' AND id='".get('usr_id')."'");
+                    // Star nacin detekcije - vedno vezan na prvi prihod, po novem detektiramo vsakic posebej
+					/*$sqlU = sisplet_query("SELECT device FROM srv_user WHERE ank_id='".get('anketa')."' AND id='".get('usr_id')."'");
 					$rowU = mysqli_fetch_array($sqlU);
+
+                    $echo .= $row['text'] . ' == ' . $rowU['device'];*/
+
+                    $_device = 0;
+
+                    if ($_useragent != '' && get_cfg_var('browscap')) {
+
+                        $useragent = $_SERVER['HTTP_USER_AGENT'];
+
+                        $browser_detect = get_browser($useragent, true);
+
+                        $detect = New Mobile_Detect();
+                        $detect->setUserAgent($useragent);
+
+                        // Detect naprave (pc, mobi, tablet, robot)
+                        if ($detect->isMobile()) {
+                            if ($detect->isTablet())
+                                $_device = 2;
+                            else
+                                $_device = 1;
+                        } 
+                        elseif ($browser_detect['crawler'] == 1){
+                            $_device = 3;
+                        }
+                    }
 				
-					$echo .= ' ( ';
-
-					$echo .= $row['text'] . ' == ' . $rowU['device'];
-
+					$echo .= ' ( ';	
+					$echo .= $row['text'] . ' == ' . $_device;
 					$echo .= ' ) ';
 				}
             }