Fixed bug with link to controller in protected tags public forms

jbogdani · Jun 4, 2021 · 205f9a8 · 205f9a8
1 parent 3c2081e
commit 205f9a8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/modules/protectedtags/protectedtags.php b/modules/protectedtags/protectedtags.php
@@ -16,7 +16,8 @@ class protectedtags_ctrl extends Controller
   public function sendemail_form()
   {
     $this->render('protectedtags', 'email_form', array(
-      'all_tags' => protectedTags::getData('tags')
+      'all_tags' => protectedTags::getData('tags'),
+      "link2home" => link::format('home')
     ));
   }
 
@@ -275,11 +276,12 @@ public function loginForm($css)
     if (!$_SESSION['token']) {
       $_SESSION['token'] = md5(uniqid(rand(), true));
     }
-
+    
     $this->render('protectedtags', 'login_form', array(
       'token' => $_SESSION['token'],
       'grc_sitekey' => protectedTags::isCaptchaEnabled() ? cfg::get('grc_sitekey') : false,
-      'css' => $css
+      'css' => $css,
+      "link2home" => link::format('home')
     ));
   }
 
@@ -296,7 +298,8 @@ public function registerForm($tag, $css)
       'grc_sitekey' => protectedTags::isCaptchaEnabled() ? cfg::get('grc_sitekey') : false,
       'tag' => $tag,
       'css' => $css,
-      'mode' => is_array($ar) ? $ar[$tag]['mode'] : false
+      'mode' => is_array($ar) ? $ar[$tag]['mode'] : false,
+      "link2home" => link::format('home')
     ));
   }
 
@@ -311,7 +314,8 @@ public function logoutButton($css)
   {
     if ($_SESSION['user_email']) {
       $this->render('protectedtags', 'logout_button', array(
-        'css' => $css
+        'css' => $css,
+        "link2home" => link::format('home')
       ));
     }
   }

diff --git a/modules/protectedtags/tmpl/email_form.twig b/modules/protectedtags/tmpl/email_form.twig
@@ -90,7 +90,7 @@ form.on('submit', function(){
   $('#{{ uid }} .loading').show();
 
   $.post(
-    'controller.php?obj=protectedtags_ctrl&method=send_email',
+    '{{ link2home }}controller.php?obj=protectedtags_ctrl&method=send_email',
     form.serialize(), function(data){
       $('#{{ uid }} .loading').hide();
       $('#{{ uid }} .results').html(

diff --git a/modules/protectedtags/tmpl/login_form.twig b/modules/protectedtags/tmpl/login_form.twig
@@ -78,7 +78,7 @@ $('#loginform').on('submit', function(){
     form.find('.form_err').text('{{ tr.get('password_required') }}');
     return false;
   }
-  $.post('controller.php?obj=protectedtags_ctrl&method=login', form.serialize(), function(data){
+  $.post('{{ link2home }}controller.php?obj=protectedtags_ctrl&method=login', form.serialize(), function(data){
     if (data.status === 'success'){
         window.location.reload(false);
         window.scrollTo(0,0);

diff --git a/modules/protectedtags/tmpl/logout_button.twig b/modules/protectedtags/tmpl/logout_button.twig
@@ -17,7 +17,7 @@ if (!window.jQuery){
   return;
 }
 $('#logoutbutton').on('click', function(){
-  $.get('controller.php?obj=protectedtags_ctrl&method=logout', function(data){
+  $.get('{{ link2home }}controller.php?obj=protectedtags_ctrl&method=logout', function(data){
     if (data.status === 'success'){
         location.reload();
       }

diff --git a/modules/protectedtags/tmpl/register.twig b/modules/protectedtags/tmpl/register.twig
@@ -169,7 +169,7 @@ if (typeof recaptchaCallback !== 'function') {
     } else {
       return false;
     }
-    $.post('controller.php?obj=protectedtags_ctrl&method=login', $(this).serialize(), function(data){
+    $.post('{{ link2home }}controller.php?obj=protectedtags_ctrl&method=login', $(this).serialize(), function(data){
       if (data.status === 'success'){
         {% if mode == 'dont_confirm' %}
         window.location.reload();

diff --git a/version b/version
@@ -1,3 +1,4 @@
+5.5.13[] = "Fixed bug with link to controller in protected tags public forms"
 5.5.12[] = "Fixed issue with serach string not being url_decoded"
 5.5.11[] = "Fixed issue with tr.sget in templates"
 5.5.10[] = "Intellisense suggestions fixed"