use DIRECTORY_SEPARATOR instead of plain '/'

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/config-global.php b/framework/config-global.php
index ad84b4288f1459a1baa7a12ac7951f05f14d69bc..5a9edd6c300c5e95754952fc530f750d066cd2b4 100644 (file)
--- a/framework/config-global.php
+++ b/framework/config-global.php
@@ -33,7 +33,7 @@ use CoreFramework\EntryPoint\ApplicationEntryPoint;
 $cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: ROOT-BASE-PATH
 $cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: ROOT-BASE-PATH

-$cfg->setConfigEntry('root_base_path', ApplicationEntryPoint::getRootPath() . '/');
+$cfg->setConfigEntry('root_base_path', ApplicationEntryPoint::getRootPath() . DIRECTORY_SEPARATOR);

 
 // CFG: CORE-BASE-PATH
 $cfg->setConfigEntry('framework_base_path', ApplicationEntryPoint::detectFrameworkPath());
 
 // CFG: CORE-BASE-PATH
 $cfg->setConfigEntry('framework_base_path', ApplicationEntryPoint::detectFrameworkPath());


@@ -298,7 +298,7 @@ $cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest');
 $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
 
 // CFG: COOKIE-PATH
 $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
 
 // CFG: COOKIE-PATH

-$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . '/');
+$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . DIRECTORY_SEPARATOR);

 
 // CFG: COOKIE-DOMAIN
 $cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...
 
 // CFG: COOKIE-DOMAIN
 $cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 8338268ff423f14287cf0cd6825ac2de87687ce2..c33c79447423b3e67e4024f95d3e5a83189e31a1 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -3219,7 +3219,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                } // END - if
 
                // Add it
                } // END - if
 
                // Add it

-               $fqfn = $basePath . '/' . $fileName;
+               $fqfn = $basePath . DIRECTORY_SEPARATOR . $fileName;

 
                // Is it reachable?
                if (!FrameworkBootstrap::isReachableFilePath($fqfn)) {
 
                // Is it reachable?
                if (!FrameworkBootstrap::isReachableFilePath($fqfn)) {

diff --git a/framework/main/classes/database/backend/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/class_CachedLocalFileDatabase.php
index 2efa187e04662eb14b58a28baa2983aeab1a3f81..ff43ed6bebbff863a2085501e5acc9441205b0cc 100644 (file)
--- a/framework/main/classes/database/backend/class_CachedLocalFileDatabase.php
+++ b/framework/main/classes/database/backend/class_CachedLocalFileDatabase.php
@@ -257,7 +257,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
         */
        private function generateFqfnFromDataSet (Criteria $dataSetInstance, $rowName) {
                // This is the FQFN
         */
        private function generateFqfnFromDataSet (Criteria $dataSetInstance, $rowName) {
                // This is the FQFN

-               $fqfn = $this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . '/' . $rowName . '.' . $this->getFileExtension();
+               $fqfn = $this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . DIRECTORY_SEPARATOR . $rowName . '.' . $this->getFileExtension();

 
                // Return it
                return $fqfn;
 
                // Return it
                return $fqfn;


@@ -359,7 +359,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
                $resultData = NULL;
 
                // Create full path name
                $resultData = NULL;
 
                // Create full path name

-               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . '/';
+               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;

 
                /*
                 * A 'select' query is not that easy on local files, so first try to
 
                /*
                 * A 'select' query is not that easy on local files, so first try to


@@ -502,7 +502,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
         */
        public function queryUpdateDataSet (StoreableCriteria $dataSetInstance) {
                // Create full path name
         */
        public function queryUpdateDataSet (StoreableCriteria $dataSetInstance) {
                // Create full path name

-               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . '/';
+               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . DIRECTORY_SEPARATOR;

 
                // Try all the requests
                try {
 
                // Try all the requests
                try {


@@ -646,7 +646,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableName=' . $tableName . ' - CALLED!');
 
                // Create full path name
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableName=' . $tableName . ' - CALLED!');
 
                // Create full path name

-               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . '/';
+               $pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;

 
                // Try all the requests
                try {
 
                // Try all the requests
                try {

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index 688d14999c8e7372febb6ff785726d4b3d412612..1b105d7acfbfae8c147e7f4fb14dea34f0c8d078 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -55,7 +55,7 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $templateInstance = new ???TemplateEngine();
 
                // Determine base path
                $templateInstance = new ???TemplateEngine();
 
                // Determine base path

-               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/';
+               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . DIRECTORY_SEPARATOR;

 
                // Is the base path valid?
                if (empty($templateBasePath)) {
 
                // Is the base path valid?
                if (empty($templateBasePath)) {