diff --git a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module index 5a5d048b6..de3efac05 100755 --- a/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module +++ b/frontend/drupal/sites/all/modules/nakupovanje_1ka/nakupovanje_1ka.module @@ -357,7 +357,9 @@ function cenik_paketov_1ka_poslovni_uporabniki() function nakupovanje_1ka_instalacija_na_1ka() { - return theme('nakupovanje_1ka_virtualna_domena'); + require(drupal_get_path('module', 'nakupovanje_1ka') . '/../../../../../../settings_optional.php'); + + return theme('nakupovanje_1ka_virtualna_domena', compact('recaptcha_sitekey')); } function nakupovanje_1ka_lastna_instalacija() diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js index e77db8448..983baba99 100755 --- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js +++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js @@ -1122,7 +1122,9 @@ } ); - if (jQuery('.error-field, .error-color').length > 0) { + jQuery('g-recaptcha-response') + + if (jQuery('.error-field, .error-color').length > 0 || jQuery('#varnostno-polje').val().length > 0 ) { return ''; } diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php index c265c4492..ecee6a5d3 100644 --- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php +++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php @@ -111,6 +111,19 @@ + +
diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index b7d5ffb72..5ee2aca53 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -1342,6 +1342,22 @@ class UserNarocila{ // Lastna instalacija - paket $strinjanje_s_pogoji = isset($narocilo_data['strinjanje_s_pogoji']) ? $narocilo_data['strinjanje_s_pogoji'] : ''; + // Varnostno preverimo, če robot izpolni polje + $varnostno_polje = isset($narocilo_data['varnostno-polje']) ? isset($narocilo_data['varnostno-polje']) : ''; + if(!empty($varnostno_polje)){ + return ['false' => true]; + } + + // Preverimo ReCaptcha + if (in_array($paket, [1,2]) && AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) { + $recaptchaResponse = isset($narocilo_data['g-recaptcha-response']) ? $narocilo_data['g-recaptcha-response'] : ''; + $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse); + + if (!strstr($requestReCaptcha, 'true')) { + return ['false' => true]; + } + } + // Posljemo mail s podatki povprasevanja $subject = $lang['srv_narocilo_poslovni_email_1ka_subject'];