v5.29.07

Author: Ross Parker

Free Learning/CHANGEDB.php

@@ -2420,7 +2420,6 @@
 $sql[$count][0] = '5.29.04';
 $sql[$count][1] = "ALTER TABLE `freeLearningUnitStudent` ADD INDEX `studentUnit` (`gibbonPersonIDStudent`,`freeLearningUnitID`);end";
 
-
 //v5.29.05
 ++$count;
 $sql[$count][0] = '5.29.05';
@@ -2431,5 +2430,9 @@
 $sql[$count][0] = '5.29.06';
 $sql[$count][1] = "";
 
+//v5.29.07
+++$count;
+$sql[$count][0] = '5.29.07';
+$sql[$count][1] = "";
 
 

Free Learning/CHANGELOG.txt

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v5.29.07
+-------
+Added unit name injection into badge comment during badge grant
+
 v5.29.06
 -------
 Fixed the bug that was giving type error when on edit unit page

Free Learning/manifest.php

@@ -27,7 +27,7 @@
 $entryURL = 'units_browse.php';
 $type = 'Additional';
 $category = 'Learn';
-$version = '5.29.06';
+$version = '5.29.07';
 $author = "Gibbon Foundation";
 $url = "https://gibbonedu.org";
 

Free Learning/moduleFunctions.php

@@ -343,7 +343,7 @@ function getLearningAreas($connection2, $guid, $limit = false)
 }
 
 //Does not return errors, just does its best to get the job done
