fix loading module definition files (installing and using still broken)

Author: hinanaya

core/init.php

@@ -97,7 +97,7 @@
     foreach (scandir($modulesDir) as $module) {
         if ($module !== '.' && $module !== '..' && is_dir($modulesDir . $module)) {
             $moduleNamespace = str_replace(' ', '', ucwords(str_replace('_', ' ', $module)));
-            $namespaceMap["OpenBroadcaster\\Modules\\{$moduleNamespace}"] = $modulesDir . $module . '/';
+            $namespaceMap["OpenBroadcaster\\Modules\\{$moduleNamespace}\\"] = $modulesDir . $module . '/';
             $namespaceMap["OpenBroadcaster\\Modules\\{$moduleNamespace}}\\Models\\"] = $modulesDir . $module . '/models/';
             $namespaceMap["OpenBroadcaster\\Modules\\{$moduleNamespace}}\\Controllers\\"] = $modulesDir . $module . '/controllers/';
             $namespaceMap["OpenBroadcaster\\Modules\\{$moduleNamespace}\\Cron\\"] = $modulesDir . $module . '/cron/';

core/support/obfload.php

@@ -14,10 +14,8 @@ class OBFLoad
     private $db;
 
     /**
-     * Construct an instance of OBFLoad. It scans the models directory first, adding
-     * the appropriate files to an array of models, then does the same for the
-     * controllers. Finally, it goes through all the module directories, and does
-     * the same for the models and controllers there.
+     * Construct an instance of OBFLoad. It creates an instance of every installed top-level
+     * module using the definition file in each module folder.
      */
     public function __construct()
     {
@@ -33,7 +31,7 @@ public function __construct()
                 continue;
             }
 
-            $module_class = 'OpenBroadcaster\\Modules\\' . $dir;
+            $module_class = 'OpenBroadcaster\\Modules\\' . $dir . '\\' . $dir;
             $module_instance = new $module_class();
             $module_instance->callbacks();
         }