Changeset 1207

Timestamp:

11/01/06 23:41:45 (2 years ago)

Author:

dominik

Message:

Add normalizePath to AgaviToolkit? and use it in the config handlers

Location:

trunk/src

Files:

• config/AgaviConfigCache.class.php (modified) (1 diff)
• config/AgaviConfigHandlersConfigHandler.class.php (modified) (1 diff)
• util/AgaviToolkit.class.php (modified) (1 diff)

trunk/src/config/AgaviConfigCache.class.php

@@ -124 +124 @@
   public static function checkConfig($config, $context = null)
   {
+    $config = AgaviToolkit::normalizePath($config);
     // the full filename path to the config, which might not be what we were given.
-    $filename = AgaviToolkit::isPathAbsolute($config) ? $config : AgaviConfig::get('core.app_dir') . '/' . $config;
+    $filename = AgaviToolkit::isPathAbsolute($config) ? $config : AgaviToolkit::normalizePath(AgaviConfig::get('core.app_dir')) . '/' . $config;
 
     if(!is_readable($filename)) {

trunk/src/config/AgaviConfigHandlersConfigHandler.class.php

@@ -59 +59 @@
         $pattern = $handler->getAttribute('pattern');
 
-        $category = var_export($this->replaceConstants($pattern), true);
+        $category = var_export(AgaviToolkit::normalizePath($this->replaceConstants($pattern)), true);
 
         $class = $handler->getAttribute('class');

trunk/src/util/AgaviToolkit.class.php

@@ -53 +53 @@
 
     return false;
+  }
+
+  /**
+   * Normalizes a path to contain only '/' as path delimiter.
+   *
+   * @param      string The path to normalize.
+   *
+   * @return     string The unified bool The mkdir return value.
+   *
+   * @author     Dominik del Bondio <ddb@bitxtender.com>
+   * @since      0.11.0
+   */
+  public static function normalizePath($path)
+  {
+    return str_replace('\\', '/', $path);
   }