-function grantBadges($connection2, $guid, $gibbonPersonID) {
+function grantBadges($connection2, $guid, $gibbonPersonID, $settingGateway, $unitName) {
 
     global $session, $container, $pdo;
 
@@ -536,8 +536,9 @@ function grantBadges($connection2, $guid, $gibbonPersonID) {
 
             //GRANT AWARD
             if ($hitsNeeded > 0 AND $hitsActually == $hitsNeeded) {
+                $comment = (!empty($unitName)) ? __m('Free Learning').': '.$unitName : '';
                 try {
-                    $dataGrant = array('badgesBadgeID' => $row['badgesBadgeID'], 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $gibbonPersonID, 'comment' => '', 'gibbonPersonIDCreator' => null);
+                    $dataGrant = array('badgesBadgeID' => $row['badgesBadgeID'], 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $gibbonPersonID, 'comment' => $comment, 'gibbonPersonIDCreator' => null);
                     $sqlGrant = 'INSERT INTO badgesBadgeStudent SET badgesBadgeID=:badgesBadgeID, gibbonSchoolYearID=:gibbonSchoolYearID, date=:date, gibbonPersonID=:gibbonPersonID, comment=:comment, gibbonPersonIDCreator=:gibbonPersonIDCreator';
                     $resultGrant = $connection2->prepare($sqlGrant);
                     $resultGrant->execute($dataGrant);

Free Learning/units_browse_details_approvalProcess.php

@@ -260,7 +260,7 @@
                                 foreach ($gibbonPersonIDStudents AS $gibbonPersonIDStudent) {
                                     $notificationSender->addNotification($gibbonPersonIDStudent, $text, 'Free Learning', $actionLink);
                                     if (isActionAccessible($guid, $connection2, '/modules/Badges/badges_grant.php')) {
-                                        grantBadges($connection2, $guid, $gibbonPersonIDStudent, $settingGateway);
+                                        grantBadges($connection2, $guid, $gibbonPersonIDStudent, $settingGateway, $urlParams["name"]);
                                     }
                                 }
                                 $notificationSender->sendNotifications();
@@ -287,9 +287,10 @@
 
                             // Deal with manually granted badges
                             $enableManualBadges = $settingGateway->getSettingByScope('Free Learning', 'enableManualBadges');
-                            if ($enableManualBadges == 'Y' && isModuleAccessible($guid, $connection2, '/modules/Badges/badges_grant.php') && !is_null($badgesBadgeID)) {
+                            if ($enableManualBadges == 'Y' && isModuleAccessible($guid, $connection2, '/modules/Badges/badges_grant.php') && !empty($badgesBadgeID)) {
                                 foreach ($gibbonPersonIDStudents AS $gibbonPersonIDStudent) {
-                                    $data = array('badgesBadgeID' => $badgesBadgeID, 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $gibbonPersonIDStudent, 'comment' => '', 'gibbonPersonIDCreator' => $session->get('gibbonPersonID',''));
+                                    $comment = (!empty($urlParams["name"])) ? __m('Free Learning').': '.$urlParams["name"] : '';
+                                    $data = array('badgesBadgeID' => $badgesBadgeID, 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $gibbonPersonIDStudent, 'comment' => $comment, 'gibbonPersonIDCreator' => $session->get('gibbonPersonID',''));
                                     $sql = 'INSERT INTO badgesBadgeStudent SET badgesBadgeID=:badgesBadgeID, gibbonSchoolYearID=:gibbonSchoolYearID, date=:date, gibbonPersonID=:gibbonPersonID, comment=:comment, gibbonPersonIDCreator=:gibbonPersonIDCreator';
                                     $result = $connection2->prepare($sql);
                                     $result->execute($data);

Free Learning/units_mentor_approvalProcess.php

@@ -134,15 +134,16 @@
                 $actionLink = Url::fromModuleRoute('Free Learning', 'units_browse_details')->withPath("")->withQueryParams(["freeLearningUnitID" => $freeLearningUnitID, "gibbonDepartmentID" => $gibbonDepartmentID, "difficulty" => $difficulty, "name" => $name, "showInactive" => $showInactive, "sidebar" => "true", "tab" => "1", "view" => "view"]);
                 foreach ($collaborators as $collaborator) {
                     $notificationSender->addNotification($collaborator['gibbonPersonIDStudent'], $text, 'Free Learning', $actionLink);
-                    grantBadges($connection2, $guid, $collaborator['gibbonPersonIDStudent'], $settingGateway);
+                    grantBadges($connection2, $guid, $collaborator['gibbonPersonIDStudent'], $settingGateway, $name);
                 }
                 $notificationSender->sendNotifications();
 
                 // Deal with manually granted badges
                 $enableManualBadges = $settingGateway->getSettingByScope('Free Learning', 'enableManualBadges');
-                if ($enableManualBadges == 'Y' && isModuleAccessible($guid, $connection2, '/modules/Badges/badges_grant.php') && !is_null($badgesBadgeID)) {
+                if ($enableManualBadges == 'Y' && isModuleAccessible($guid, $connection2, '/modules/Badges/badges_grant.php') && !empty($badgesBadgeID)) {
                     foreach ($collaborators as $collaborator) {
-                        $data = array('badgesBadgeID' => $badgesBadgeID, 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $collaborator['gibbonPersonIDStudent'], 'comment' => '', 'gibbonPersonIDCreator' => $session->get('gibbonPersonID',''));
+                        $comment = (!empty($name)) ? __m('Free Learning').': '.$name : '';
+                        $data = array('badgesBadgeID' => $badgesBadgeID, 'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'), 'date' => date('Y-m-d'), 'gibbonPersonID' => $collaborator['gibbonPersonIDStudent'], 'comment' => $comment, 'gibbonPersonIDCreator' => $session->get('gibbonPersonID',''));
                         $sql = 'INSERT INTO badgesBadgeStudent SET badgesBadgeID=:badgesBadgeID, gibbonSchoolYearID=:gibbonSchoolYearID, date=:date, gibbonPersonID=:gibbonPersonID, comment=:comment, gibbonPersonIDCreator=:gibbonPersonIDCreator';
                         $result = $connection2->prepare($sql);
                         $result->execute($data);

Free Learning/version.php

@@ -22,5 +22,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '5.29.06';
+$moduleVersion = '5.29.07';
 $coreVersion = '28.0.00';