require_once() is inperformant, replace with require()

diff --git a/inc/classes/third_party/api/primusportal/class_PrimeraApi.php b/inc/classes/third_party/api/primusportal/class_PrimeraApi.php
index de237fd65309a7c982ab969447e81cf1322a3865..1f7036e935da2eff22abf71c1bb44e64ef931463 100644 (file)
--- a/inc/classes/third_party/api/primusportal/class_PrimeraApi.php
+++ b/inc/classes/third_party/api/primusportal/class_PrimeraApi.php
@@ -17,7 +17,7 @@
  * Die Einbindung des Interfaces geschieht folgendermaßen:
  *  1. Einbindung der Klasse in Ihr PHP-Auszahlungsskript:
  *     CODE:
- *       require_once( "PFAD/ZU/DER/KLASSE/PrimusInterface.class.php" );
+ *       require( "PFAD/ZU/DER/KLASSE/PrimusInterface.class.php" );
  *       $PPUsername = "username"; // Ihr Username bei Primusportal
  *       $PPPassword = "passwort"; // Ihr Passwort bei Primusportal
  *

diff --git a/inc/config.php b/inc/config.php
index 2dd258af47c85edf45f9dda0c3c26a50db2b92a9..7cfb67b173112daf99b2237d1d6c9491e298809b 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -25,9 +25,9 @@
  */
 
 // Load the class from inc/config direktory
-require_once(dirname(__FILE__) . '/classes/interfaces/class_FrameworkInterface.php');
-require_once(dirname(__FILE__) . '/classes/interfaces/registry/class_Registerable.php');
-require_once(dirname(__FILE__) . '/config/class_FrameworkConfiguration.php');
+require(dirname(__FILE__) . '/classes/interfaces/class_FrameworkInterface.php');
+require(dirname(__FILE__) . '/classes/interfaces/registry/class_Registerable.php');
+require(dirname(__FILE__) . '/config/class_FrameworkConfiguration.php');
 
 // Get a new configuration instance
 $cfg = FrameworkConfiguration::getInstance();

diff --git a/inc/database.php b/inc/database.php
index 8fb2fd3115fd9c38f86ed4e44a916f055162fc23..f2b5632f7512a16e5f46ae1fbe7c10ccc815704a 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -31,7 +31,7 @@ $fqfn = FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/da
 // Load the database layer include
 if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
        // Load the layer
-       require_once($fqfn);
+       require($fqfn);
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",

diff --git a/inc/includes.php b/inc/includes.php
index 3f7135cabd7e56ea1009914d3ed51e2f2e69b667..45d08bade71b1c18fc2e919e24fd7fc317193162 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -29,6 +29,9 @@ require(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/lo
 // Load matching config
 ClassLoader::getInstance()->loadExtraConfigs();
 
+// Register hooks here
+require(FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/hooks.php');
+
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {
        // Set the application from string
@@ -58,9 +61,6 @@ $application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
 // Set the application name for later usage
 FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
 
-// Register auto-load function with the SPL
-spl_autoload_register('ClassLoader::autoLoad');
-
 /**
  * Is the devel package included?
  */

diff --git a/inc/selector.php b/inc/selector.php
index 960ba6c16dda8fd32f1d27320122c1b7a886b75b..69dfe73d0ee2f85329e7a6734a7d398cacaf9e8d 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -35,30 +35,32 @@ $configAppIncludes = array(
 );
 
 // Load them all (try only)
-foreach ($configAppIncludes as $inc) {
+foreach ($configAppIncludes as $appInc) {
        // Skip starter in test mode
-       if (($inc == 'starter') && (defined('TEST'))) {
+       if (($appInc == 'starter') && (defined('TEST'))) {
                // Skip it here
                continue;
        }
 
        // Generate a FQFN for the helper class
-       $fqfn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $inc . '.php';
+       $appFqFn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $appInc . '.php';
 
        // Does the include file exists?
-       if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
+       if ((file_exists($appFqFn)) && (is_file($appFqFn)) && (is_readable($appFqFn))) {
                // Load it
-               require_once($fqfn);
+               //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - START\n";
+               require($appFqFn);
+               //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - END\n";
        } elseif (FrameworkConfiguration::getInstance()->readConfig('verbose_level') > 0) {
                // File is missing
                trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
-                       $inc
+                       $appInc
                ));
        }
 }
 
 // Remove variables from namespace, which we don't need
-unset($inc, $configAppIncludes, $fqfn);
+unset($appInc, $configAppIncludes, $appFqFn);
 
 // [EOF]
 ?>