Config entry 'php_extension' is no longer used

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 8d6d914463151236089ab5882313b0bb4d3b2749..0d366b78a6b812b3f844369496b1690062cb8787 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -207,7 +207,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        // Is this a readable directory? (files will be ignored silently)
                        if ((is_dir($fqfn)) && (is_readable($fqfn))) {
                                // Then get the init.php script for analyzing
-                               $initScript = sprintf("%s/init%s", $fqfn, $this->getConfigInstance()->readConfig('php_extension'));
+                               $initScript = sprintf("%s/init.php", $fqfn);
 
                                // Load the application's init.php script and append the
                                // application to the ArrayObject

diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php
index 266cf6facd10b54b5bc1f88a78ab0f7b4011529d..6d3ede2569da9a7066427c042b6a64de4681ef87 100644 (file)
--- a/inc/classes/middleware/compressor/class_CompressorChannel.php
+++ b/inc/classes/middleware/compressor/class_CompressorChannel.php
@@ -61,7 +61,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
                        // Read all directories but no sub directories
                        while ($dir = $dirPointer->readDirectoryExcept(array("..", ".", ".htaccess", ".svn"))) {
                                // Is this a class file?
-                               if ((substr($dir, 0, 6) == "class_") && (substr($dir, -4, 4) == FrameworkConfiguration::getInstance()->readConfig('php_extension'))) {
+                               if ((substr($dir, 0, 6) == "class_") && (substr($dir, -4, 4) == ".php")) {
                                        // Get the compressor's name. That's why you must name
                                        // your files like your classes and also that's why you
                                        // must keep on class in one file.

diff --git a/inc/config.php b/inc/config.php
index a9e58d7a0346e5fb1c3251749d94ba28be021e42..1cf6715e1aeca74c687203a67ae97fc2c01fbe6e 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -50,9 +50,6 @@ $cfg->setDefaultTimezone("Europe/Berlin");
 // CFG: MAGIC-QUOTES-RUNTIME
 $cfg->setMagicQuotesRuntime(false);
 
-// CFG: PHP-SCRIPT-EXTENSION
-$cfg->setConfigEntry('php_extension', ".php");
-
 // CFG: CLASS-PREFIX
 $cfg->setConfigEntry('class_prefix', "class_");
 

diff --git a/inc/database.php b/inc/database.php
index 03bc377ac5d781427711d319ddd2a873b9f8202a..f274f6c65b2a0dd8857a5e0cc0b0ff28bb073b07 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -29,10 +29,9 @@ $layerInstance = null;
 $cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s%s",
+$INC = sprintf("%sinc/database/lib-%s.php",
        $cfg->readConfig('base_path'),
-       $cfg->readConfig('db_type'),
-       $cfg->readConfig('php_extension')
+       $cfg->readConfig('db_type')
 );
 
 // Load the database layer include

diff --git a/inc/includes.php b/inc/includes.php
index 54bd39be01546f744b9cb064b576ab3cc833377f..7e3f5c9ffc6bf37b059d87261772ff30b4e29bc6 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -26,7 +26,7 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Include the class loader function
-require(sprintf("%sinc/loader/class_ClassLoader%s", $cfg->readConfig('base_path'), $cfg->readConfig('php_extension')));
+require(sprintf("%sinc/loader/class_ClassLoader.php", $cfg->readConfig('base_path')));
 
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {

diff --git a/inc/selector.php b/inc/selector.php
index ddab76926ef76f12dcc80b111927c49d7f854c08..819485e26dcc0bedae9c96bd88cf0d851d340f8b 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -45,11 +45,10 @@ foreach ($configAppIncludes as $inc) {
        }
 
        // Generate a FQFN for the helper class
-       $fqfn = sprintf("%s%s/%s%s",
+       $fqfn = sprintf("%s%s/%s.php",
                $cfg->readConfig('application_path'),
                $cfg->readConfig('app_name'),
-               $inc,
-               $cfg->readConfig('php_extension')
+               $inc
        );
 
        // Does the include file exists?
@@ -58,8 +57,8 @@ foreach ($configAppIncludes as $inc) {
                require_once($fqfn);
        } elseif ($cfg->readConfig('verbose_level') > 0) {
                // File is missing
-               trigger_error(sprintf("Cannot load application script %s! File is missing or read-protected.",
-                       $inc . $cfg->readConfig('php_extension')
+               trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
+                       $inc
                ));
        }
 }