Skip to content

Commit 3260318

Browse files
AngelFQCAngelFQC
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents 6580e5f + 9116c67 commit 3260318

14 files changed

+170
-114
lines changed

‎public/main/admin/access_url_edit_course_category_to_url.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function remove_item(origin) {
189189
<?php foreach ($noUserGroupList as $noItem) {
190190
?>
191191
<option value="<?php echo $noItem['id']; ?>">
192-
<?php echo $noItem['name']; ?>
192+
<?php echo $noItem['title']; ?>
193193
</option>
194194
<?php
195195
} ?>
@@ -222,7 +222,7 @@ function remove_item(origin) {
222222
foreach ($userGroupList as $item) {
223223
?>
224224
<option value="<?php echo $item['id']; ?>">
225-
<?php echo $item['name']; ?>
225+
<?php echo $item['tilte']; ?>
226226
</option>
227227
<?php
228228
}

‎public/main/admin/access_url_edit_usergroup_to_url.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ function remove_item(origin) {
217217
<select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" class="form-control">
218218
<?php foreach ($noUserGroupList as $noItem) {
219219
?>
220-
<option value="<?php echo $noItem['id']; ?>"><?php echo $noItem['name']; ?></option>
220+
<option value="<?php echo $noItem['id']; ?>"><?php echo $noItem['title']; ?></option>
221221
<?php
222222
} ?>
223223
</select>
@@ -254,7 +254,7 @@ function remove_item(origin) {
254254
<?php foreach ($userGroupList as $item) {
255255
?>
256256
<option value="<?php echo $item['id']; ?>">
257-
<?php echo $item['name']; ?>
257+
<?php echo $item['title']; ?>
258258
</option>
259259
<?php
260260
} ?>

‎public/main/course_info/infocours.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,23 @@
325325
);
326326
$globalGroup[get_lang('E-mail teacher when a new user auto-subscribes')] = $group;
327327

328+
$group = [];
329+
$group[] = $form->createElement(
330+
'radio',
331+
'email_alert_student_on_manual_subscription',
332+
get_lang('E-mail student when he is subscribed to the course'),
333+
get_lang('Enable'),
334+
1
335+
);
336+
$group[] = $form->createElement(
337+
'radio',
338+
'email_alert_student_on_manual_subscription',
339+
null,
340+
get_lang('Disable'),
341+
0
342+
);
343+
$globalGroup[get_lang('E-mail student when he is subscribed to the course')] = $group;
344+
328345
$group = [];
329346
$group[] = $form->createElement(
330347
'radio',
@@ -923,6 +940,10 @@
923940
$values['student_delete_own_publication'] = 0;
924941
}
925942

943+
if (!isset($values['email_alert_student_on_manual_subscription'])) {
944+
$values['email_alert_student_on_manual_subscription'] = 0;
945+
}
946+
926947
$documentAutoLaunch = api_get_course_setting('enable_document_auto_launch');
927948
$lpAutoLaunch = api_get_course_setting('enable_lp_auto_launch');
928949
$exerciseAutoLaunch = api_get_course_setting('enable_exercise_auto_launch');

‎public/main/inc/lib/course.lib.php‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -913,17 +913,24 @@ public static function subscribeUser(
913913
)
914914
);
915915

916-
$subject = get_lang('You have been enrolled in the course').' '.$course->getTitle();
917-
$message = sprintf(get_lang('Hello %s, you have been enrolled in the course %s.'), UserManager::formatUserFullName($user, true), $course->getTitle());
916+
$sendToStudent = (int) api_get_course_setting('email_alert_student_on_manual_subscription', $course);
917+
if (1 === $sendToStudent) {
918+
$subject = get_lang('You have been enrolled in the course').' '.$course->getTitle();
919+
$message = sprintf(
920+
get_lang('Hello %s, you have been enrolled in the course %s.'),
921+
UserManager::formatUserFullName($user, true),
922+
$course->getTitle()
923+
);
918924

919-
MessageManager::send_message_simple(
920-
$userId,
921-
$subject,
922-
$message,
923-
api_get_user_id(),
924-
false,
925-
true
926-
);
925+
MessageManager::send_message_simple(
926+
$userId,
927+
$subject,
928+
$message,
929+
api_get_user_id(),
930+
false,
931+
true
932+
);
933+
}
927934

928935
$send = (int) api_get_course_setting('email_alert_to_teacher_on_new_user_in_course', $course);
929936

@@ -5301,6 +5308,7 @@ public static function getCourseSettingVariables(AppPlugin $appPlugin = null)
53015308
'email_alert_students_on_new_homework',
53025309
// Get send_mail_setting (auth)from table
53035310
'email_alert_to_teacher_on_new_user_in_course',
5311+
'email_alert_student_on_manual_subscription',
53045312
'enable_lp_auto_launch',
53055313
'enable_exercise_auto_launch',
53065314
'enable_document_auto_launch',

‎src/CoreBundle/Migrations/Schema/V200/Version20241002002830.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100000.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20241002002830 extends AbstractMigrationChamilo
12+
final class Version20201210100000 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

‎src/CoreBundle/Migrations/Schema/V200/Version20240928003000.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100001.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20240928003000 extends AbstractMigrationChamilo
12+
final class Version20201210100001 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

‎src/CoreBundle/Migrations/Schema/V200/Version20250306100000.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100002.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20250306100000 extends AbstractMigrationChamilo
12+
final class Version20201210100002 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

‎src/CoreBundle/Migrations/Schema/V200/Version20240204120000.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100003.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20240204120000 extends AbstractMigrationChamilo
12+
final class Version20201210100003 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

‎src/CoreBundle/Migrations/Schema/V200/Version20250120103800.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100004.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20250120103800 extends AbstractMigrationChamilo
12+
final class Version20201210100004 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

‎src/CoreBundle/Migrations/Schema/V200/Version20241214083500.php‎ renamed to ‎src/CoreBundle/Migrations/Schema/V200/Version20201210100005.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
1010
use Doctrine\DBAL\Schema\Schema;
1111

12-
final class Version20241214083500 extends AbstractMigrationChamilo
12+
final class Version20201210100005 extends AbstractMigrationChamilo
1313
{
1414
public function getDescription(): string
1515
{

0 commit comments

Comments
 (0)