Activities: fix PHP warnings for gibbonSchoolYearTermID in Manage Enr…

…olment
GibbonEdu · Nov 14, 2024 · 9005433 · 9005433
1 parent b4cc3cc
commit 9005433
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/modules/Activities/activities_manage_enrolment_edit.php b/modules/Activities/activities_manage_enrolment_edit.php
@@ -23,6 +23,7 @@
 use Gibbon\Domain\System\SettingGateway;
 use Gibbon\Forms\Form;
 use Gibbon\Services\Format;
+use Gibbon\Http\Url;
 
 //Module includes
 require_once __DIR__ . '/moduleFunctions.php';
@@ -78,17 +79,12 @@
             $settingGateway = $container->get(SettingGateway::class);
             $dateType = $settingGateway->getSettingByScope('Activities', 'dateType');
 
-            $form = Form::create('activityEnrolment', $session->get('absoluteURL').'/modules/'.$session->get('module')."/activities_manage_enrolment_editProcess.php?gibbonActivityID=$gibbonActivityID&gibbonPersonID=$gibbonPersonID&search=".$_GET['search']."&gibbonSchoolYearTermID=".$_GET['gibbonSchoolYearTermID']);
+            $form = Form::create('activityEnrolment', Url::fromModuleRoute('Activities', 'activities_manage_enrolment_editProcess')->withQueryParams($urlParams + ['gibbonPersonID' => $gibbonPersonID])->directLink());
 
-            if ($_GET['search'] != '' || $_GET['gibbonSchoolYearTermID'] != '') {
-                $params = [
-                    "search" => $_GET['search'] ?? '',
-                    "gibbonSchoolYearTermID" => $_GET['gibbonSchoolYearTermID'] ?? null,
-                    "gibbonActivityID" => $gibbonActivityID
-                ];
+            if (!empty($_GET['search']) != '' || !empty( $_GET['gibbonSchoolYearTermID'])) {
                 $form->addHeaderAction('back', __('Back'))
                     ->setURL('/modules/Activities/activities_manage_enrolment.php')
-                    ->addParams($params);
+                    ->addParams($urlParams);
 			}
 
             $form->addHiddenValue('address', $session->get('address'));