Changeset 9 in ExiteCMS8

Timestamp:

01/10/11 23:18:59 (17 months ago)

Author:

WanWizard

Message:

merged upstream changes in the fuel core

Location:

trunk/fuel/core

Files:

• bootstrap.php (modified) (2 diffs)
• classes/autoloader.php (modified) (3 diffs)
• classes/cookie.php (modified) (3 diffs)
• classes/database/exception.php (modified) (1 diff)
• classes/database/mysql.php (modified) (12 diffs)
• classes/database/mysql/result.php (modified) (1 diff)
• classes/database/pdo.php (modified) (5 diffs)
• classes/database/query.php (modified) (3 diffs)
• classes/database/query/builder.php (modified) (1 diff)
• classes/database/query/builder/delete.php (modified) (2 diffs)
• classes/database/query/builder/insert.php (modified) (3 diffs)
• classes/database/query/builder/join.php (modified) (1 diff)
• classes/database/query/builder/select.php (modified) (3 diffs)
• classes/database/query/builder/update.php (modified) (2 diffs)
• classes/database/query/builder/where.php (modified) (1 diff)
• classes/database/result.php (modified) (1 diff)
• classes/database/result/cached.php (modified) (1 diff)
• classes/db.php (modified) (9 diffs)
• classes/html.php (modified) (2 diffs)
• classes/security.php (modified) (1 diff)
• classes/session/driver.php (modified) (1 diff)

trunk/fuel/core/bootstrap.php

@@ -76 +76 @@
     'Fuel\\Core\\Database_Exception'            => COREPATH.'classes/database/exception.php',
     'Fuel\\Core\\Database_Expression'           => COREPATH.'classes/database/expression.php',
+    'Fuel\\Core\\Database_Pdo'                  => COREPATH.'classes/database/pdo.php',
     'Fuel\\Core\\Database_Query'                => COREPATH.'classes/database/query.php',
     'Fuel\\Core\\Database_Query_Builder'        => COREPATH.'classes/database/query/builder.php',
@@ -85 +86 @@
     'Fuel\\Core\\Database_Query_Builder_Join'   => COREPATH.'classes/database/query/builder/join.php',
     'Fuel\\Core\\Database_Result'               => COREPATH.'classes/database/result.php',
+    'Fuel\\Core\\Database_Result_Cached'        => COREPATH.'classes/database/result/cached.php',
     'Fuel\\Core\\Database_Mysql'                => COREPATH.'classes/database/mysql.php',
     'Fuel\\Core\\Database_MySQL_Result'         => COREPATH.'classes/database/mysql/result.php',

trunk/fuel/core/classes/autoloader.php

@@ -350 +350 @@
             }
         }
+        
+        // Prevent failed load from keeping other classes from initializing
+        if (static::$auto_initialize == $class)
+        {
+            static::$auto_initialize = null;
+        }
+        
         return false;
     }
@@ -363 +370 @@
         if (static::$auto_initialize === $class)
         {
+            static::$auto_initialize = null;
             if (is_callable($class.'::_init'))
             {
@@ -368 +376 @@
             }
         }
-        static::$auto_initialize = null;
     }
 }

trunk/fuel/core/classes/cookie.php

@@ -80 +80 @@
      * @param   string   value of cookie
      * @param   integer  lifetime in seconds
+     * @param   string   path of the cookie
+     * @param   string   domain of the cookie
      * @return  boolean
      */
-    public static function set($name, $value, $expiration = null)
+    public static function set($name, $value, $expiration = null, $path = null, $domain = null)
     {
         // If nothing is provided, use the standard amount of time
@@ -89 +91 @@
             $expiration = time() + 86500;
         }
-
         // If it's set, add the current time so we have an offset
         else
@@ -96 +97 @@
         }
 
-        return setcookie($name, $value, $expiration, static::$path, static::$domain, static::$secure, static::$httponly);
+        // use the class defaults for path and domain if not provided
+        if (empty($path))
+        {
+            $path = static::$path;
+        }
+
+        if (empty($domain))
+        {
+            $domain = static::$domain;
+        }
+
+        return setcookie($name, $value, $expiration, $path, $domain, static::$secure, static::$httponly);
     }
 

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

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

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

