Move lib.php to classes/handlers.php

NDLANO · Jan 21, 2025 · 082b766 · 082b766
1 parent 3a1c6c7
commit 082b766
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/lib.php → classes/handlers.php b/lib.php → classes/handlers.php
@@ -23,11 +23,14 @@
  * @license    https://opensource.org/license/mit MIT
  */
 
+namespace local_h5pcaretaker;
+use core\context\system as context_system;
+
 defined('MOODLE_INTERNAL') || die();
 
-require_once(join(DIRECTORY_SEPARATOR, [__DIR__, 'vendor', 'autoload.php']));
-require_once(join(DIRECTORY_SEPARATOR, [__DIR__, 'classes', 'locale_utils.php']));
-require_once(join(DIRECTORY_SEPARATOR, [__DIR__, 'classes', 'render.php']));
+require_once(join(DIRECTORY_SEPARATOR, [__DIR__, '..', 'vendor', 'autoload.php']));
+require_once(join(DIRECTORY_SEPARATOR, [__DIR__, 'locale_utils.php']));
+require_once(join(DIRECTORY_SEPARATOR, [__DIR__, 'render.php']));
 
 use Ndlano\H5PCaretaker\H5PCaretaker;
 use local_h5pcaretaker\constants;
@@ -42,7 +45,7 @@
  * phpcs:ignore moodle.Commenting.FileExpectedTags.LicenseTagInvalid
  * @license    https://opensource.org/license/mit MIT
  */
-class local_h5pcaretaker {
+class handlers {
 
     /**
      * Handle API request to start the Caretaker procedure.
@@ -64,7 +67,7 @@ public static function handler_start() {
         get_string_manager()->reset_caches();
 
         // Load the H5P Caretaker client.
-        $distdir = join(DIRECTORY_SEPARATOR, [__DIR__, 'node_modules', 'h5p-caretaker-client', 'dist']);
+        $distdir = join(DIRECTORY_SEPARATOR, [__DIR__, '..', 'node_modules', 'h5p-caretaker-client', 'dist']);
         $disturl = '/local/h5pcaretaker/node_modules/h5p-caretaker-client/dist';
 
         render::render_html(

diff --git a/index.php b/index.php
@@ -26,8 +26,9 @@
 // Login is not a mandatory requirement for this page.
 // phpcs:ignore moodle.Files.RequireLogin.Missing
 require_once(__DIR__ . '/../../config.php');
-require_once(__DIR__ . '/lib.php');
+require_once(__DIR__ . '/classes/handlers.php');
 use core\context\system as context_system;
+use local_h5pcaretaker\handlers;
 use local_h5pcaretaker\constants;
 
 defined('MOODLE_INTERNAL') || die();
@@ -53,10 +54,10 @@
         require_sesskey(); // Verify CSRF token for POST requests.
 
         // Handle file upload.
-        $response = local_h5pcaretaker::handler_upload();
+        $response = handlers::handler_upload();
     } else {
         // Display upload form with CSRF protection.
-        $response = local_h5pcaretaker::handler_start();
+        $response = handlers::handler_start();
     }
 
     // This site is not supposed to have a header or footer.

diff --git a/settings.php b/settings.php
@@ -25,8 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-require_once(__DIR__ . '/lib.php');
-
 use local_h5pcaretaker\constants;
 
 if (!$hassiteconfig) {