Changeset 24887

Timestamp:

11/15/08 17:12:41 (8 weeks ago)

Author:

Guite

Message:

changed naming scheme of interfaces files. added Loader::loadInterface() accordingly.

Location:

development/main

Files:

• includes/Loader.class.php (modified) (1 diff)
• includes/objects/ZHookInterface.interface.php (moved) (moved from development/main/includes/objects/ZHookInterface.php)
• includes/objects/ZHookTransformInterface.interface.php (moved) (moved from development/main/includes/objects/ZHookTransformInterface.php) (1 diff)
• includes/objects/ZModule.class.php (modified) (1 diff)
• includes/objects/ZModuleDependency.class.php (modified) (1 diff)
• includes/objects/ZModuleInstaller.class.php (modified) (1 diff)
• includes/objects/ZModuleInstallerInterface.interface.php (moved) (moved from development/main/includes/objects/ZModuleInstallerInterface.php)
• includes/objects/ZModuleInterface.interface.php (moved) (moved from development/main/includes/objects/ZModuleInterface.php)
• includes/objects/ZModuleLegacy.class.php (modified) (1 diff)
• includes/objects/ZObjectInterface.interface.php (moved) (moved from development/main/includes/objects/ZObjectInterface.php)
• modules/Ephemerids/EphemeridsInstaller.class.php (modified) (1 diff)
• modules/Ephemerids/EphemeridsModule.class.php (modified) (1 diff)

development/main/includes/Loader.class.php

@@ -169 +169 @@
     }
 
+    /**
+     * Load an interface file from the specified location in the file tree
+     *
+     * @param interfaceName The interface-basename to load
+     * @param classPath     The path prefix to use (optional) (default='includes')
+     * @param exitOnError   whether or not exit upon error (optional) (default=true)
+     *
+     * @return string The file name which was loaded
+     */
+    static function loadInterface($interfaceName, $classPath = 'includes', $exitOnError = true)
+    {
+        if (!$interfaceName) {
+            return pn_exit("Invalid interface specification [$interfaceName] ...");
+        }
+
+        if (class_exists($interfaceName)) {
+            return $interfaceName;
+        }
+
+        $interfaceFile = $interfaceName . '.interface.php';
+        $rc = self::loadFile($interfaceFile, "config/classes/$classPath", false);
+        if (!$rc) {
+            $rc = self::loadFile($interfaceFile, $classPath, $exitOnError);
+        }
+
+        return $rc;
+    }
 
     /**

development/main/includes/objects/ZHookTransformInterface.interface.php

@@ -11 +11 @@
  */
 
-Loader::loadFile('ZHookInterface.php', 'includes/objects');
+Loader::loadInterface('ZHookInterface', 'includes/objects');
 
 /**

development/main/includes/objects/ZModule.class.php

@@ -14 +14 @@
 Loader::loadClass('ZDBTable', 'includes/objects');
 Loader::loadClass('ZModuleVar', 'includes/objects');
-Loader::loadFile('ZModuleInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInterface', 'includes/objects');
 Loader::loadClass('ZModuleDependency', 'includes/objects');
 

development/main/includes/objects/ZModuleDependency.class.php

@@ -11 +11 @@
  */
 
-Loader::loadFile('ZModuleInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInterface', 'includes/objects');
 
 /**

development/main/includes/objects/ZModuleInstaller.class.php

@@ -12 +12 @@
 
 Loader::loadClass('ZBaseObject', 'includes/objects');
-Loader::loadFile('ZModuleInstallerInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInstallerInterface', 'includes/objects');
 Loader::loadClass('ZDBTable', 'includes/objects');
 

development/main/includes/objects/ZModuleLegacy.class.php

@@ -12 +12 @@
 
 Loader::loadClass('ZModule', 'includes/objects');
-Loader::loadFile('ZModuleInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInterface', 'includes/objects');
 
 /**

development/main/modules/Ephemerids/EphemeridsInstaller.class.php

@@ -12 +12 @@
 
 Loader::loadClass('ZModuleInstaller', 'includes/objects');
-Loader::loadFile('ZModuleInstallerInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInstallerInterface', 'includes/objects');
 Loader::loadClass('ZDBTable', 'includes/objects');
 Loader::loadClass('ZDBColumn', 'includes/objects');

development/main/modules/Ephemerids/EphemeridsModule.class.php

@@ -12 +12 @@
 
 Loader::loadClass('ZModule', 'includes/objects');
-Loader::loadFile('ZModuleInterface.php', 'includes/objects');
+Loader::loadInterface('ZModuleInterface', 'includes/objects');
 Loader::loadClass('ZDBTable', 'includes/objects');
 Loader::loadClass('ZDBColumn', 'includes/objects');