Drupal9: popravki pri vračanju responsa pri registraciji in cache max age dodan intro block.

This commit is contained in:
Robert 2022-09-08 15:59:18 +02:00
parent 7f5e185d3e
commit 19343d35f3
3 changed files with 8 additions and 7 deletions

View File

@ -256,8 +256,7 @@ class ApiLogin
if ($cookie_pass != $r[0]) { if ($cookie_pass != $r[0]) {
// najprej poradiraij cookije! // najprej poradiraij cookije!
setcookie('uid', "", time() - 3600, $cookie_domain); setcookie('uid', "", time() - 3600, $cookie_domain);
setcookie('secret', "", time() - 3600, setcookie('secret', "", time() - 3600, $cookie_domain);
$cookie_domain);
if (substr_count($cookie_domain, ".") > 1) { if (substr_count($cookie_domain, ".") > 1) {
$nd = substr($cookie_domain, $nd = substr($cookie_domain,
@ -1257,8 +1256,7 @@ class ApiLogin
if (!empty($error)) { if (!empty($error)) {
if($ajaxKlic){ if($ajaxKlic){
echo json_encode($this->preveriNapake($error)); return $this->ajaxResponse('error', $this->preveriNapake($error));
die();
} }
// Ime in email posljemo nazaj v urlju // Ime in email posljemo nazaj v urlju

View File

@ -119,12 +119,15 @@ function prijava_1ka_theme()
function prijava_1ka_preprocess(&$variables) function prijava_1ka_preprocess(&$variables)
{ {
if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [ if(!empty($variables['plugin_id']) && in_array($variables['plugin_id'], [
'prijava_intro_block',
'prijava_block', 'prijava_block',
'prijava_obnovitev_gesla_block', 'prijava_obnovitev_gesla_block',
'prijava_obnovitev_gesla_aktivacija_blok', 'prijava_obnovitev_gesla_aktivacija_blok',
'prijava_podatki_o_uporabniku_block' 'prijava_podatki_o_uporabniku_block'
]) ])
){ ){
$variables['#cache'] ['max-age'] = 0; $variables['#cache']['max-age'] = 0;
} }
return $variables;
} }

View File

@ -87,9 +87,9 @@ END HEADER #}
</li> </li>
</ul> </ul>
{% if email_uporabnika %} {% if email_uporabnika %}
<a href="/admin/survey" class="button-pricechart pcb1 w-button">Preizkusi brezplačno</a> <a href="/admin/survey" class="button-pricechart pcb1 w-button brezplacni-nakup-samo-registracija">Preizkusi brezplačno</a>
{% else %} {% else %}
<a href="#" class="button-pricechart pcb1 w-button">Preizkusi brezplačno</a> <a href="#" class="button-pricechart pcb1 w-button brezplacni-nakup-samo-registracija">Preizkusi brezplačno</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>