From 7076d54f168ceee2580904fbe2201b0baf5bfd36 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 5 Jan 2021 10:23:50 +0100
Subject: [PATCH] Popravek noge in searcha pri aai instalaciji

---
 admin/survey/SurveyAdmin.php  | 16 +++++++++++++---
 admin/survey/script/script.js | 13 ++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 08cd8f41f..f26093fe7 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -265,6 +265,7 @@ class SurveyAdmin
         global $lang;
         global $admin_type;
         global $site_domain;
+        global $aai_instalacija;
 
         $sql = sisplet_query("SELECT email FROM users WHERE id='$global_user_id'");
         $row = mysqli_fetch_assoc($sql);
@@ -290,7 +291,9 @@ class SurveyAdmin
             
         echo '<form method="GET" id="1kasf" action="'.$drupal_search_url.'">';
 
-		echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />';
+        echo '<input type="hidden" id="drupal_search_url" name="drupal_search_url" value="'.$drupal_search_url.'" />';
+        echo '<input type="hidden" id="drupal_search_aai" name="drupal_search_aai" value="'.($aai_instalacija ? '1' : '1').'" />';
+
 		echo '<a href="#" onclick="showSearch();"><span class="faicon search pointer"></span></a> ';
         echo '<input id="searchSurvey" type="text" value="" placeholder="' . $lang['s_search_frontend'] . '" name="search" />';
         echo '<input type="button" style="display: none;" value="' . $lang['s_search'] . '" />';
@@ -569,6 +572,7 @@ class SurveyAdmin
         global $lang;
         global $app_settings;
         global $site_frontend;
+        global $aai_instalacija;
 
         echo '<div id="srv_footer">';
         
@@ -584,11 +588,14 @@ class SurveyAdmin
         else{
             echo $lang['srv_footer_links'];
 
+            if(isset($aai_instalacija) && $aai_instalacija == true){
+                echo ' | <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-arnes-aai-prijavi-uporabi-orodja-1ka" target="_blank">'.$lang['aa4'].'</a>';
+            }
+
             echo '<br />';
 
             // Verzijo izpišemo samo za admine
-            if ($admin_type == 0) {
-                
+            if ($admin_type == 0) {   
                 
                 // Verzija 1ka
                 $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj");
@@ -618,6 +625,9 @@ class SurveyAdmin
         if (Common::checkModule('gorenje')){
             echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
         }
+        elseif(isset($aai_instalacija) && $aai_instalacija == true){
+            echo '<a href="https://www.1ka.si/help1KA" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
+        }
         else{
             // Slovenski jezik
             if ($lang['id'] == 1)
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index b79a1f5a8..44469b3c2 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -3921,9 +3921,16 @@ function executeDrupalSearch() {
 
 	//var url = 'https://www.1ka.si/d/sl/search/node/';
 	var url = $('#drupal_search_url').val();
-	var searchString = $('#searchSurvey').val();
-	
-	window.location = url + encodeURIComponent(searchString);
+	var from_aai = $('#drupal_search_aai').val();
+    
+    var searchString = $('#searchSurvey').val();
+    
+    if(from_aai == '1'){
+        window.open(url + encodeURIComponent(searchString), '_blank');
+    }
+    else{
+        window.location = url + encodeURIComponent(searchString);
+    }
 }
 
 function showAdvancedSearch(){