WebSVN - PHPX - Path Comparison - / Rev 57 and / Rev 56

Compare Revisions

Log message:

* Application.php
  - autoload():
    + Security fixes
    + Use DIRECTORY_SEPARATOR

 /trunk/Application.php
 ,25 → 2,16
 namespace PointedEars\PHPX;
-if (!defined('DIRECTORY_SEPARATOR'))
-{
-        define('DIRECTORY_SEPARATOR', '/');
-}
 function autoload ($class)
 {
-        if (\strpos($class, '..') !== false)
+        if (\strpos($class, '..'))
         {
                 throw new \InvalidArgumentException(
-                        "Refusing to load unsafe class '{$class}'");
+                        'Refusing to load unsafe class ' . $class);
         }
-        require_once \str_replace('\\', DIRECTORY_SEPARATOR,
-                \preg_replace(
-                        '#^' . \preg_quote(__NAMESPACE__, '#') .'#',
-                        __DIR__,
-                        $class
-                )
+        require_once \preg_replace('#\\\#', '/',
+                \preg_replace('#^' . \preg_quote(__NAMESPACE__) .'#', __DIR__, $class)
         ) . '.php';
 }