Changeset 19 in ExiteCMS8

Timestamp:

02/17/11 10:14:59 (15 months ago)

Author:

WanWizard

Message:

merged upstream fuel changes

Location:

trunk/fuel

Files:

• core/classes/config.php (modified) (2 diffs)
• core/classes/database/exception.php (modified) (1 diff)
• core/classes/format.php (modified) (3 diffs)
• core/classes/fuel.php (modified) (2 diffs)
• core/classes/security.php (modified) (1 diff)
• core/classes/view.php (modified) (1 diff)
• core/vendor/htmlawed (added)
• core/vendor/htmlawed/htmlawed.php (added)
• packages/oil/classes/generate.php (modified) (1 diff)

trunk/fuel/core/classes/config.php

@@ -94 +94 @@
 
 CONF;
-        $content .= 'return '.var_export($config, true).';';
+        $content .= 'return '.str_replace('  ', "\t", var_export($config, true)).';';
         $content .= <<<CONF
 
@@ -100 +100 @@
 /* End of file $file.php */
 CONF;
-        if ($path = \Fuel::find_file('config', $file, '.php'))
-        {
-            $path = $path[0];
-        }
-        else
-        {
-            $path = APPPATH.'config'.DS.$file.'.php';
-        }
+        
+        ($path = \Fuel::find_file('config', $file, '.php')) or $path = APPPATH.'config'.DS.$file.'.php';
+
         $path = pathinfo($path);
 

trunk/fuel/core/classes/database/exception.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Exception extends Fuel_Exception {}
+class Database_Exception extends \Fuel_Exception {}

trunk/fuel/core/classes/format.php

@@ -84 +84 @@
         foreach ((array) $this->_data as $key => $value)
         {
-            if (is_object($value))
+            if (is_object($value) or is_array($value))
             {
                 $array[$key] = static::to_array($value);
@@ -134 +134 @@
 
             // replace anything not alpha numeric
-            $key = preg_replace('/[^a-z_]/i', '', $key);
+            $key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
 
             // if there is another array found recrusively call this function
@@ -150 +150 @@
                 // add single node.
                 $value = htmlspecialchars(html_entity_decode($value, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, "UTF-8");
-
-                $UsedKeys[] = $key;
 
                 $structure->addChild($key, $value);

trunk/fuel/core/classes/fuel.php

@@ -202 +202 @@
      * @param   string  The name of the file
      * @param   string  The file extension
+     * @param   boolean if true return an array of all files found
+     * @param   boolean if false do not cache the result
      * @return  string  The path to the file
      */
-    public static function find_file($directory, $file, $ext = '.php', $multiple = false)
+    public static function find_file($directory, $file, $ext = '.php', $multiple = false, $cache = true)
     {
         $path = $directory.DS.strtolower($file).$ext;
@@ -236 +238 @@
         }
 
-        static::$path_cache[$path] = $found;
+        $cache and static::$path_cache[$path] = $found;
         static::$paths_changed = true;
 

trunk/fuel/core/classes/security.php

@@ -114 +114 @@
     }
 
+    public static function xss_clean($value)
+    {
+        if ( ! is_array($value))
+        {
+            if ( ! function_exists('htmLawed'))
+            {
+                import('htmlawed/htmlawed', 'vendor');
+            }
+
+            return htmLawed($value, array('safe' => 1));
+        }
+        
+        foreach ($value as $k => $v)
+        {
+            $value[$k] = static::xss_clean($v);
+        }
+
+        return $value;
+    }
+
     public static function strip_tags($value)
     {

trunk/fuel/core/classes/view.php

@@ -268 +268 @@
     public function set_filename($file)
     {
-        if (($path = \Fuel::find_file('views', $file)) === false)
+        if (($path = \Fuel::find_file('views', $file, '.php', false, false)) === false)
         {
             throw new \View_Exception('The requested view could not be found: '.\Fuel::clean_path($file));

trunk/fuel/packages/oil/classes/generate.php

@@ -134 +134 @@
         if ( ! file_exists($app_template = APPPATH . 'views/template.php'))
         {
-            copy(PKGPATH . 'oil/views/template.php', $app_template);
+            copy(PKGPATH . 'oil/views/default/template.php', $app_template);
             chmod($app_template, 0666);
         }