Merge branch 'agiledrop'

2022-10-28 16:11:25 +02:00 · 2022-10-28 16:11:25 +02:00 · 6bc2ec9d07
commit 6bc2ec9d07
parent 9971a98557 8a4daa4e91
12 changed files with 156 additions and 106 deletions
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@ -26,49 +26,47 @@ function prijava_1ka_theme()
    return [
        'prijava_block' => [
            'variables' => [
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
+                'prijavljen' => FALSE,
                //'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']),
                //'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']),
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'jezik' => '',
                'google2fa_error' => '',
                'email' => '',
                'password' => '',
-                'error' => ''
-                //'lang' => // TU moramo pridobiti spremenljivke iz 1ka.si
+                'error' => '',
+                'lang' => [],
            ]
        ],
        'prijava_intro_block' => [
            'variables' => [
-
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
+                'prijavljen' => FALSE,
                //'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']),
                //'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']),
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'jezik' => '',
                'google2fa_error' => '',
                'email' => '',
                'password' => '',
-                'error' => ''
-                //'lang' => // TU moramo pridobiti spremenljivke iz 1ka.si
+                'error' => '',
+                'lang' => [],
            ]
        ],

        'prijava_obnovitev_gesla_block' => [
            'variables' => [
-
+                'lang' => [],
            ]
        ],
        'prijava_obnovitev_gesla_aktivacija_blok' => [
            'variables' => [
-
-                //'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
-                'rememberMe' => (isset($_COOKIE['remember-me']) ? false : true)
+                'jezik' => '',
+                'prijavljen' => FALSE,
+                'rememberMe' => TRUE,
+                'lang' => [],
            ]
        ],

        'prijava_z_racuni_block' => [
          'variables' => [
-
            'url_google' => $url_google,
            //'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
            'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
@ -78,72 +76,30 @@ function prijava_1ka_theme()

        'prijava_arnes_modal_block' => [
            'variables' => [
-
+              'lang' => [],
            ]
        ],
        'prijava_podatki_o_uporabniku_block' => [
            'variables' => [
-
-                'prijavljen' => (isset($_COOKIE['unam']) ? true : false),
-                'ime' => (isset($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : null),
-                'from1ka' => (isset($_GET['from1ka']) ? $_GET['from1ka'] : false) ,
+                'prijavljen' => FALSE,
+                'ime' => NULL,
+                'from1ka' => FALSE,
+                'lang' => [],
            ]
        ],

        'prijava_individualno_svetovanje_modal_block' => [
          'variables' => [
-
+            'lang' => [],
          ]
        ],

      'prijava_z_racuni_modal_block' => [
        'variables' => [
-
-          'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false),
-          'url_google' => $url_google
+          'rememberMe' => FALSE,
+          'url_google' => $url_google,
+          'lang' => [],
        ]
      ]
    ];
 }
-
-/*
-* Never cache
-*/
-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'
-//    ])
-//  ){
-
-    if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-      include (__DIR__ . '/../../../../../../lang/1.php');
-    }else{
-      include (__DIR__ . '/../../../../../../lang/2.php');
-    }
-    $variables['lang'] = $lang;
-    $variables['#cache']['max-age'] = 0;
-//  }
-
-  return $variables;
-}
-
-function prijava_1ka_preprocess_block(&$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;
-  }
-
-  return $variables;
-}
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaArnesModalBlock.php
@ -21,10 +21,16 @@ class PrijavaArnesModalBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }

-        return [
-            '#theme' => 'prijava_arnes_modal_block',
-        ];
+      return [
+        '#theme' => 'prijava_arnes_modal_block',
+        '#lang' => $lang ?? [],
+      ];
    }

 }
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
@ -64,8 +64,19 @@ class PrijavaBlock extends BlockBase implements ContainerFactoryPluginInterface
  public function build() {
    //return $this->formBuilder->getForm('Drupal\prijava_1ka\Form\PrijavaBlockForm');

+    $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    if($currentLanguage == 'sl') {
+      include(__DIR__ . '/../../../../../../../../../lang/1.php');
+    } else{
+      include(__DIR__ . '/../../../../../../../../../lang/2.php');
+    }
+
    return [
      '#theme' => 'prijava_block',
+      '#prijavljen' => isset($_COOKIE['unam']),
+      '#jezik' => $currentLanguage,
+      '#lang' => $lang ?? [],
    ];
  }

--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php
@ -20,10 +20,16 @@ class PrijavaIndividualnoSvetovanjeModalBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }

-        return [
-            '#theme' => 'prijava_individualno_svetovanje_modal_block',
-        ];
+      return [
+        '#theme' => 'prijava_individualno_svetovanje_modal_block',
+        '#lang' => $lang ?? [],
+      ];
    }

 }
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIntroBlock.php
@ -20,9 +20,20 @@ class PrijavaIntroBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
-        return [
-            '#theme' => 'prijava_intro_block',
-        ];
+      $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+      if($currentLanguage == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }
+
+      return [
+        '#theme' => 'prijava_intro_block',
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#jezik' => $currentLanguage,
+        '#lang' => $lang ?? [],
+      ];
    }

 }
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaAktivacijaBlock.php
@ -20,10 +20,21 @@ class PrijavaObnovitevGeslaAktivacijaBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
+      $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();

-        return [
-            '#theme' => 'prijava_obnovitev_gesla_aktivacija_block',
-        ];
+      if($currentLanguage == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }
+
+      return [
+        '#theme' => 'prijava_obnovitev_gesla_aktivacija_block',
+        '#jezik' => $currentLanguage,
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#rememberMe' => !isset($_COOKIE['remember-me']),
+        '#lang' => $lang ?? [],
+      ];
    }

