Streamable and for encryption added, CryptoHelper (a facade) rewritten to use streams

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 05b2379deb14d45e65ae84af7a455ca0033722cb..a441dafcd793f94fb94b819515ae46583857a996 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -24,7 +24,7 @@
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       'class_' . FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), // The ApplicationHelper class
+       'class_' . FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
        'config',               // The application's own configuration
        'data',                 // Application data
        'init',                 // The application initializer
@@ -35,12 +35,12 @@ $configAppIncludes = array(
 );
 
 // Cache base path/file here
-$basePathFile = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name');
+$basePathFile = FrameworkConfiguration::getInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getInstance()->getConfigEntry('app_name');
 
 // Is the directory there?
 if (!is_dir($basePathFile)) {
        // Not found.
-       trigger_error('Application ' . FrameworkConfiguration::getInstance()->readConfig('app_name') . ' not found.');
+       trigger_error('Application ' . FrameworkConfiguration::getInstance()->getConfigEntry('app_name') . ' not found.');
 } // END - if
 
 // Load them all (try only)
@@ -60,7 +60,7 @@ foreach ($configAppIncludes as $appInc) {
                //* 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) {
+       } elseif (FrameworkConfiguration::getInstance()->getConfigEntry('verbose_level') > 0) {
                // File is missing
                trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
                        $appInc