summaryrefslogtreecommitdiff
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Cache.php87
-rw-r--r--system/libraries/Controller.php8
-rw-r--r--system/libraries/Database.php23
-rw-r--r--system/libraries/Database_Builder.php103
-rw-r--r--system/libraries/Database_Mysql.php9
-rw-r--r--system/libraries/Database_Mysqli.php32
-rw-r--r--system/libraries/Input.php8
-rw-r--r--system/libraries/Kohana_PHP_Exception.php4
-rw-r--r--system/libraries/ORM.php56
-rw-r--r--system/libraries/Profiler.php4
-rw-r--r--system/libraries/Router.php10
-rw-r--r--system/libraries/Validation.php155
-rw-r--r--system/libraries/drivers/Cache/File.php4
-rw-r--r--system/libraries/drivers/Cache/Memcache.php7
-rw-r--r--system/libraries/drivers/Cache/Xcache.php2
15 files changed, 342 insertions, 170 deletions
diff --git a/system/libraries/Cache.php b/system/libraries/Cache.php
index 2ed344fa..024c1888 100644
--- a/system/libraries/Cache.php
+++ b/system/libraries/Cache.php
@@ -52,7 +52,7 @@ class Cache_Core {
// Test the config group name
if (($config = Kohana::config('cache.'.$config)) === NULL)
- throw new Kohana_Exception('The :group: group is not defined in your configuration.', array(':group:' => $name));
+ throw new Cache_Exception('The :group: group is not defined in your configuration.', array(':group:' => $name));
}
if (is_array($config))
@@ -74,7 +74,7 @@ class Cache_Core {
// Load the driver
if ( ! Kohana::auto_load($driver))
- throw new Kohana_Exception('The :driver: driver for the :class: library could not be found',
+ throw new Cache_Exception('The :driver: driver for the :class: library could not be found',
array(':driver:' => $this->config['driver'], ':class:' => get_class($this)));
// Initialize the driver
@@ -82,7 +82,7 @@ class Cache_Core {
// Validate the driver
if ( ! ($this->driver instanceof Cache_Driver))
- throw new Kohana_Exception('The :driver: driver for the :library: library must implement the :interface: interface',
+ throw new Cache_Exception('The :driver: driver for the :library: library must implement the :interface: interface',
array(':driver:' => $this->config['driver'], ':library:' => get_class($this), ':interface:' => 'Cache_Driver'));
Kohana_Log::add('debug', 'Cache Library initialized');
@@ -103,6 +103,16 @@ class Cache_Core {
$key = array($key => $value);
}
+ if ($this->config['prefix'] !== NULL)
+ {
+ $key = $this->add_prefix($key);
+
+ if ($tags !== NULL)
+ {
+ $tags = $this->add_prefix($tags, FALSE);
+ }
+ }
+
return $this->driver->set($key, $tags, $lifetime);
}
@@ -119,6 +129,17 @@ class Cache_Core {
$single = TRUE;
}
+ if ($this->config['prefix'] !== NULL)
+ {
+ $keys = $this->add_prefix($keys, FALSE);
+
+ if ( ! $single)
+ {
+ return $this->strip_prefix($this->driver->get($keys, $single));
+ }
+
+ }
+
return $this->driver->get($keys, $single);
}
@@ -132,7 +153,15 @@ class Cache_Core {
$tags = array($tags);
}
- return $this->driver->get_tag($tags);
+ if ($this->config['prefix'] !== NULL)
+ {
+ $tags = $this->add_prefix($tags, FALSE);
+ return $this->strip_prefix($this->driver->get_tag($tags));
+ }
+ else
+ {
+ return $this->driver->get_tag($tags);
+ }
}
/**
@@ -145,6 +174,11 @@ class Cache_Core {
$keys = array($keys);
}
+ if ($this->config['prefix'] !== NULL)
+ {
+ $keys = $this->add_prefix($keys, FALSE);
+ }
+
return $this->driver->delete($keys);
}
@@ -158,6 +192,11 @@ class Cache_Core {
$tags = array($tags);
}
+ if ($this->config['prefix'] !== NULL)
+ {
+ $tags = $this->add_prefix($tags, FALSE);
+ }
+
return $this->driver->delete_tag($tags);
}
@@ -168,4 +207,44 @@ class Cache_Core {
{
return $this->driver->delete_all();
}
+
+ /**
+ * Add a prefix to keys or tags
+ */
+ protected function add_prefix($array, $to_key = TRUE)
+ {
+ $out = array();
+
+ foreach($array as $key => $value)
+ {
+ if ($to_key)
+ {
+ $out[$this->config['prefix'].$key] = $value;
+ }
+ else
+ {
+ $out[$key] = $this->config['prefix'].$value;
+ }
+ }
+
+ return $out;
+ }
+
+ /**
+ * Strip a prefix to keys or tags
+ */
+ protected function strip_prefix($array)
+ {
+ $out = array();
+
+ $start = strlen($this->config['prefix']);
+
+ foreach($array as $key => $value)
+ {
+ $out[substr($key, $start)] = $value;
+ }
+
+ return $out;
+ }
+
} // End Cache Library \ No newline at end of file
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index da84bfc1..830c06e5 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -3,7 +3,7 @@
* Kohana Controller class. The controller class must be extended to work
* properly, so this class is defined as abstract.
*
- * $Id: Controller.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Controller.php 4721 2009-12-17 23:02:07Z isaiah $
*
* @package Core
* @author Kohana Team
@@ -27,12 +27,6 @@ abstract class Controller_Core {
// Set the instance to the first controller loaded
Kohana::$instance = $this;
}
-
- // URI should always be available
- $this->uri = URI::instance();
-
- // Input should always be available
- $this->input = Input::instance();
}
/**
diff --git a/system/libraries/Database.php b/system/libraries/Database.php
index d3716c59..38a38fbf 100644
--- a/system/libraries/Database.php
+++ b/system/libraries/Database.php
@@ -1,9 +1,9 @@
<?php defined('SYSPATH') or die('No direct script access.');
/**
* Database wrapper.
- *
- * $Id: Database.php 4679 2009-11-10 01:45:52Z isaiah $
- *
+ *
+ * $Id: Database.php 4709 2009-12-10 05:09:35Z isaiah $
+ *
* @package Kohana
* @author Kohana Team
* @copyright (c) 2008-2009 Kohana Team
@@ -11,10 +11,12 @@
*/
abstract class Database_Core {
- const SELECT = 1;
- const INSERT = 2;
- const UPDATE = 3;
- const DELETE = 4;
+ const SELECT = 1;
+ const INSERT = 2;
+ const UPDATE = 3;
+ const DELETE = 4;
+ const CROSS_REQUEST = 5;
+ const PER_REQUEST = 6;
protected static $instances = array();
@@ -350,11 +352,12 @@ abstract class Database_Core {
* Clears the internal query cache.
*
* @param mixed clear cache by SQL statement, NULL for all, or TRUE for last query
+ * @param integer Type of cache to clear, Database::CROSS_REQUEST or Database::PER_REQUEST
* @return Database
*/
- public function clear_cache($sql = NULL)
+ public function clear_cache($sql = NULL, $type = NULL)
{
- if ($this->cache instanceof Cache)
+ if ($this->cache instanceof Cache AND ($type == NULL OR $type == Database::CROSS_REQUEST))
{
// Using cross-request Cache library
if ($sql === TRUE)
@@ -370,7 +373,7 @@ abstract class Database_Core {
$this->cache->delete_all();
}
}
- elseif (is_array($this->cache))
+ elseif (is_array($this->cache) AND ($type == NULL OR $type == Database::PER_REQUEST))
{
// Using per-request memory cache
if ($sql === TRUE)
diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php
index 5a5a058c..4e6951e7 100644
--- a/system/libraries/Database_Builder.php
+++ b/system/libraries/Database_Builder.php
@@ -29,6 +29,7 @@ class Database_Builder_Core {
protected $columns = array();
protected $values = array();
protected $type;
+ protected $distinct = FALSE;
// TTL for caching (using Cache library)
protected $ttl = FALSE;
@@ -77,7 +78,8 @@ class Database_Builder_Core {
if ($this->type === Database::SELECT)
{
// SELECT columns FROM table
- $sql = 'SELECT '.$this->compile_select();
+ $sql = $this->distinct ? 'SELECT DISTINCT ' : 'SELECT ';
+ $sql .= $this->compile_select();
if ( ! empty($this->from))
{
@@ -146,7 +148,13 @@ class Database_Builder_Core {
foreach ($this->select as $alias => $name)
{
- if (is_string($alias))
+ if ($name instanceof Database_Builder)
+ {
+ // Using a subquery
+ $name->db = $this->db;
+ $vals[] = '('.(string) $name.') AS '.$this->db->quote_column($alias);
+ }
+ elseif (is_string($alias))
{
$vals[] = $this->db->quote_column($name, $alias);
}
@@ -374,28 +382,48 @@ class Database_Builder_Core {
/**
* Add conditions to the HAVING clause (AND)
*
- * @param mixed Column name or array of columns => vals
+ * @param mixed Column name or array of triplets
* @param string Operation to perform
* @param mixed Value
* @return Database_Builder
*/
public function and_having($columns, $op = '=', $value = NULL)
{
- $this->having[] = array('AND' => array($columns, $op, $value));
+ if (is_array($columns))
+ {
+ foreach ($columns as $column)
+ {
+ $this->having[] = array('AND' => $column);
+ }
+ }
+ else
+ {
+ $this->having[] = array('AND' => array($columns, $op, $value));
+ }
return $this;
}
/**
* Add conditions to the HAVING clause (OR)
*
- * @param mixed Column name or array of columns => vals
+ * @param mixed Column name or array of triplets
* @param string Operation to perform
* @param mixed Value
* @return Database_Builder
*/
public function or_having($columns, $op = '=', $value = NULL)
{
- $this->having[] = array('OR' => array($columns, $op, $value));
+ if (is_array($columns))
+ {
+ foreach ($columns as $column)
+ {
+ $this->having[] = array('OR' => $column);
+ }
+ }
+ else
+ {
+ $this->having[] = array('OR' => array($columns, $op, $value));
+ }
return $this;
}
@@ -408,13 +436,25 @@ class Database_Builder_Core {
*/
public function order_by($columns, $direction = NULL)
{
- if (is_string($columns))
+ if (is_array($columns))
{
- $columns = array($columns => $direction);
+ foreach ($columns as $column => $direction)
+ {
+ if (is_string($column))
+ {
+ $this->order_by[] = array($column => $direction);
+ }
+ else
+ {
+ // $direction is the column name when the array key is numeric
+ $this->order_by[] = array($direction => NULL);
+ }
+ }
+ }
+ else
+ {
+ $this->order_by[] = array($columns => $direction);
}
-
- $this->order_by[] = $columns;
-
return $this;
}
@@ -542,28 +582,48 @@ class Database_Builder_Core {
/**
* Add conditions to the WHERE clause (AND)
*
- * @param mixed Column name or array of columns => vals
+ * @param mixed Column name or array of triplets
* @param string Operation to perform
* @param mixed Value
* @return Database_Builder
*/
public function and_where($columns, $op = '=', $value = NULL)
{
- $this->where[] = array('AND' => array($columns, $op, $value));
+ if (is_array($columns))
+ {
+ foreach ($columns as $column)
+ {
+ $this->where[] = array('AND' => $column);
+ }
+ }
+ else
+ {
+ $this->where[] = array('AND' => array($columns, $op, $value));
+ }
return $this;
}
/**
* Add conditions to the WHERE clause (OR)
*
- * @param mixed Column name or array of columns => vals
+ * @param mixed Column name or array of triplets
* @param string Operation to perform
* @param mixed Value
* @return Database_Builder
*/
public function or_where($columns, $op = '=', $value = NULL)
{
- $this->where[] = array('OR' => array($columns, $op, $value));
+ if (is_array($columns))
+ {
+ foreach ($columns as $column)
+ {
+ $this->where[] = array('OR' => $column);
+ }
+ }
+ else
+ {
+ $this->where[] = array('OR' => array($columns, $op, $value));
+ }
return $this;
}
@@ -780,6 +840,19 @@ class Database_Builder_Core {
}
/**
+ * Create a SELECT query and specify selected columns
+ *
+ * @param string|array column name or array(alias => column)
+ * @return Database_Builder
+ */
+ public function select_distinct($columns = NULL)
+ {
+ $this->select($columns);
+ $this->distinct = TRUE;
+ return $this;
+ }
+
+ /**
* Create an UPDATE query
*
* @param string Table name
diff --git a/system/libraries/Database_Mysql.php b/system/libraries/Database_Mysql.php
index cb531194..a5775037 100644
--- a/system/libraries/Database_Mysql.php
+++ b/system/libraries/Database_Mysql.php
@@ -2,7 +2,7 @@
/**
* MySQL database connection.
*
- * $Id: Database_Mysql.php 4684 2009-11-18 14:26:48Z isaiah $
+ * $Id: Database_Mysql.php 4712 2009-12-10 21:47:09Z cbandy $
*
* @package Kohana
* @author Kohana Team
@@ -31,16 +31,15 @@ class Database_Mysql_Core extends Database {
extract($this->config['connection']);
- // Set the connection type
- $connect = ($this->config['persistent'] === TRUE) ? 'mysql_pconnect' : 'mysql_connect';
-
$host = isset($host) ? $host : $socket;
$port = isset($port) ? ':'.$port : '';
try
{
// Connect to the database
- $this->connection = $connect($host.$port, $user, $pass, TRUE);
+ $this->connection = ($this->config['persistent'] === TRUE)
+ ? mysql_pconnect($host.$port, $user, $pass, $params)
+ : mysql_connect($host.$port, $user, $pass, TRUE, $params);
}
catch (Kohana_PHP_Exception $e)
{
diff --git a/system/libraries/Database_Mysqli.php b/system/libraries/Database_Mysqli.php
index 523fcb19..08ed99df 100644
--- a/system/libraries/Database_Mysqli.php
+++ b/system/libraries/Database_Mysqli.php
@@ -2,7 +2,7 @@
/**
* MySQL database connection.
*
- * $Id: Database_Mysqli.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Database_Mysqli.php 4712 2009-12-10 21:47:09Z cbandy $
*
* @package Kohana
* @author Kohana Team
@@ -29,29 +29,29 @@ class Database_Mysqli_Core extends Database_Mysql {
$host = isset($host) ? $host : $socket;
- if($this->connection = new mysqli($host, $user, $pass, $database, $port)) {
+ $mysqli = mysqli_init();
- if (isset($this->config['character_set']))
- {
- // Set the character set
- $this->set_charset($this->config['character_set']);
- }
+ if ( ! $mysqli->real_connect($host, $user, $pass, $database, $port, $socket, $params))
+ throw new Database_Exception('#:errno: :error',
+ array(':error' => $mysqli->connect_error, ':errno' => $mysqli->connect_errno));
- // Clear password after successful connect
- $this->db_config['connection']['pass'] = NULL;
+ $this->connection = $mysqli;
- return $this->connection;
+ if (isset($this->config['character_set']))
+ {
+ // Set the character set
+ $this->set_charset($this->config['character_set']);
}
-
- // Unable to connect to the database
- throw new Database_Exception('#:errno: :error',
- array(':error' => $this->connection->connect_error,
- ':errno' => $this->connection->connect_errno));
}
public function disconnect()
{
- return is_object($this->connection) and $this->connection->close();
+ if (is_object($this->connection))
+ {
+ $this->connection->close();
+ }
+
+ $this->connection = NULL;
}
public function set_charset($charset)
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 83f0ed17..04403854 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -2,7 +2,7 @@
/**
* Input library.
*
- * $Id: Input.php 4680 2009-11-10 01:57:00Z isaiah $
+ * $Id: Input.php 4720 2009-12-17 21:15:03Z isaiah $
*
* @package Core
* @author Kohana Team
@@ -54,7 +54,7 @@ class Input_Core {
$_COOKIE = Input::clean($_COOKIE);
$_SERVER = Input::clean($_SERVER);
- if (PHP_SAPI == 'cli')
+ if (Kohana::$server_api === 'cli')
{
// Convert command line arguments
$_SERVER['argv'] = Input::clean($_SERVER['argv']);
@@ -311,7 +311,7 @@ class Input_Core {
if (trim($data) === '')
return $data;
- if ($tool === TRUE)
+ if (is_bool($tool))
{
$tool = 'default';
}
@@ -371,7 +371,7 @@ class Input_Core {
$data = html_entity_decode($data, ENT_COMPAT, 'UTF-8');
// Remove any attribute starting with "on" or xmlns
- $data = preg_replace('#(<[^>]+?[\x00-\x20"\'])(?:on|xmlns)[^>]*+>#iu', '$1>', $data);
+ $data = preg_replace('#(?:on[a-z]+|xmlns)\s*=\s*[\'"\x00-\x20]?[^\'>"]*[\'"\x00-\x20]?\s?#iu', '', $data);
// Remove javascript: and vbscript: protocols
$data = preg_replace('#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([`\'"]*)[\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2nojavascript...', $data);
diff --git a/system/libraries/Kohana_PHP_Exception.php b/system/libraries/Kohana_PHP_Exception.php
index fca5b30b..019c686b 100644
--- a/system/libraries/Kohana_PHP_Exception.php
+++ b/system/libraries/Kohana_PHP_Exception.php
@@ -2,7 +2,7 @@
/**
* Kohana PHP Error Exceptions
*
- * $Id: Kohana_PHP_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Kohana_PHP_Exception.php 4687 2009-11-30 21:59:26Z isaiah $
*
* @package Core
* @author Kohana Team
@@ -89,7 +89,7 @@ class Kohana_PHP_Exception_Core extends Kohana_Exception {
*/
public static function shutdown_handler()
{
- if (Kohana_PHP_Exception::$enabled AND $error = error_get_last())
+ if (Kohana_PHP_Exception::$enabled AND $error = error_get_last() AND (error_reporting() & $error['type']))
{
// Fake an exception for nice debugging
Kohana_Exception::handle(new Kohana_PHP_Exception($error['type'], $error['message'], $error['file'], $error['line']));
diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php
index eff22fc0..2f2feed5 100644
--- a/system/libraries/ORM.php
+++ b/system/libraries/ORM.php
@@ -8,7 +8,7 @@
* [ref-orm]: http://wikipedia.org/wiki/Object-relational_mapping
* [ref-act]: http://wikipedia.org/wiki/Active_record
*
- * $Id: ORM.php 4682 2009-11-11 20:53:23Z isaiah $
+ * $Id: ORM.php 4711 2009-12-10 20:40:52Z isaiah $
*
* @package ORM
* @author Kohana Team
@@ -102,7 +102,7 @@ class ORM_Core {
$this->object_name = strtolower(substr(get_class($this), 0, -6));
$this->object_plural = inflector::plural($this->object_name);
- if (!isset($this->sorting))
+ if ( ! isset($this->sorting))
{
// Default sorting
$this->sorting = array($this->primary_key => 'asc');
@@ -119,7 +119,7 @@ class ORM_Core {
// Load an object
$this->_load_values((array) $id);
}
- elseif (!empty($id))
+ elseif ( ! empty($id))
{
// Set the object's primary key, but don't load it until needed
$this->object[$this->primary_key] = $id;
@@ -234,7 +234,7 @@ class ORM_Core {
switch ($num_args)
{
case 0:
- if (in_array($method, array('open', 'close', 'cache')))
+ if (in_array($method, array('open', 'and_open', 'or_open', 'close', 'cache')))
{
// Should return ORM, not Database
$this->db_builder->$method();
@@ -320,12 +320,12 @@ class ORM_Core {
}
// Foreign key lies in this table (this model belongs_to target model)
- $where = array($model->foreign_key(TRUE) => $this->object[$this->foreign_key($column)]);
+ $where = array($model->foreign_key(TRUE), '=', $this->object[$this->foreign_key($column)]);
}
else
{
// Foreign key lies in the target table (this model has_one target model)
- $where = array($this->foreign_key($column, $model->table_name) => $this->primary_key_value);
+ $where = array($this->foreign_key($column, $model->table_name), '=', $this->primary_key_value);
}
// one<>alias:one relationship
@@ -525,16 +525,6 @@ class ORM_Core {
}
/**
- * Displays the primary key of a model when it is converted to a string.
- *
- * @return string
- */
- public function __toString()
- {
- return (string) $this->primary_key_value;
- }
-
- /**
* Returns the values of this object as an array.
*
* @return array
@@ -665,7 +655,7 @@ class ORM_Core {
if (is_array($id))
{
// Search for all clauses
- $this->db_builder->where($id);
+ $this->db_builder->where(array($id));
}
else
{
@@ -767,6 +757,9 @@ class ORM_Core {
ORM_Validation_Exception::handle_validation($this->table_name, $array);
}
+ // Fields may have been modified by filters
+ $this->object = array_merge($this->object, $array->getArrayCopy());
+
// Return validation status
return $this;
}
@@ -782,8 +775,10 @@ class ORM_Core {
if ( ! empty($this->changed))
{
// Require model validation before saving
- if (!$this->_valid)
+ if ( ! $this->_valid)
+ {
$this->validate();
+ }
$data = array();
foreach ($this->changed as $column)
@@ -881,8 +876,8 @@ class ORM_Core {
}
// Foreign keys for the join table
- $object_fk = $this->foreign_key(NULL);
- $related_fk = $model->foreign_key(NULL);
+ $object_fk = $this->foreign_key($join_table);
+ $related_fk = $model->foreign_key($join_table);
if ( ! empty($added))
{
@@ -909,6 +904,12 @@ class ORM_Core {
}
}
+ if ($this->saved() === TRUE)
+ {
+ // Clear the per-request database cache
+ $this->db->clear_cache(NULL, Database::PER_REQUEST);
+ }
+
return $this;
}
@@ -933,6 +934,9 @@ class ORM_Core {
->where($this->primary_key, '=', $id)
->execute($this->db);
+ // Clear the per-request database cache
+ $this->db->clear_cache(NULL, Database::PER_REQUEST);
+
return $this->clear();
}
@@ -965,6 +969,9 @@ class ORM_Core {
return $this;
}
+ // Clear the per-request database cache
+ $this->db->clear_cache(NULL, Database::PER_REQUEST);
+
return $this->clear();
}
@@ -1154,12 +1161,13 @@ class ORM_Core {
*
* @chainable
* @param string SQL query to clear
+ * @param integer Type of cache to clear, Database::CROSS_REQUEST or Database::PER_REQUEST
* @return ORM
*/
- public function clear_cache($sql = NULL)
+ public function clear_cache($sql = NULL, $type = NULL)
{
// Proxy to database
- $this->db->clear_cache($sql);
+ $this->db->clear_cache($sql, $type);
ORM::$column_cache = array();
@@ -1550,9 +1558,9 @@ class ORM_Core {
*/
protected function load_relations($table, ORM $model)
{
- $result = db::select(array('id' => $model->foreign_key(NULL)))
+ $result = db::select(array('id' => $model->foreign_key($table)))
->from($table)
- ->where($this->foreign_key(NULL, $table), '=', $this->primary_key_value)
+ ->where($this->foreign_key($table, $table), '=', $this->primary_key_value)
->execute($this->db)
->as_object();
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index b7a5ecae..940e365d 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -8,7 +8,7 @@
* POST Data - The name and values of any POST data submitted to the current page.
* Cookie Data - All cookies sent for the current request.
*
- * $Id: Profiler.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Profiler.php 4719 2009-12-17 04:31:48Z isaiah $
*
* @package Profiler
* @author Kohana Team
@@ -101,7 +101,7 @@ class Profiler_Core {
// Don't display if there's no profiles
if (empty(Profiler::$profiles))
- return $output;
+ return Kohana::$output;
$styles = '';
foreach (Profiler::$profiles as $profile)
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 82dbb9b5..18e01af2 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -2,7 +2,7 @@
/**
* Router
*
- * $Id: Router.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Router.php 4693 2009-12-04 17:11:16Z cbandy $
*
* @package Core
* @author Kohana Team
@@ -38,7 +38,7 @@ class Router_Core {
if ( ! empty($_SERVER['QUERY_STRING']))
{
// Set the query string to the current query string
- Router::$query_string = '?'.trim(urldecode($_SERVER['QUERY_STRING']), '&/');
+ Router::$query_string = '?'.urldecode(trim($_SERVER['QUERY_STRING'], '&'));
}
if (Router::$routes === NULL)
@@ -173,7 +173,7 @@ class Router_Core {
*/
public static function find_uri()
{
- if (PHP_SAPI === 'cli')
+ if (Kohana::$server_api === 'cli')
{
// Command line requires a bit of hacking
if (isset($_SERVER['argv'][1]))
@@ -181,9 +181,9 @@ class Router_Core {
Router::$current_uri = $_SERVER['argv'][1];
// Remove GET string from segments
- if (($query = strpos(Router::$current_uri, '?')) !== FALSE)
+ if (strpos(Router::$current_uri, '?') !== FALSE)
{
- list (Router::$current_uri, $query) = explode('?', Router::$current_uri, 2);
+ list(Router::$current_uri, $query) = explode('?', Router::$current_uri, 2);
// Parse the query string into $_GET
parse_str($query, $_GET);
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index f340e63c..47f34584 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -2,7 +2,7 @@
/**
* Validation library.
*
- * $Id: Validation.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Validation.php 4713 2009-12-10 22:25:38Z isaiah $
*
* @package Validation
* @author Kohana Team
@@ -26,12 +26,12 @@ class Validation_Core extends ArrayObject {
protected $errors = array();
protected $messages = array();
+ // Field labels
+ protected $labels = array();
+
// Fields that are expected to be arrays
protected $array_fields = array();
- // Checks if there is data to validate.
- protected $submitted;
-
/**
* Creates a new Validation instance.
*
@@ -52,9 +52,6 @@ class Validation_Core extends ArrayObject {
*/
public function __construct(array $array)
{
- // The array is submitted if the array is not empty
- $this->submitted = ! empty($array);
-
parent::__construct($array, ArrayObject::ARRAY_AS_PROPS | ArrayObject::STD_PROP_LIST);
}
@@ -86,21 +83,6 @@ class Validation_Core extends ArrayObject {
}
/**
- * Test if the data has been submitted.
- *
- * @return boolean
- */
- public function submitted($value = NULL)
- {
- if (is_bool($value))
- {
- $this->submitted = $value;
- }
-
- return $this->submitted;
- }
-
- /**
* Returns an array of all the field names that have filters, rules, or callbacks.
*
* @return array
@@ -197,6 +179,42 @@ class Validation_Core extends ArrayObject {
}
/**
+ * Sets or overwrites the label name for a field.
+ *
+ * @param string field name
+ * @param string label
+ * @return $this
+ */
+ public function label($field, $label = NULL)
+ {
+ if ($label === NULL AND ($field !== TRUE OR $field !== '*') AND ! isset($this->labels[$field]))
+ {
+ // Set the field label to the field name
+ $this->labels[$field] = ucfirst(preg_replace('/[^\pL]+/u', ' ', $field));
+ }
+ elseif ($label !== NULL)
+ {
+ // Set the label for this field
+ $this->labels[$field] = $label;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Sets labels using an array.
+ *
+ * @param array list of field => label names
+ * @return $this
+ */
+ public function labels(array $labels)
+ {
+ $this->labels = $labels + $this->labels;
+
+ return $this;
+ }
+
+ /**
* Converts a filter, rule, or callback into a fully-qualified callback array.
*
* @return mixed
@@ -338,6 +356,9 @@ class Validation_Core extends ArrayObject {
$rules = func_get_args();
$rules = array_slice($rules, 1);
+ // Set a default field label
+ $this->label($field);
+
if ($field === TRUE)
{
// Use wildcard
@@ -412,6 +433,9 @@ class Validation_Core extends ArrayObject {
$callbacks = func_get_args();
$callbacks = array_slice($callbacks, 1);
+ // Set a default field label
+ $this->label($field);
+
if ($field === TRUE)
{
// Use wildcard
@@ -471,9 +495,6 @@ class Validation_Core extends ArrayObject {
}
}
- if ($this->submitted === FALSE)
- return FALSE;
-
foreach ($this->rules as $field => $callbacks)
{
foreach ($callbacks as $callback)
@@ -534,6 +555,7 @@ class Validation_Core extends ArrayObject {
if (($result == $is_false))
{
+ $rule = $is_false ? '!'.$rule : $rule;
$this->add_error($field, $rule, $args);
// Stop validating this field when an error is found
@@ -619,46 +641,6 @@ class Validation_Core extends ArrayObject {
}
/**
- * Sets or returns the message for an input.
- *
- * @chainable
- * @param string input key
- * @param string message to set
- * @return string|object
- */
- public function message($input = NULL, $message = NULL)
- {
- if ($message === NULL)
- {
- if ($input === NULL)
- {
- $messages = array();
- $keys = array_keys($this->messages);
-
- foreach ($keys as $input)
- {
- $messages[] = $this->message($input);
- }
-
- return implode("\n", $messages);
- }
-
- // Return nothing if no message exists
- if (empty($this->messages[$input]))
- return '';
-
- // Return the HTML message string
- return $this->messages[$input];
- }
- else
- {
- $this->messages[$input] = $message;
- }
-
- return $this;
- }
-
- /**
* Return the errors array.
*
* @param boolean load errors from a message file
@@ -677,18 +659,49 @@ class Validation_Core extends ArrayObject {
}
else
{
-
$errors = array();
foreach ($this->errors as $input => $error)
{
- // Key for this input error
- $key = "$file.$input.$error[0]";
+ // Locations to check for error messages
+ $error_locations = array
+ (
+ "validation/{$file}.{$input}.{$error[0]}",
+ "validation/{$file}.{$input}.default",
+ "validation/default.{$error[0]}"
+ );
+
+ if (($message = Kohana::message($error_locations[0])) !== $error_locations[0])
+ {
+ // Found a message for this field and error
+ }
+ elseif (($message = Kohana::message($error_locations[1])) !== $error_locations[1])
+ {
+ // Found a default message for this field
+ }
+ elseif (($message = Kohana::message($error_locations[2])) !== $error_locations[2])
+ {
+ // Found a default message for this error
+ }
+ else
+ {
+ // No message exists, display the path expected
+ $message = "validation/{$file}.{$input}.{$error[0]}";
+ }
- if (($errors[$input] = Kohana::message('validation/'.$key, $error[1])) === $key)
+ // Start the translation values list
+ $values = array(':field' => __($this->labels[$input]));
+
+ if ( ! empty($error[1]))
{
- // Get the default error message
- $errors[$input] = Kohana::message("$file.$input.default");
+ foreach ($error[1] as $key => $value)
+ {
+ // Add each parameter as a numbered value, starting from 1
+ $values[':param'.($key + 1)] = __($value);
+ }
}
+
+ // Translate the message using the default language
+ $errors[$input] = __($message, $values);
}
return $errors;
diff --git a/system/libraries/drivers/Cache/File.php b/system/libraries/drivers/Cache/File.php
index fc20c22d..d6ec0378 100644
--- a/system/libraries/drivers/Cache/File.php
+++ b/system/libraries/drivers/Cache/File.php
@@ -183,7 +183,7 @@ class Cache_File_Driver extends Cache_Driver {
// Get the id from the filename
list($key, $junk) = explode('~', basename($path), 2);
- if (($data = $this->get($key)) !== FALSE)
+ if (($data = $this->get($key, TRUE)) !== FALSE)
{
// Add the result to the array
$result[$key] = $data;
@@ -211,7 +211,7 @@ class Cache_File_Driver extends Cache_Driver {
// Remove the cache file
if ( ! unlink($path))
{
- Kohana::log('error', 'Cache: Unable to delete cache file: '.$path);
+ Kohana_Log::add('error', 'Cache: Unable to delete cache file: '.$path);
$success = FALSE;
}
}
diff --git a/system/libraries/drivers/Cache/Memcache.php b/system/libraries/drivers/Cache/Memcache.php
index 636191d4..13d61d82 100644
--- a/system/libraries/drivers/Cache/Memcache.php
+++ b/system/libraries/drivers/Cache/Memcache.php
@@ -17,7 +17,7 @@ class Cache_Memcache_Driver extends Cache_Driver {
public function __construct($config)
{
if ( ! extension_loaded('memcache'))
- throw new Kohana_Exception('The memcache PHP extension must be loaded to use this driver.');
+ throw new Cache_Exception('The memcache PHP extension must be loaded to use this driver.');
ini_set('memcache.allow_failover', (isset($config['allow_failover']) AND $config['allow_failover']) ? TRUE : FALSE);
@@ -79,7 +79,10 @@ class Cache_Memcache_Driver extends Cache_Driver {
if ($single)
{
- return ($items === FALSE OR count($items) > 0) ? current($items) : NULL;
+ if ($items === FALSE)
+ return NULL;
+
+ return (count($items) > 0) ? current($items) : NULL;
}
else
{
diff --git a/system/libraries/drivers/Cache/Xcache.php b/system/libraries/drivers/Cache/Xcache.php
index ad11e6d7..4c08405e 100644
--- a/system/libraries/drivers/Cache/Xcache.php
+++ b/system/libraries/drivers/Cache/Xcache.php
@@ -16,7 +16,7 @@ class Cache_Xcache_Driver extends Cache_Driver {
public function __construct($config)
{
if ( ! extension_loaded('xcache'))
- throw new Kohana_Exception('The xcache PHP extension must be loaded to use this driver.');
+ throw new Cache_Exception('The xcache PHP extension must be loaded to use this driver.');
$this->config = $config;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 14:15:47 +0000