Modules: rewrite include path (#621)

* remove $_SESSION[$guid] from include / require path. * use `require_once` to include function files. * remove unnecessary trailing '?>' at file ends.
GibbonEdu · Sep 14, 2018 · d71a00f · d71a00f
1 parent 0739c37
commit d71a00f
Show file tree

Hide file tree

Showing 275 changed files with 292 additions and 307 deletions.
diff --git a/modules/Activities/activities_attendance.php b/modules/Activities/activities_attendance.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_attendance.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_attendance_sheet.php b/modules/Activities/activities_attendance_sheet.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_attendance_sheet.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_attendance_sheetPrint.php b/modules/Activities/activities_attendance_sheetPrint.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_attendance_sheet.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage.php b/modules/Activities/activities_manage.php
@@ -24,7 +24,7 @@
 use Gibbon\Services\Format;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_add.php b/modules/Activities/activities_manage_add.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_add.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_delete.php b/modules/Activities/activities_manage_delete.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Prefab\DeleteForm;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_delete.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_edit.php b/modules/Activities/activities_manage_edit.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_edit.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_enrolment.php b/modules/Activities/activities_manage_enrolment.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_enrolment.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_enrolment_add.php b/modules/Activities/activities_manage_enrolment_add.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_enrolment_add.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_manage_enrolment_addProcess.php b/modules/Activities/activities_manage_enrolment_addProcess.php
@@ -20,7 +20,7 @@
 include '../../gibbon.php';
 
 //Module includes
-include $_SESSION[$guid]['absolutePath'].'/modules/Activities/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 $gibbonActivityID = $_GET['gibbonActivityID'];
 

diff --git a/modules/Activities/activities_manage_enrolment_deleteProcess.php b/modules/Activities/activities_manage_enrolment_deleteProcess.php
@@ -20,7 +20,7 @@
 include '../../gibbon.php';
 
 //Module includes
-include $_SESSION[$guid]['absolutePath'].'/modules/Activities/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 $gibbonActivityID = $_GET['gibbonActivityID'];
 $gibbonPersonID = $_GET['gibbonPersonID'];

diff --git a/modules/Activities/activities_manage_enrolment_edit.php b/modules/Activities/activities_manage_enrolment_edit.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_manage_enrolment_edit.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_my.php b/modules/Activities/activities_my.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_my.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_my_full.php b/modules/Activities/activities_my_full.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_my_full.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_payment.php b/modules/Activities/activities_payment.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_payment.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_view.php b/modules/Activities/activities_view.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_view.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_view_full.php b/modules/Activities/activities_view_full.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_view_full.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_view_register.php b/modules/Activities/activities_view_register.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/activities_view_register.php') == false) {
     //Acess denied

diff --git a/modules/Activities/activities_view_registerProcess.php b/modules/Activities/activities_view_registerProcess.php
@@ -22,7 +22,7 @@
 include '../../gibbon.php';
 
 //Module includes
-include $_SESSION[$guid]['absolutePath'].'/modules/Activities/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 $mode = $_POST['mode'];
 $gibbonActivityID = $_POST['gibbonActivityID'];

diff --git a/modules/Activities/report_activityChoices_byRollGroup.php b/modules/Activities/report_activityChoices_byRollGroup.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_activityChoices_byRollGroup.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_activityChoices_byStudent.php b/modules/Activities/report_activityChoices_byStudent.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_activityChoices_byStudent.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_activityEnrollmentSummary.php b/modules/Activities/report_activityEnrollmentSummary.php
@@ -23,7 +23,7 @@
 use Gibbon\Domain\Activities\ActivityReportGateway;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_activityEnrollmentSummary.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_activitySpread_rollGroup.php b/modules/Activities/report_activitySpread_rollGroup.php
@@ -25,7 +25,7 @@
 use Gibbon\Domain\Students\StudentGateway;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_activitySpread_rollGroup.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_activityType_rollGroup.php b/modules/Activities/report_activityType_rollGroup.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_activityType_rollGroup.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_attendance.php b/modules/Activities/report_attendance.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_attendance.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_attendance_byDate.php b/modules/Activities/report_attendance_byDate.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_attendance_byDate.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_attendance_print.php b/modules/Activities/report_attendance_print.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_attendance.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_participants.php b/modules/Activities/report_participants.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_participants.php') == false) {
     //Acess denied

diff --git a/modules/Activities/report_participants_print.php b/modules/Activities/report_participants_print.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Activities/report_participants_print.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/attendance.php b/modules/Attendance/attendance.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include "./modules/" . $_SESSION[$guid]["module"] . "/moduleFunctions.php" ;
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, "/modules/Attendance/attendance.php")==FALSE) {
 	//Acess denied

diff --git a/modules/Attendance/attendance_future_byPerson.php b/modules/Attendance/attendance_future_byPerson.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 require_once $_SESSION[$guid]['absolutePath'].'/modules/Attendance/src/attendanceView.php';
 

diff --git a/modules/Attendance/attendance_studentSelfRegister.php b/modules/Attendance/attendance_studentSelfRegister.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/attendance_studentSelfRegister.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/attendance_take_byCourseClass.php b/modules/Attendance/attendance_take_byCourseClass.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include "./modules/" . $_SESSION[$guid]["module"] . "/moduleFunctions.php";
+require_once __DIR__ . '/moduleFunctions.php';
 
 require_once $_SESSION[$guid]['absolutePath'].'/modules/Attendance/src/attendanceView.php';
 

diff --git a/modules/Attendance/attendance_take_byPerson.php b/modules/Attendance/attendance_take_byPerson.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 require_once $_SESSION[$guid]['absolutePath'].'/modules/Attendance/src/attendanceView.php';
 

diff --git a/modules/Attendance/attendance_take_byPerson_delete.php b/modules/Attendance/attendance_take_byPerson_delete.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Prefab\DeleteForm;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/attendance_take_byPerson_delete.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/attendance_take_byPerson_edit.php b/modules/Attendance/attendance_take_byPerson_edit.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 require_once $_SESSION[$guid]['absolutePath'].'/modules/Attendance/src/attendanceView.php';
 

diff --git a/modules/Attendance/attendance_take_byRollGroup.php b/modules/Attendance/attendance_take_byRollGroup.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 require_once $_SESSION[$guid]['absolutePath'].'/modules/Attendance/src/attendanceView.php';
 

diff --git a/modules/Attendance/report_courseClassesNotRegistered_byDate.php b/modules/Attendance/report_courseClassesNotRegistered_byDate.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_courseClassesNotRegistered_byDate.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/report_courseClassesNotRegistered_byDate_print.php b/modules/Attendance/report_courseClassesNotRegistered_byDate_print.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_courseClassesNotRegistered_byDate_print.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/report_graph_byType.php b/modules/Attendance/report_graph_byType.php
@@ -20,7 +20,7 @@
 use Gibbon\Forms\Form;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 function getDateRange($guid, $connection2, $first, $last, $step = '+1 day', $output_format = 'Y-m-d' ) {
 

diff --git a/modules/Attendance/report_rollGroupsNotRegistered_byDate.php b/modules/Attendance/report_rollGroupsNotRegistered_byDate.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_rollGroupsNotRegistered_byDate.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/report_rollGroupsNotRegistered_byDate_print.php b/modules/Attendance/report_rollGroupsNotRegistered_byDate_print.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_rollGroupsNotRegistered_byDate_print.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/report_studentHistory.php b/modules/Attendance/report_studentHistory.php
@@ -21,7 +21,7 @@
 use Gibbon\Forms\DatabaseFormFactory;
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_studentHistory.php') == false) {
     //Acess denied

diff --git a/modules/Attendance/report_studentHistory_print.php b/modules/Attendance/report_studentHistory_print.php
@@ -18,7 +18,7 @@
 */
 
 //Module includes
-include './modules/'.$_SESSION[$guid]['module'].'/moduleFunctions.php';
+require_once __DIR__ . '/moduleFunctions.php';
 
 if (isActionAccessible($guid, $connection2, '/modules/Attendance/report_studentHistory_print.php') == false) {
     //Acess denied