Merge branch 'master' of https://bitbucket.org/1ka/1ka

admin/survey/SurveyAdmin.php

@@ -3279,7 +3279,7 @@ class SurveyAdmin
 		}
 		
 		// GDPR popup za prejemanje obvestil - force ce ga se ni izpolnil - SAMO NA www.1ka.si, test.1ka.si in virtualkah
-		if (($site_url == 'https://www.1ka.si/' || $site_url == 'http://test.1ka.si/' || ($cookie_domain == '.1ka.si' && $virtual_domain == true)) 
+		if (($site_url == 'https://www.1ka.si/' || $site_url == 'http://test.1ka.si/' || $site_url == 'https://1ka.arnes.si/' || ($cookie_domain == '.1ka.si' && $virtual_domain == true)) 
 				&& User::getInstance()->getSetting($setting='gdpr_agree') == '-1') {		
 			
 			// Avtomatsko prikazemo po loadu

admin/survey/classes/class.Notifications.php

@@ -379,14 +379,19 @@ class Notifications {
 	}
 	
 	public function ajax_viewGDPRMessage(){
-		global $lang, $global_user_id;	
+		global $lang, $global_user_id, $aai_instalacija;	
 		
 		echo '<h2>'.$lang['srv_notifications_unread'].'</h2>';
 		
 		echo '<ul>';
 		echo '<li class="unread active">';
-		
+        
-		echo '<span class="bold">'.$lang['srv_gdpr_notification_title'].'</span>';
+        if(isset($aai_instalacija) && $aai_instalacija == true){
+            echo '<span class="bold">'.$lang['srv_gdpr_notification_title_aai'].'</span>';
+        }
+        else{
+            echo '<span class="bold">'.$lang['srv_gdpr_notification_title'].'</span>';
+        }
 		
 		echo '<br /><br />';
 		

frontend/payments/classes/class.UserNarocilaPaypal.php

@@ -124,6 +124,7 @@ class UserNarocilaPaypal{
     // Posljemo podatke za placilo paypalu
     private function paypalCreateOrder($orderDetails){
         global $site_url;
+        global $lang;
 
         $response = array();
 
@@ -132,6 +133,15 @@ class UserNarocilaPaypal{
         $request->prefer('return=representation');
         //$request->headers["prefer"] = "return=representation";
 
+        if($lang['id'] == '2'){
+            $drupal_url_confirm = $site_url.'/d/en/paypal-purchase/success?narocilo_id='.$orderDetails['narocilo_id'];
+            $drupal_url_cancel = $site_url.'/d/en/paypal-purchase/cancel?narocilo_id='.$orderDetails['narocilo_id'];
+        }
+        else{
+            $drupal_url_confirm = $site_url.'/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'];
+            $drupal_url_cancel = $site_url.'/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'];
+        }
+
         $request->body = [
             "intent" => "CAPTURE",
             "purchase_units" => [[
@@ -144,8 +154,8 @@ class UserNarocilaPaypal{
                 ]
             ]],
             "application_context" => [
-                "cancel_url" => $site_url . '/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'],
+                "cancel_url" => $drupal_url_cancel,
-                "return_url" => $site_url . '/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'],
+                "return_url" => $drupal_url_confirm,
 
                 'brand_name' => '1KA'
             ] 

function.php

@@ -413,7 +413,7 @@ function login()
         else {
             $r = mysqli_fetch_row($result);
 
-            if ($cookie_pass == base64_encode((hash(SHA256, base64_decode($r[0]) . $pass_salt)))) {
+            if ($cookie_pass == base64_encode((hash('SHA256', base64_decode($r[0]) . $pass_salt)))) {
 
                 $is_meta = 1;
                 $admin_type = "0";

lang/1.php

@@ -7747,6 +7747,7 @@ $lang = array (
 	'users_gdpr0'			=> 'Ne',
 	'users_gdpr-1'			=> 'Brez potrditve',
 	'srv_gdpr_notification_title'		=> "Spoštovani uporabnik/-ca orodja 1KA,",
+	'srv_gdpr_notification_title_aai'	=> "Spoštovani uporabnik/-ca orodja 1KA.ARNES.SI,",
 	'srv_gdpr_notification_text1'		=> "V okviru razvoja orodja 1KA nenehno izboljšujemo obstoječe funkcionalnosti in razvijamo nove. Verjamemo, da so nove funkcionalnosti za vas zanimive in želite biti o njih obveščeni, prav tako o letnem dogodku Dan spletnega anketiranja.",
 	'srv_gdpr_notification_question'	=> "Ali se strinjate, da vam na elektronski naslov, s katerim ste se registrirali, enkrat letno pošljemo pomembna obvestila (informacije o novostih 1KA, vabilo na dogodek)?",
 	'srv_gdpr_notification_da'			=> "<span class=\"bold\">DA</span>, strinjam se s prejemanjem obvestil <span class=\"bold\">enkrat letno</span> (od prejemanja obvestil se lahko kadarkoli odjavite)",

lang/2.php

@@ -7640,6 +7640,7 @@ GDPR introduction preview",
 	'srv_gdpr_drupal_check' => 'Želim, da me avtor obvesti o izvedeni zahtevi na zgoraj navedeni elektronski naslov.',
 	'srv_gdpr_drupal_end' => 'By clicking Submit, your request will be sent to the author of the survey.',
 	'srv_gdpr_notification_title' 		=> "Dear user of 1KA tool,",   
+	'srv_gdpr_notification_title_aai' 		=> "Dear user of 1KA.ARNES.SI tool,",   
 	'srv_gdpr_notification_text1' 		=> "As part of the development process of 1KA tool, we continually improve existing functionalities and develop new ones. We believe that new functionalities are interesting to you and you want to be informed about them, also about our annual event, the Web Survey Day.",                    
 	'srv_gdpr_notification_question' 	=> "Do you agree to receive important news to the email address with which you registered? (Information about 1KA novelties, invitation to the event)?",                                    
 	'srv_gdpr_notification_da' 			=> "<span class=\"bold\">YES</span>, I agree to receive notifications <span class=\"bold\">once a year</span> (you can unsubscribe from notification anytime)",