@@ -14 +14 @@
 
 
-class Database_MySQL extends Database {
+class Database_MySQL extends \Database {
 
     // Database in use by each connection
@@ -36 +36 @@
             return;
 
-        if (Database_MySQL::$_set_names === NULL)
+        if (static::$_set_names === NULL)
         {
             // Determine if we can use mysql_set_charset(), which is only
             // available on PHP 5.2.3+ when compiled against MySQL 5.0+
-            Database_MySQL::$_set_names = ! function_exists('mysql_set_charset');
+            static::$_set_names = ! function_exists('mysql_set_charset');
         }
 
@@ -73 +73 @@
             $this->_connection = NULL;
 
-            throw new Database_Exception(mysql_error(), mysql_errno());
+            throw new \Database_Exception(mysql_error(), mysql_errno());
         }
 
@@ -99 +99 @@
         {
             // Unable to select database
-            throw new Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
-        }
-
-        Database_MySQL::$_current_databases[$this->_connection_id] = $database;
+            throw new \Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
+        }
+
+        static::$_current_databases[$this->_connection_id] = $database;
     }
 
@@ -135 +135 @@
         $this->_connection or $this->connect();
 
-        if (Database_MySQL::$_set_names === TRUE)
+        if (static::$_set_names === TRUE)
         {
             // PHP is compiled against MySQL 4.x
@@ -148 +148 @@
         if ($status === FALSE)
         {
-            throw new Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
+            throw new \Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
         }
     }
@@ -163 +163 @@
         }
 
-        if ( ! empty($this->_config['connection']['persistent']) AND $this->_config['connection']['database'] !== Database_MySQL::$_current_databases[$this->_connection_id])
+        if ( ! empty($this->_config['connection']['persistent']) AND $this->_config['connection']['database'] !== static::$_current_databases[$this->_connection_id])
         {
             // Select database on persistent connections
@@ -178 +178 @@
             }
 
-            throw new Database_Exception(mysql_error($this->_connection).' [ '.$sql.' ]',
+            throw new \Database_Exception(mysql_error($this->_connection).' [ '.$sql.' ]',
                 mysql_errno($this->_connection));
         }
@@ -190 +190 @@
         $this->last_query = $sql;
 
-        if ($type === Database::SELECT)
+        if ($type === \Database::SELECT)
         {
             // Return an iterator of results
-            return new Database_MySQL_Result($result, $sql, $as_object);
-        }
-        elseif ($type === Database::INSERT)
+            return new \Database_MySQL_Result($result, $sql, $as_object);
+        }
+        elseif ($type === \Database::INSERT)
         {
             // Return a list of insert id and rows created
@@ -262 +262 @@
         {
             // Search for table names
-            $result = $this->query(Database::SELECT, 'SHOW TABLES LIKE '.$this->quote($like), FALSE);
+            $result = $this->query(\Database::SELECT, 'SHOW TABLES LIKE '.$this->quote($like), FALSE);
         }
         else
         {
             // Find all table names
-            $result = $this->query(Database::SELECT, 'SHOW TABLES', FALSE);
+            $result = $this->query(\Database::SELECT, 'SHOW TABLES', FALSE);
         }
 
@@ -287 +287 @@
         {
             // Search for column names
-            $result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table.' LIKE '.$this->quote($like), FALSE);
+            $result = $this->query(\Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table.' LIKE '.$this->quote($like), FALSE);
         }
         else
         {
             // Find all column names
-            $result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table, FALSE);
+            $result = $this->query(\Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table, FALSE);
         }
 
@@ -370 +370 @@
         if (($value = mysql_real_escape_string((string) $value, $this->_connection)) === FALSE)
         {
-            throw new Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
+            throw new \Database_Exception(mysql_error($this->_connection), mysql_errno($this->_connection));
         }
 

