diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php index 318419784..3709d108c 100644 --- a/frontend/api/class.ApiLogin.php +++ b/frontend/api/class.ApiLogin.php @@ -256,8 +256,7 @@ class ApiLogin if ($cookie_pass != $r[0]) { // najprej poradiraij cookije! setcookie('uid', "", time() - 3600, $cookie_domain); - setcookie('secret', "", time() - 3600, - $cookie_domain); + setcookie('secret', "", time() - 3600, $cookie_domain); if (substr_count($cookie_domain, ".") > 1) { $nd = substr($cookie_domain, @@ -1257,8 +1256,7 @@ class ApiLogin if (!empty($error)) { if($ajaxKlic){ - echo json_encode($this->preveriNapake($error)); - die(); + return $this->ajaxResponse('error', $this->preveriNapake($error)); } // Ime in email posljemo nazaj v urlju diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module index b751434cb..f2302d749 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module @@ -119,12 +119,15 @@ function prijava_1ka_theme() function prijava_1ka_preprocess(&$variables) { if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [ + 'prijava_intro_block', 'prijava_block', 'prijava_obnovitev_gesla_block', 'prijava_obnovitev_gesla_aktivacija_blok', 'prijava_podatki_o_uporabniku_block' ]) ){ - $variables['#cache'] ['max-age'] = 0; + $variables['#cache']['max-age'] = 0; } + + return $variables; } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig index 60026a06b..592019b6d 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig @@ -87,9 +87,9 @@ END HEADER #} {% if email_uporabnika %} - Preizkusi brezplačno + Preizkusi brezplačno {% else %} - Preizkusi brezplačno + Preizkusi brezplačno {% endif %}