From 1be201a17cefefe39b68c784644826cb28894e87 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 17 Sep 2018 15:42:27 -0500
Subject: [PATCH] BuyCourses: Fix redirection after self-registration - refs
 BT#14835

---
 main/auth/inscription.php         |  6 +++++-
 plugin/buycourses/src/process.php | 12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index d3c88b3b66..d2e85d0a0a 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -1067,7 +1067,11 @@ if ($form->validate()) {
     if ($usersCanCreateCourse) {
         $form_register->addElement('html', $form_data['button']);
     } else {
-        $form_register->addElement('html', $form_data['go_button']);
+        if (!empty($redirectBuyCourse)) {
+            $form_register->addButtonNext(get_lang('Next'));
+        } else {
+            $form_register->addElement('html', $form_data['go_button']);
+        }
     }
 
     $text_after_registration .= $form_register->returnForm();
diff --git a/plugin/buycourses/src/process.php b/plugin/buycourses/src/process.php
index c8f53b0188..415f4977c3 100644
--- a/plugin/buycourses/src/process.php
+++ b/plugin/buycourses/src/process.php
@@ -11,11 +11,7 @@ use ChamiloSession as Session;
 require_once '../config.php';
 
 $currentUserId = api_get_user_id();
-if (empty($currentUserId)) {
-    Session::write('buy_course_redirect', Security::remove_XSS($_SERVER['REQUEST_URI']));
-    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/inscription.php');
-    exit;
-}
+
 $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(
         WEB_PLUGIN_PATH
     ).'buycourses/resources/css/style.css"/>';
@@ -37,6 +33,12 @@ $buyingCourse = intval($_REQUEST['t']) === BuyCoursesPlugin::PRODUCT_TYPE_COURSE
 $buyingSession = intval($_REQUEST['t']) === BuyCoursesPlugin::PRODUCT_TYPE_SESSION;
 $queryString = 'i='.intval($_REQUEST['i']).'&t='.intval($_REQUEST['t']);
 
+if (empty($currentUserId)) {
+    Session::write('buy_course_redirect', api_get_self().'?'.$queryString);
+    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/inscription.php');
+    exit;
+}
+
 if ($buyingCourse) {
     $courseInfo = $plugin->getCourseInfo($_REQUEST['i']);
     $item = $plugin->getItemByProduct($_REQUEST['i'], BuyCoursesPlugin::PRODUCT_TYPE_COURSE);