Merge branch 'master' of github.com:chamilo/chamilo-lms

ywarnier · ywarnier · commit 087331dbf741 · 2025-09-30T00:39:49.000+02:00
diff --git a/public/plugin/BuyCourses/src/buy_course_plugin.class.php b/public/plugin/BuyCourses/src/buy_course_plugin.class.php
@@ -1943,7 +1943,7 @@ public function getPayouts(
         ";
 
         $payouts = Database::select(
-            "p.* , u.firstname, u.lastname, efv.value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",
+            "p.* , u.firstname, u.lastname, efv.field_value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",
             "$payoutsTable p $innerJoins",
             [
                 'where' => ['p.status = ? '.$condition.' '.$condition2 => $status],
@@ -1981,7 +1981,7 @@ public function verifyPaypalAccountByBeneficiary($userId)
 
         $paypalFieldId = $paypalExtraField['id'];
         $paypalAccount = Database::select(
-            'value',
+            'field_value',
             $extraFieldValues,
             [
                 'where' => ['field_id = ? AND item_id = ?' => [(int) $paypalFieldId, (int) $userId]],
@@ -1993,7 +1993,7 @@ public function verifyPaypalAccountByBeneficiary($userId)
             return false;
         }
 
-        if ('' === $paypalAccount['value']) {
+        if ('' === $paypalAccount['field_value']) {
             return false;
         }
 
diff --git a/public/plugin/BuyCourses/view/course_panel.tpl b/public/plugin/BuyCourses/view/course_panel.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 
 <div id="buy-courses-tabs">
@@ -48,3 +49,4 @@
 
 
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/export_report.tpl b/public/plugin/BuyCourses/view/export_report.tpl
@@ -1 +1,4 @@
+{% autoescape false %}
 {{ form }}
+{% endautoescape %}
+
diff --git a/public/plugin/BuyCourses/view/index.tpl b/public/plugin/BuyCourses/view/index.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="resources/css/style.css"/>
 {% if is_granted('ROLE_ADMIN') %}
     <div class="row">
@@ -77,3 +78,4 @@
         </div>
     {% endif %}
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/list.tpl b/public/plugin/BuyCourses/view/list.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 
 {% if sessions_are_included or services_are_included %}
@@ -231,3 +232,4 @@
         </div>
     {% endif %}
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/paymentsetup.tpl b/public/plugin/BuyCourses/view/paymentsetup.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 
 <div class="panel panel-default">
@@ -120,3 +121,4 @@
         </div>
     </div>
 {% endif %}
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/payout_panel.tpl b/public/plugin/BuyCourses/view/payout_panel.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 
 <div id="buy-courses-tabs">
@@ -50,3 +51,4 @@
     {% endif %}
 
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/payout_report.tpl b/public/plugin/BuyCourses/view/payout_report.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 {{ form }}
 <div class="table-responsive">
     <table class="table table-striped table-hover">
@@ -97,3 +98,4 @@
 
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/paypal_payout.tpl b/public/plugin/BuyCourses/view/paypal_payout.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="table-responsive">
     <table class="table table-striped table-hover">
         <thead>
@@ -129,3 +130,4 @@
         });
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/process.tpl b/public/plugin/BuyCourses/view/process.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="actions">
     <a href="{{ url('index') }}main/auth/courses.php" title="{{ "Back"|get_lang }}">
         <img src="{{ "back.png"|icon(32) }}" width="32" height="32" alt="{{ "Back"|get_lang }}"
@@ -133,3 +134,4 @@
         $("label[for=submit]").remove();
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/process_confirm.tpl b/public/plugin/BuyCourses/view/process_confirm.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="row">
     <div id="message-alert"></div>
     <div class="col-md-5">
@@ -281,3 +282,4 @@
         {% endif %}
     })
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/service_information.tpl b/public/plugin/BuyCourses/view/service_information.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div id="service" class="service">
     <div class="page-header">
         <h2>{{ service.title }}</h2>
@@ -106,3 +107,4 @@
         </div>
     </div>
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/service_panel.tpl b/public/plugin/BuyCourses/view/service_panel.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 <script type="text/javascript" src="../resources/js/modals.js"></script>
 
@@ -86,3 +87,4 @@
         });
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/service_process.tpl b/public/plugin/BuyCourses/view/service_process.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="actions">
     <a href="{{ url('index') }}main/auth/courses.php" title="{{ "Back"|get_lang }}">
         <img src="{{ "back.png"|icon(32) }}" width="32" height="32" alt="{{ "Back"|get_lang }}"
@@ -94,3 +95,4 @@
         $("label[for=submit]").remove();
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/service_sales_report.tpl b/public/plugin/BuyCourses/view/service_sales_report.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 <script type="text/javascript" src="../resources/js/modals.js"></script>
 
@@ -114,3 +115,4 @@
         });
     });
 </script>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/session_panel.tpl b/public/plugin/BuyCourses/view/session_panel.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <link rel="stylesheet" type="text/css" href="../resources/css/style.css"/>
 
 <div id="buy-courses-tabs">
@@ -48,3 +49,4 @@
 
 
 </div>
+{% endautoescape %}
diff --git a/public/plugin/BuyCourses/view/success.tpl b/public/plugin/BuyCourses/view/success.tpl
@@ -1,3 +1,4 @@
+{% autoescape false %}
 <div class="alert alert-info">
     {{ 'PayPalPaymentOKPleaseConfirm'|get_plugin_lang('BuyCoursesPlugin') }}
 </div>
@@ -68,3 +69,4 @@
 </div>
 
 {{ form }}
+{% endautoescape %}

Original file line number	Diff line number	Diff line change
`@@ -1943,7 +1943,7 @@ public function getPayouts(`
`1943`	`1943`	`";`
`1944`	`1944`
`1945`	`1945`	`$payouts = Database::select(`
`1946`		`- "p.* , u.firstname, u.lastname, efv.value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",`
	`1946`	`+ "p.* , u.firstname, u.lastname, efv.field_value as paypal_account, s.reference as sale_reference, s.price as item_price, c.iso_code",`
`1947`	`1947`	`"$payoutsTable p $innerJoins",`
`1948`	`1948`	`[`
`1949`	`1949`	`'where' => ['p.status = ? '.$condition.' '.$condition2 => $status],`
`@@ -1981,7 +1981,7 @@ public function verifyPaypalAccountByBeneficiary($userId)`
`1981`	`1981`
`1982`	`1982`	`$paypalFieldId = $paypalExtraField['id'];`
`1983`	`1983`	`$paypalAccount = Database::select(`
`1984`		`- 'value',`
	`1984`	`+ 'field_value',`
`1985`	`1985`	`$extraFieldValues,`
`1986`	`1986`	`[`
`1987`	`1987`	`'where' => ['field_id = ? AND item_id = ?' => [(int) $paypalFieldId, (int) $userId]],`
`@@ -1993,7 +1993,7 @@ public function verifyPaypalAccountByBeneficiary($userId)`
`1993`	`1993`	`return false;`
`1994`	`1994`	`}`
`1995`	`1995`
`1996`		`- if ('' === $paypalAccount['value']) {`
	`1996`	`+ if ('' === $paypalAccount['field_value']) {`
`1997`	`1997`	`return false;`
`1998`	`1998`	`}`
`1999`	`1999`