-}
+}
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaObnovitevGeslaBlock.php
@ -20,10 +20,16 @@ class PrijavaObnovitevGeslaBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }

-        return [
-            '#theme' => 'prijava_obnovitev_gesla_block',
-        ];
+      return [
+        '#theme' => 'prijava_obnovitev_gesla_block',
+        '#lang' => $lang ?? [],
+      ];
    }

    public function getCacheMaxAge() {
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaPodatkiOUporabnikuBlock.php
@ -2,6 +2,8 @@

 namespace Drupal\prijava_1ka\Plugin\Block;

+use Drupal\Core\Block\BlockBase;
+
 /**
 * Prikaže podatke že o prijavljenem uporabniku.
 * Prikažemo, podatke o prijavljenem uporabniku
@ -12,17 +14,25 @@ namespace Drupal\prijava_1ka\Plugin\Block;
 *   category = @Translation("1KA"),
 * )
 */
-class PrijavaPodatkiOUporabnikuBlock
-{
+class PrijavaPodatkiOUporabnikuBlock extends BlockBase {

    /**
     * {@inheritdoc}
     */
    public function build() {
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+      }

-        return [
-            '#theme' => 'prijava_podatki_o_uporabniku_block',
-        ];
+      return [
+        '#theme' => 'prijava_podatki_o_uporabniku_block',
+        '#prijavljen' => isset($_COOKIE['unam']),
+        '#ime' => (isset($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : NULL),
+        '#from1ka' => ($_GET['from1ka'] ?? FALSE),
+        '#lang' => $lang ?? [],
+      ];
    }

-}
+}
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
@ -20,10 +20,29 @@ class PrijavaZRacuniModalBlock extends BlockBase {
     * {@inheritdoc}
     */
    public function build() {
+      //Url linki za preusmeritev
+      $redirect_url = 'https://www.1ka.si/frontend/api/google-oauth2.php';
+      $url_google = 'https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com&redirect_uri='.$redirect_url;

-        return [
-            '#theme' => 'prijava_z_racuni_modal_block',
-        ];
+      if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
+        include(__DIR__ . '/../../../../../../../../../lang/1.php');
+
+        $url_google .= '&state=';
+      } else{
+        include(__DIR__ . '/../../../../../../../../../lang/2.php');
+
+        $url_google .= '&state=regFromEnglish';
+      }
+
+      $url_google .= '&scope=email&access_type=online&prompt=consent';
+      $url_google .= '&openid.realm=https://www.1ka.si';
+
+      return [
+        '#theme' => 'prijava_z_racuni_modal_block',
+        '#rememberMe' => empty($_COOKIE['remember-me']),
+        '#url_google' => $url_google,
+        '#lang' => $lang ?? [],
+      ];
    }

 }
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module
@ -9,19 +9,9 @@
 */
 function registracija_1ka_theme()
 {
-  if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') {
-    include(__DIR__ . '/../../../../../../lang/1.php');
-  }else{
-    include(__DIR__ . '/../../../../../../lang/2.php');
-  }
-
-
 //    $lang['cms_register_user_text'] = str_replace('GOOGLE_URL', variable_get('1ka_google_prijava'), $lang['cms_register_user_text']);
 //    $lang['cms_register_user_text'] = str_replace('FACEBOOK_URL', variable_get('1ka_facebook_prijava'), $lang['cms_register_user_text']);

-    // Naložimo 1ka nastavitve
-    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
-

    /**
     * Dodatne opcijske nastavitve
@ -39,11 +29,11 @@ function registracija_1ka_theme()
    return [
        'registracija_block' => [
            'variables' => [
-                'lang' => $lang ?? [],
-                'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                'lang' => [],
+                'jezik' => '',
                //'obvestila' => $obvestila,
-                'recaptcha_sitekey' => $recaptcha_sitekey ?? '',
-                'login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : '')
+                'recaptcha_sitekey' => '',
+                'login__link' => '',
           ]
        ]
    ];
--- a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
+++ b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php
@ -19,8 +19,23 @@ class RegistracijaBlock extends BlockBase {
   * {@inheritdoc}
   */
  public function build() {
+    $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    if($currentLanguage == 'sl') {
+      include(__DIR__ . '/../../../../../../../../../lang/1.php');
+    } else{
+      include(__DIR__ . '/../../../../../../../../../lang/2.php');
+    }
+
+    // Naložimo 1ka nastavitve
+    require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
+
    return [
      '#theme' => 'registracija_block',
+      '#lang' => $lang ?? [],
+      '#jezik' => $currentLanguage,
+      '#recaptcha_sitekey' => $recaptcha_sitekey ?? '',
+      '#login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : ''),
    ];
  }

@ -29,4 +44,3 @@ class RegistracijaBlock extends BlockBase {
  }

 }
-
--- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php
+++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/ReturnCallController.php
@ -22,6 +22,11 @@ class ReturnCallController extends ControllerBase
            'description' => [
                '#type' => 'inline_template',
                '#template' => $template,
+                '#context' => [
+                  'language' => [
+                    'id' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                  ],
+                ],
            ],
        ];

@ -39,6 +44,11 @@ class ReturnCallController extends ControllerBase
            'description' => [
                '#type' => 'inline_template',
                '#template' => $template,
+                '#context' => [
+                  'language' => [
+                    'id' => \Drupal::languageManager()->getCurrentLanguage()->getId(),
+                  ],
+                ],
            ],
        ];