Download as
Browse Code »

Commit b0015af25ab7d6f502cd599e121008acc5f85345

Authored by Evandro Junior
1 parent 58c52ff2
Exists in contigency_plan_recaptcha

Recaptcha v1 working! 

Instruções:

Usar estas configurações no backend

environment.api_captcha_settings
{
:enabled => true,
:provider => "google",
:verify_uri => "https://www.google.com/recaptcha/api/verify",
:version => 1,
:private_key => "6LcLPAcTAAAAAE36SN1M2w1I7Hn8upwXYZ_YQZ5-"
}

Fazer merge do master do front end com o branch:

~/projetos/noosfero/public/proposal-app(contigency_plan_recaptcha)

Cruze os dedos e boa sorte
Showing 2 changed files with 9 additions and 12 deletions   Show diff stats
@@ -459,7 +459,7 @@ @@ -459,7 +459,7 @@
459 <input id="forgot-password-value" name="value" type="text" required placeholder="Nome de usuário ou E-mail"> 459 <input id="forgot-password-value" name="value" type="text" required placeholder="Nome de usuário ou E-mail">
460 </div> 460 </div>
461 </div> 461 </div>
462 - <div class="row"> 462 + <div class="row" id="captcha">
463 <div id="g-recaptcha"></div> 463 <div id="g-recaptcha"></div>
464 </div> 464 </div>
465 <div class="row"> 465 <div class="row">
@@ -55,12 +55,12 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -55,12 +55,12 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
55 if(patt.test(window.location.href)){ 55 if(patt.test(window.location.href)){
56 host = 'http://login.dialoga.gov.br'; 56 host = 'http://login.dialoga.gov.br';
57 }else if (new RegExp(':3001/').test(window.location.href)){ 57 }else if (new RegExp(':3001/').test(window.location.href)){
58 - host = 'http://noosfero.com:3001'; 58 + host = 'http://dialoga.gov.br:3001';
59 // dialoga_community = 104; 59 // dialoga_community = 104;
60 // proposal_discussion = '413'; //Eugênio 60 // proposal_discussion = '413'; //Eugênio
61 // proposal_discussion = '392'; //Evandro 61 // proposal_discussion = '392'; //Evandro
62 // cat_saude = 23; 62 // cat_saude = 23;
63 - recaptchaSiteKey = '6LdsWAcTAAAAAChTUUD6yu9fCDhdIZzNd7F53zf-'; //http://noosfero.com/ 63 + recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i'; // dialoga.gov.br
64 } else { //ABNER 64 } else { //ABNER
65 host = 'http://local.abner.com:3002'; 65 host = 'http://local.abner.com:3002';
66 dialoga_community = 105; 66 dialoga_community = 105;
@@ -890,12 +890,9 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -890,12 +890,9 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
890 }); 890 });
891 }, 891 },
892 reloadCaptcha: function(element) { 892 reloadCaptcha: function(element) {
893 - var $element = $(element);  
894 - if($element.data('captcha')){  
895 - Recaptcha.reload();  
896 - //Recaptcha.create(window.recaptchaSiteKey, $element.find('#g-recaptcha')[0], { lang : 'pt', theme: "clean", callback: Recaptcha.focus_response_field } );  
897 - //$element.data('captcha').recarregar();  
898 - } 893 + if(typeof(Recaptcha) == "object"){
  894 + Recaptcha.reload();
  895 + }
899 }, 896 },
900 initCaptcha: function(element) { 897 initCaptcha: function(element) {
901 var $element = $(element); 898 var $element = $(element);
@@ -1504,7 +1501,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -1504,7 +1501,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1504 signupForm.find('#signup-user_name').val(''); 1501 signupForm.find('#signup-user_name').val('');
1505 signupForm.find('#user_password_confirmation').val(''); 1502 signupForm.find('#user_password_confirmation').val('');
1506 signupForm.find('#signup-user_password').val(''); 1503 signupForm.find('#signup-user_password').val('');
1507 - signupForm.find('#captcha_text').val(''); 1504 + signupForm.find('#recaptcha_response_field').val('');
1508 signupForm.find('#user_terms_accepted').removeAttr('checked'); 1505 signupForm.find('#user_terms_accepted').removeAttr('checked');
1509 1506
1510 Main.initCaptcha(signupForm.find('#captcha')[0]); 1507 Main.initCaptcha(signupForm.find('#captcha')[0]);
@@ -1529,7 +1526,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -1529,7 +1526,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1529 var $inputPassword = $signupForm.find('#signup-user_password'); 1526 var $inputPassword = $signupForm.find('#signup-user_password');
1530 var $inputPasswordConfirmation = $signupForm.find('#user_password_confirmation'); 1527 var $inputPasswordConfirmation = $signupForm.find('#user_password_confirmation');
1531 var $inputAcceptation = $signupForm.find('#user_terms_accepted'); 1528 var $inputAcceptation = $signupForm.find('#user_terms_accepted');
1532 - var $inputCaptcha = $signupForm.find('#captcha_text'); 1529 + var $inputCaptcha = $signupForm.find('#recaptcha_response_field');
1533 1530
1534 // clear messages 1531 // clear messages
1535 var message = $('.signup .message'); 1532 var message = $('.signup .message');
@@ -1649,7 +1646,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -1649,7 +1646,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1649 // (Invalid request) login can't be saved 1646 // (Invalid request) login can't be saved
1650 ptBR['(Invalid request) login can\'t be saved'] = 'Nome de usuário inválido.'; 1647 ptBR['(Invalid request) login can\'t be saved'] = 'Nome de usuário inválido.';
1651 ptBR['Please solve the test in order to register.'] = 'Por favor, digite os caracteres da imagem na caixa abaixo dela.'; 1648 ptBR['Please solve the test in order to register.'] = 'Por favor, digite os caracteres da imagem na caixa abaixo dela.';
1652 - ptBR['Wrong captcha text, please try again'] = 'Por favor, digite os caracteres da imagem na caixa abaixo dela.'; 1649 + ptBR['Wrong captcha text, please try again'] = 'Texto da imagem incorreto. Por favor, digite os caracteres da imagem na caixa abaixo dela.';
1653 ptBR['Internal captcha validation error'] = 'Por favor, digite os caracteres da imagem na caixa abaixo dela.'; 1650 ptBR['Internal captcha validation error'] = 'Por favor, digite os caracteres da imagem na caixa abaixo dela.';
1654 msg = '<br/><br/>'; 1651 msg = '<br/><br/>';
1655 msg += ptBR[data.responseJSON.message] || data.responseJSON.message; 1652 msg += ptBR[data.responseJSON.message] || data.responseJSON.message;