Check if path can be loadded before attempting it.

[core.git] / inc / loader / class_ClassLoader.php

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index dce3df9c9fa5832bf258906ccb83531146c5565f..eea558055fee071088fdac0eefd59d9f53e3e2a2 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -98,6 +98,17 @@ class ClassLoader {
         */
        private $total = 0;
 
+       /**
+        * Framework/application paths for classes, etc.
+        */
+       private static $frameworkPaths = array(
+               'exceptions', // Exceptions
+               'interfaces', // Interfaces
+               'main',       // General main classes
+               'middleware'  // The middleware
+       );
+
+
        /**
         * The protected constructor. Please use the factory method below, or use
         * getSelfInstance() for singleton
@@ -163,24 +174,38 @@ class ClassLoader {
         * @return      void
         */
        public static function scanFrameworkClasses () {
-               // Lower framework classes
-               $lowerClasses = array(
-                       'exceptions', // Exceptions
-                       'interfaces', // Interfaces
-                       'main',       // General main classes
-                       'middleware'  // The middleware
-               );
-
                // Cache loader instance
                $loaderInstance = self::getSelfInstance();
 
                // Load all classes
-               foreach ($lowerClasses as $className) {
+               foreach (self::$frameworkPaths as $className) {
                        // Try to load the framework classes
                        $loaderInstance->scanClassPath('inc/classes/' . $className . '/');
                } // END - foreach
        }
 
+       /**
+        * Scans for application's classes, etc.
+        *
+        * @return      void
+        */
+       public static function scanApplicationClasses () {
+               // Get config instance
+               $cfg = FrameworkConfiguration::getSelfInstance();
+
+               // Load all classes for the application
+               foreach (self::$frameworkPaths as $class) {
+                       // Create path name
+                       $path = sprintf('%s/%s/%s', $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $class);
+
+                       // Is the path readable?
+                       if (is_dir($path)) {
+                               // Try to load the application classes
+                               ClassLoader::getSelfInstance()->scanClassPath($path);
+                       } // END - if
+               } // END - foreach
+       }
+
        /**
         * Initializes our loader class
         *