trunk/fuel/core/classes/database/mysql/result.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_MySQL_Result extends Database_Result {
+class Database_MySQL_Result extends \Database_Result {
 
     protected $_internal_row = 0;

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

@@ -13 +13 @@
 
 
-class Database_PDO extends Database {
+class Database_PDO extends \Database {
 
     // PDO uses no quoting for identifiers
@@ -68 +68 @@
         catch (\PDOException $e)
         {
-            throw new Database_Exception($e->getMessage(), $e->getCode(), $e);
+            throw new \Database_Exception($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -119 +119 @@
 
             // Convert the exception in a database exception
-            throw new Database_Exception($e->getMessage().' with query: "'.$sql.'"');
+            throw new \Database_Exception($e->getMessage().' with query: "'.$sql.'"');
         }
 
@@ -130 +130 @@
         $this->last_query = $sql;
 
-        if ($type === Database::SELECT)
+        if ($type === \Database::SELECT)
         {
             // Convert the result into an array, as PDOStatement::rowCount is not reliable
@@ -149 +149 @@
 
             // Return an iterator of results
-            return new Database_Result_Cached($result, $sql, $as_object);
+            return new \Database_Result_Cached($result, $sql, $as_object);
         }
-        elseif ($type === Database::INSERT)
+        elseif ($type === \Database::INSERT)
         {
             // Return a list of insert id and rows created

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

@@ -54 +54 @@
         {
             // Return the SQL string
-            return $this->compile(Database::instance());
+            return $this->compile(\Database::instance());
         }
         catch (Exception $e)
@@ -191 +191 @@
         {
             // Get the database instance
-            $db = Database::instance($db);
+            $db = \Database::instance($db);
         }
 
@@ -213 +213 @@
         {
             case 'SELECT':
-                $this->_type = Database::SELECT;
+                $this->_type = \Database::SELECT;
                 break;
             case 'INSERT':
             case 'CREATE':
-                $this->_type = Database::INSERT;
+                $this->_type = \Database::INSERT;
                 break;
         }

trunk/fuel/core/classes/database/query/builder.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-abstract class Database_Query_Builder extends Database_Query {
+abstract class Database_Query_Builder extends \Database_Query {
 
     /**

trunk/fuel/core/classes/database/query/builder/delete.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Query_Builder_Delete extends Database_Query_Builder_Where {
+class Database_Query_Builder_Delete extends \Database_Query_Builder_Where {
 
     // DELETE FROM ...
@@ -32 +32 @@
 
         // Start the query with no SQL
-        return parent::__construct('', Database::DELETE);
+        return parent::__construct('', \Database::DELETE);
     }
 

trunk/fuel/core/classes/database/query/builder/insert.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Query_Builder_Insert extends Database_Query_Builder {
+class Database_Query_Builder_Insert extends \Database_Query_Builder {
 
     // INSERT INTO ...
@@ -45 +45 @@
 
         // Start the query with no SQL
-        return parent::__construct('', Database::INSERT);
+        return parent::__construct('', \Database::INSERT);
     }
 
@@ -118 +118 @@
     public function select(Database_Query $query)
     {
-        if ($query->type() !== Database::SELECT)
+        if ($query->type() !== \Database::SELECT)
         {
             throw new \Exception('Only SELECT queries can be combined with INSERT queries');

trunk/fuel/core/classes/database/query/builder/join.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Query_Builder_Join extends Database_Query_Builder {
+class Database_Query_Builder_Join extends \Database_Query_Builder {
 
     // Type of JOIN

trunk/fuel/core/classes/database/query/builder/select.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Query_Builder_Select extends Database_Query_Builder_Where {
+class Database_Query_Builder_Select extends \Database_Query_Builder_Where {
 
     // SELECT ...
@@ -53 +53 @@
 
         // Start the query with no actual SQL statement
-        parent::__construct(Database::SELECT, '');
+        parent::__construct(\Database::SELECT, '');
     }
 
@@ -123 +123 @@
     public function join($table, $type = NULL)
     {
-        $this->_join[] = $this->_last_join = new Database_Query_Builder_Join($table, $type);
+        $this->_join[] = $this->_last_join = new \Database_Query_Builder_Join($table, $type);
 
         return $this;

trunk/fuel/core/classes/database/query/builder/update.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Query_Builder_Update extends Database_Query_Builder_Where {
+class Database_Query_Builder_Update extends \Database_Query_Builder_Where {
 
     // UPDATE ...
@@ -35 +35 @@
 
         // Start the query with no SQL
-        return parent::__construct('', Database::UPDATE);
+        return parent::__construct('', \Database::UPDATE);
     }
 

trunk/fuel/core/classes/database/query/builder/where.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-abstract class Database_Query_Builder_Where extends Database_Query_Builder {
+abstract class Database_Query_Builder_Where extends \Database_Query_Builder {
 
     // WHERE ...

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

@@ -71 +71 @@
     public function cached()
     {
-        return new Database_Result_Cached($this->as_array(), $this->_query, $this->_as_object);
+        return new \Database_Result_Cached($this->as_array(), $this->_query, $this->_as_object);
     }
 

trunk/fuel/core/classes/database/result/cached.php

@@ -12 +12 @@
 namespace Fuel\Core;
 
-class Database_Result_Cached extends Database_Result {
+class Database_Result_Cached extends \Database_Result {
 
     public function __construct(array $result, $sql, $as_object = NULL)

trunk/fuel/core/classes/db.php

@@ -39 +39 @@
     public static function query($sql, $type = null)
     {
-        return new Database_Query($sql, $type);
+        return new \Database_Query($sql, $type);
     }
 
@@ -58 +58 @@
     public static function select($columns = NULL)
     {
-        return new Database_Query_Builder_Select(func_get_args());
+        return new \Database_Query_Builder_Select(func_get_args());
     }
 
@@ -72 +72 @@
     public static function select_array(array $columns = NULL)
     {
-        return new Database_Query_Builder_Select($columns);
+        return new \Database_Query_Builder_Select($columns);
     }
 
@@ -87 +87 @@
     public static function insert($table = NULL, array $columns = NULL)
     {
-        return new Database_Query_Builder_Insert($table, $columns);
+        return new \Database_Query_Builder_Insert($table, $columns);
     }
 
@@ -101 +101 @@
     public static function update($table = NULL)
     {
-        return new Database_Query_Builder_Update($table);
+        return new \Database_Query_Builder_Update($table);
     }
 
@@ -115 +115 @@
     public static function delete($table = NULL)
     {
-        return new Database_Query_Builder_Delete($table);
+        return new \Database_Query_Builder_Delete($table);
     }
 
@@ -129 +129 @@
     public static function expr($string)
     {
-        return new Database_Expression($string);
+        return new \Database_Expression($string);
     }
 
@@ -149 +149 @@
             return $string;
         }
-        return Database::instance($db)->quote_identifier($string);
+        return \Database::instance($db)->quote_identifier($string);
     }
 
@@ -161 +161 @@
     public static function escape($string, $db = null)
     {
-        return Database::instance($db)->escape($string);
+        return \Database::instance($db)->escape($string);
     }
 

trunk/fuel/core/classes/html.php

@@ -55 +55 @@
     public static function anchor($href, $text, $attributes = array())
     {
-        if ( ! preg_match('#^\w+://# i', $href))
+        if ( ! preg_match('#^(\w+://|javascript:)# i', $href))
         {
             $href = \Uri::create($href);
@@ -73 +73 @@
     public static function prep_url($url, $schema = 'http')
     {
-        if ( ! preg_match('#^\w+://# i', $url))
+        if ( ! preg_match('#^(\w+://|javascript:)# i', $url))
         {
             $url = $schema.'://'.$url;

trunk/fuel/core/classes/security.php

@@ -84 +84 @@
 
         return $value;
+    }
+
+    public static function htmlentities($value)
+    {
+        die('here');
     }
 

trunk/fuel/core/classes/session/driver.php

@@ -503 +503 @@
         if ($this->config['expire_on_close'])
         {
-            return \Cookie::set($this->config['cookie_name'], $payload, 0);
+            return \Cookie::set($this->config['cookie_name'], $payload, 0, $this->config['cookie_path'], $this->config['cookie_domain']);
         }
         else
         {
-            return \Cookie::set($this->config['cookie_name'], $payload, $this->config['expiration_time']);
+            return \Cookie::set($this->config['cookie_name'], $payload, $this->config['expiration_time'], $this->config['cookie_path'], $this->config['cookie_domain']);
         }
     }