From 9b6663f87a7e679ffba691cf516191fc840cf978 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 24 Nov 2009 19:20:36 -0800 Subject: Update to Kohana r4684 which is now Kohana 2.4 and has substantial changes. --- application/Bootstrap.php | 59 + application/config/config.php | 6 + system/KohanaLicense.html | 2 +- system/config/cache.php | 6 +- system/config/cache_memcache.php | 20 - system/config/cache_sqlite.php | 10 - system/config/cache_xcache.php | 12 - system/config/cookie.php | 12 +- system/config/database.php | 2 +- system/config/email.php | 22 - system/config/inflector.php | 2 + system/config/locale.php | 5 +- system/config/log.php | 19 + system/config/mimes.php | 2 +- system/config/pagination.php | 25 - system/config/profiler.php | 4 + system/config/session.php | 5 +- system/config/sql_types.php | 115 +- system/config/view.php | 1 + system/controllers/template.php | 6 +- system/core/Benchmark.php | 9 +- system/core/Bootstrap.php | 58 - system/core/Event.php | 81 +- system/core/Kohana.php | 1166 ++------- system/core/Kohana_Config.php | 331 +++ system/core/Kohana_Exception.php | 619 +++++ system/core/utf8.php | 743 ------ system/core/utf8/from_unicode.php | 68 - system/core/utf8/ltrim.php | 22 - system/core/utf8/ord.php | 88 - system/core/utf8/rtrim.php | 22 - system/core/utf8/str_ireplace.php | 70 - system/core/utf8/str_pad.php | 54 - system/core/utf8/str_split.php | 33 - system/core/utf8/strcasecmp.php | 19 - system/core/utf8/strcspn.php | 30 - system/core/utf8/stristr.php | 28 - system/core/utf8/strlen.php | 21 - system/core/utf8/strpos.php | 30 - system/core/utf8/strrev.php | 18 - system/core/utf8/strrpos.php | 30 - system/core/utf8/strspn.php | 30 - system/core/utf8/strtolower.php | 84 - system/core/utf8/strtoupper.php | 84 - system/core/utf8/substr.php | 75 - system/core/utf8/substr_replace.php | 22 - system/core/utf8/to_unicode.php | 141 - system/core/utf8/transliterate_to_ascii.php | 77 - system/core/utf8/trim.php | 17 - system/core/utf8/ucfirst.php | 18 - system/core/utf8/ucwords.php | 26 - system/helpers/arr.php | 103 +- system/helpers/cookie.php | 87 +- system/helpers/date.php | 42 +- system/helpers/db.php | 49 + system/helpers/download.php | 148 +- system/helpers/email.php | 181 -- system/helpers/expires.php | 115 +- system/helpers/feed.php | 6 +- system/helpers/file.php | 6 +- system/helpers/form.php | 123 +- system/helpers/format.php | 54 +- system/helpers/html.php | 106 +- system/helpers/inflector.php | 73 +- system/helpers/num.php | 6 +- system/helpers/remote.php | 10 +- system/helpers/request.php | 480 +++- system/helpers/security.php | 11 +- system/helpers/text.php | 218 +- system/helpers/upload.php | 15 +- system/helpers/url.php | 10 +- system/helpers/utf8.php | 746 ++++++ system/helpers/valid.php | 64 +- system/i18n/en_US/cache.php | 10 - system/i18n/en_US/calendar.php | 59 - system/i18n/en_US/core.php | 34 - system/i18n/en_US/database.php | 15 - system/i18n/en_US/encrypt.php | 8 - system/i18n/en_US/errors.php | 16 - system/i18n/en_US/event.php | 7 - system/i18n/en_US/image.php | 33 - system/i18n/en_US/orm.php | 3 - system/i18n/en_US/profiler.php | 15 - system/i18n/en_US/session.php | 6 - system/i18n/en_US/upload.php | 6 - system/i18n/en_US/validation.php | 41 - system/libraries/Cache.php | 145 +- system/libraries/Cache_Exception.php | 12 + system/libraries/Controller.php | 41 +- system/libraries/Database.php | 1677 +++--------- system/libraries/Database_Builder.php | 938 +++++++ system/libraries/Database_Cache_Result.php | 83 + system/libraries/Database_Exception.php | 17 + system/libraries/Database_Expression.php | 21 +- system/libraries/Database_Mysql.php | 229 ++ system/libraries/Database_Mysql_Result.php | 176 ++ system/libraries/Database_Mysqli.php | 92 + system/libraries/Database_Mysqli_Result.php | 177 ++ system/libraries/Database_Query.php | 95 + system/libraries/Database_Result.php | 170 ++ system/libraries/Encrypt.php | 30 +- system/libraries/Event_Observer.php | 70 - system/libraries/Event_Subject.php | 67 - system/libraries/I18n.php | 103 + system/libraries/Image.php | 103 +- system/libraries/Input.php | 266 +- system/libraries/Kohana_404_Exception.php | 56 + system/libraries/Kohana_Log.php | 90 + system/libraries/Kohana_PHP_Exception.php | 99 + system/libraries/Kohana_User_Exception.php | 30 + system/libraries/Model.php | 35 +- system/libraries/ORM.php | 525 ++-- system/libraries/ORM_Iterator.php | 68 +- system/libraries/ORM_Tree.php | 76 - system/libraries/ORM_Validation_Exception.php | 26 + system/libraries/ORM_Versioned.php | 143 - system/libraries/Pagination.php | 236 -- system/libraries/Profiler.php | 173 +- system/libraries/Profiler_Table.php | 10 +- system/libraries/Router.php | 97 +- system/libraries/Session.php | 66 +- system/libraries/URI.php | 6 +- system/libraries/Validation.php | 146 +- system/libraries/View.php | 104 +- system/libraries/drivers/Cache.php | 36 +- system/libraries/drivers/Cache/Apc.php | 64 - system/libraries/drivers/Cache/Eaccelerator.php | 66 - system/libraries/drivers/Cache/File.php | 268 +- system/libraries/drivers/Cache/Memcache.php | 200 +- system/libraries/drivers/Cache/Sqlite.php | 257 -- system/libraries/drivers/Cache/Xcache.php | 144 +- system/libraries/drivers/Captcha.php | 227 -- system/libraries/drivers/Captcha/Alpha.php | 92 - system/libraries/drivers/Captcha/Basic.php | 81 - system/libraries/drivers/Captcha/Black.php | 72 - system/libraries/drivers/Captcha/Math.php | 61 - system/libraries/drivers/Captcha/Riddle.php | 47 - system/libraries/drivers/Captcha/Word.php | 37 - system/libraries/drivers/Config.php | 257 ++ system/libraries/drivers/Config/Array.php | 83 + system/libraries/drivers/Database.php | 636 ----- system/libraries/drivers/Database/Mssql.php | 462 ---- system/libraries/drivers/Database/Mysql.php | 496 ---- system/libraries/drivers/Database/Mysqli.php | 358 --- system/libraries/drivers/Database/Pdosqlite.php | 486 ---- system/libraries/drivers/Database/Pgsql.php | 538 ---- system/libraries/drivers/Image.php | 10 +- system/libraries/drivers/Image/GD.php | 69 +- system/libraries/drivers/Image/GraphicsMagick.php | 14 +- system/libraries/drivers/Image/ImageMagick.php | 39 +- system/libraries/drivers/Log.php | 22 + system/libraries/drivers/Log/Database.php | 40 + system/libraries/drivers/Log/File.php | 44 + system/libraries/drivers/Log/Syslog.php | 34 + system/libraries/drivers/Session.php | 6 +- system/libraries/drivers/Session/Cache.php | 10 +- system/libraries/drivers/Session/Cookie.php | 10 +- system/libraries/drivers/Session/Database.php | 40 +- system/messages/core.php | 32 + system/vendor/Markdown.php | 2909 +++++++++++++++++++++ system/views/kohana/error.php | 252 ++ system/views/kohana/error_disabled.php | 19 + system/views/kohana/template.php | 6 +- system/views/kohana_error_disabled.php | 17 - system/views/kohana_error_page.php | 27 - system/views/kohana_errors.css | 21 - system/views/kohana_profiler.php | 37 - system/views/kohana_profiler_table.css | 53 - system/views/kohana_profiler_table.php | 25 - system/views/profiler/profiler.php | 37 + system/views/profiler/table.css | 53 + system/views/profiler/table.php | 24 + 172 files changed, 11531 insertions(+), 11140 deletions(-) create mode 100644 application/Bootstrap.php delete mode 100644 system/config/cache_memcache.php delete mode 100644 system/config/cache_sqlite.php delete mode 100644 system/config/cache_xcache.php delete mode 100644 system/config/email.php create mode 100644 system/config/log.php delete mode 100644 system/config/pagination.php delete mode 100644 system/core/Bootstrap.php create mode 100644 system/core/Kohana_Config.php create mode 100644 system/core/Kohana_Exception.php delete mode 100644 system/core/utf8.php delete mode 100644 system/core/utf8/from_unicode.php delete mode 100644 system/core/utf8/ltrim.php delete mode 100644 system/core/utf8/ord.php delete mode 100644 system/core/utf8/rtrim.php delete mode 100644 system/core/utf8/str_ireplace.php delete mode 100644 system/core/utf8/str_pad.php delete mode 100644 system/core/utf8/str_split.php delete mode 100644 system/core/utf8/strcasecmp.php delete mode 100644 system/core/utf8/strcspn.php delete mode 100644 system/core/utf8/stristr.php delete mode 100644 system/core/utf8/strlen.php delete mode 100644 system/core/utf8/strpos.php delete mode 100644 system/core/utf8/strrev.php delete mode 100644 system/core/utf8/strrpos.php delete mode 100644 system/core/utf8/strspn.php delete mode 100644 system/core/utf8/strtolower.php delete mode 100644 system/core/utf8/strtoupper.php delete mode 100644 system/core/utf8/substr.php delete mode 100644 system/core/utf8/substr_replace.php delete mode 100644 system/core/utf8/to_unicode.php delete mode 100644 system/core/utf8/transliterate_to_ascii.php delete mode 100644 system/core/utf8/trim.php delete mode 100644 system/core/utf8/ucfirst.php delete mode 100644 system/core/utf8/ucwords.php create mode 100644 system/helpers/db.php delete mode 100644 system/helpers/email.php create mode 100644 system/helpers/utf8.php delete mode 100644 system/i18n/en_US/cache.php delete mode 100644 system/i18n/en_US/calendar.php delete mode 100644 system/i18n/en_US/core.php delete mode 100644 system/i18n/en_US/database.php delete mode 100644 system/i18n/en_US/encrypt.php delete mode 100644 system/i18n/en_US/errors.php delete mode 100644 system/i18n/en_US/event.php delete mode 100644 system/i18n/en_US/image.php delete mode 100644 system/i18n/en_US/orm.php delete mode 100644 system/i18n/en_US/profiler.php delete mode 100644 system/i18n/en_US/session.php delete mode 100644 system/i18n/en_US/upload.php delete mode 100644 system/i18n/en_US/validation.php create mode 100644 system/libraries/Cache_Exception.php create mode 100644 system/libraries/Database_Builder.php create mode 100644 system/libraries/Database_Cache_Result.php create mode 100644 system/libraries/Database_Exception.php create mode 100644 system/libraries/Database_Mysql.php create mode 100644 system/libraries/Database_Mysql_Result.php create mode 100644 system/libraries/Database_Mysqli.php create mode 100644 system/libraries/Database_Mysqli_Result.php create mode 100644 system/libraries/Database_Query.php create mode 100644 system/libraries/Database_Result.php delete mode 100644 system/libraries/Event_Observer.php delete mode 100644 system/libraries/Event_Subject.php create mode 100644 system/libraries/I18n.php create mode 100644 system/libraries/Kohana_404_Exception.php create mode 100644 system/libraries/Kohana_Log.php create mode 100644 system/libraries/Kohana_PHP_Exception.php create mode 100644 system/libraries/Kohana_User_Exception.php delete mode 100644 system/libraries/ORM_Tree.php create mode 100644 system/libraries/ORM_Validation_Exception.php delete mode 100644 system/libraries/ORM_Versioned.php delete mode 100644 system/libraries/Pagination.php delete mode 100644 system/libraries/drivers/Cache/Apc.php delete mode 100644 system/libraries/drivers/Cache/Eaccelerator.php delete mode 100644 system/libraries/drivers/Cache/Sqlite.php delete mode 100644 system/libraries/drivers/Captcha.php delete mode 100644 system/libraries/drivers/Captcha/Alpha.php delete mode 100644 system/libraries/drivers/Captcha/Basic.php delete mode 100644 system/libraries/drivers/Captcha/Black.php delete mode 100644 system/libraries/drivers/Captcha/Math.php delete mode 100644 system/libraries/drivers/Captcha/Riddle.php delete mode 100644 system/libraries/drivers/Captcha/Word.php create mode 100644 system/libraries/drivers/Config.php create mode 100644 system/libraries/drivers/Config/Array.php delete mode 100644 system/libraries/drivers/Database.php delete mode 100644 system/libraries/drivers/Database/Mssql.php delete mode 100644 system/libraries/drivers/Database/Mysql.php delete mode 100644 system/libraries/drivers/Database/Mysqli.php delete mode 100644 system/libraries/drivers/Database/Pdosqlite.php delete mode 100644 system/libraries/drivers/Database/Pgsql.php create mode 100644 system/libraries/drivers/Log.php create mode 100644 system/libraries/drivers/Log/Database.php create mode 100644 system/libraries/drivers/Log/File.php create mode 100644 system/libraries/drivers/Log/Syslog.php create mode 100644 system/messages/core.php create mode 100644 system/vendor/Markdown.php create mode 100644 system/views/kohana/error.php create mode 100644 system/views/kohana/error_disabled.php delete mode 100644 system/views/kohana_error_disabled.php delete mode 100644 system/views/kohana_error_page.php delete mode 100644 system/views/kohana_errors.css delete mode 100644 system/views/kohana_profiler.php delete mode 100644 system/views/kohana_profiler_table.css delete mode 100644 system/views/kohana_profiler_table.php create mode 100644 system/views/profiler/profiler.php create mode 100644 system/views/profiler/table.css create mode 100644 system/views/profiler/table.php diff --git a/application/Bootstrap.php b/application/Bootstrap.php new file mode 100644 index 00000000..b15cbfce --- /dev/null +++ b/application/Bootstrap.php @@ -0,0 +1,59 @@ +This license is a legal agreement between you and the Kohana Software Foundation for the use of Kohana Framework (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.

-

Copyright (c) 2007-2008 Kohana Team
All rights reserved.

+

Copyright (c) 2007-2009 Kohana Team
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/system/config/cache.php b/system/config/cache.php index ccd3da4d..68682c0a 100644 --- a/system/config/cache.php +++ b/system/config/cache.php @@ -19,14 +19,10 @@ * thirty minutes. Specific lifetime can also be set when creating a new cache. * Setting this to 0 will never automatically delete caches. * - * requests - Average number of cache requests that will processed before all expired - * caches are deleted. This is commonly referred to as "garbage collection". - * Setting this to 0 or a negative number will disable automatic garbage collection. */ $config['default'] = array ( 'driver' => 'file', - 'params' => APPPATH.'cache', + 'params' => array('directory' => APPPATH.'cache', 'gc_probability' => 1000), 'lifetime' => 1800, - 'requests' => 1000 ); diff --git a/system/config/cache_memcache.php b/system/config/cache_memcache.php deleted file mode 100644 index 43d8f205..00000000 --- a/system/config/cache_memcache.php +++ /dev/null @@ -1,20 +0,0 @@ - '127.0.0.1', - 'port' => 11211, - 'persistent' => FALSE, - ) -); - -/** - * Enable cache data compression. - */ -$config['compression'] = FALSE; diff --git a/system/config/cache_sqlite.php b/system/config/cache_sqlite.php deleted file mode 100644 index 818b8932..00000000 --- a/system/config/cache_sqlite.php +++ /dev/null @@ -1,10 +0,0 @@ - TRUE, + 'benchmark' => FALSE, 'persistent' => FALSE, 'connection' => array ( diff --git a/system/config/email.php b/system/config/email.php deleted file mode 100644 index c768367c..00000000 --- a/system/config/email.php +++ /dev/null @@ -1,22 +0,0 @@ - 1, + 'alert' => 2, + 'info' => 3, + 'debug' => 4, +); + +// See different log levels above +$config['log_threshold'] = 1; + +$config['date_format'] = 'Y-m-d H:i:s P'; + +// We can define multiple logging backends at the same time. +$config['drivers'] = array('file'); \ No newline at end of file diff --git a/system/config/mimes.php b/system/config/mimes.php index 6a960f24..c4318d58 100644 --- a/system/config/mimes.php +++ b/system/config/mimes.php @@ -6,7 +6,7 @@ * the operating system MIME list. * * If there are any missing options, please create a ticket on our issue tracker, - * http://kohanaphp.com/trac/newticket. Be sure to give the filename and + * http://dev.kohanaphp.com/projects/kohana2. Be sure to give the filename and * expected MIME type, as well as any additional information you can provide. */ $config = array diff --git a/system/config/pagination.php b/system/config/pagination.php deleted file mode 100644 index 808fc315..00000000 --- a/system/config/pagination.php +++ /dev/null @@ -1,25 +0,0 @@ - 'pagination', - 'style' => 'classic', - 'uri_segment' => 3, - 'query_string' => '', - 'items_per_page' => 20, - 'auto_hide' => FALSE, -); diff --git a/system/config/profiler.php b/system/config/profiler.php index 98ab5a49..90532f07 100644 --- a/system/config/profiler.php +++ b/system/config/profiler.php @@ -6,3 +6,7 @@ * Built in sections are benchmarks, database, session, post and cookies, custom sections can be used too. */ $config['show'] = TRUE; + +$config['time_decimals'] = 3; + +$config['memory_decimals'] = 2; \ No newline at end of file diff --git a/system/config/session.php b/system/config/session.php index e287bae8..29eeafbd 100644 --- a/system/config/session.php +++ b/system/config/session.php @@ -25,7 +25,6 @@ $config['validate'] = array('user_agent'); /** * Enable or disable session encryption. * Note: this has no effect on the native session driver. - * Note: the cookie driver always encrypts session data. Set to TRUE for stronger encryption. */ $config['encryption'] = FALSE; @@ -38,8 +37,10 @@ $config['expiration'] = 7200; /** * Number of page loads before the session id is regenerated. * A value of 0 will disable automatic session id regeneration. + * NOTE: Enabling automatic session regeneration can cause a race condition see the + * docs for details: http://docs.kohanaphp.com/libraries/session#regenerate */ -$config['regenerate'] = 3; +$config['regenerate'] = 0; /** * Percentage probability that the gc (garbage collection) routine is started. diff --git a/system/config/sql_types.php b/system/config/sql_types.php index 4034c6f5..43a13c27 100644 --- a/system/config/sql_types.php +++ b/system/config/sql_types.php @@ -4,55 +4,90 @@ * * SQL data types. If there are missing values, please report them: * - * @link http://trac.kohanaphp.com/newticket + * @link http://dev.kohanaphp.com/projects/kohana2 */ $config = array ( - 'tinyint' => array('type' => 'int', 'max' => 127), - 'smallint' => array('type' => 'int', 'max' => 32767), - 'mediumint' => array('type' => 'int', 'max' => 8388607), - 'int' => array('type' => 'int', 'max' => 2147483647), - 'integer' => array('type' => 'int', 'max' => 2147483647), - 'bigint' => array('type' => 'int', 'max' => 9223372036854775807), - 'float' => array('type' => 'float'), - 'float unsigned' => array('type' => 'float', 'min' => 0), - 'boolean' => array('type' => 'boolean'), - 'time' => array('type' => 'string', 'format' => '00:00:00'), - 'time with time zone' => array('type' => 'string'), - 'date' => array('type' => 'string', 'format' => '0000-00-00'), - 'year' => array('type' => 'string', 'format' => '0000'), - 'datetime' => array('type' => 'string', 'format' => '0000-00-00 00:00:00'), + // SQL-92 + 'bit' => array('type' => 'string', 'exact' => TRUE), + 'bit varying' => array('type' => 'string'), + 'character' => array('type' => 'string', 'exact' => TRUE), + 'character varying' => array('type' => 'string'), + 'date' => array('type' => 'string'), + 'decimal' => array('type' => 'float', 'exact' => TRUE), + 'double precision' => array('type' => 'float'), + 'float' => array('type' => 'float'), + 'integer' => array('type' => 'int', 'min' => -2147483648, 'max' => 2147483647), + 'interval' => array('type' => 'string'), + 'national character' => array('type' => 'string', 'exact' => TRUE), + 'national character varying' => array('type' => 'string'), + 'numeric' => array('type' => 'float', 'exact' => TRUE), + 'real' => array('type' => 'float'), + 'smallint' => array('type' => 'int', 'min' => -32768, 'max' => 32767), + 'time' => array('type' => 'string'), + 'time with time zone' => array('type' => 'string'), + 'timestamp' => array('type' => 'string'), 'timestamp with time zone' => array('type' => 'string'), - 'char' => array('type' => 'string', 'exact' => TRUE), - 'binary' => array('type' => 'string', 'binary' => TRUE, 'exact' => TRUE), - 'varchar' => array('type' => 'string'), - 'varbinary' => array('type' => 'string', 'binary' => TRUE), - 'blob' => array('type' => 'string', 'binary' => TRUE), - 'text' => array('type' => 'string') -); -// DOUBLE -$config['double'] = $config['double precision'] = $config['decimal'] = $config['real'] = $config['numeric'] = $config['float']; -$config['double unsigned'] = $config['float unsigned']; + // SQL:1999 + //'array','ref','row' + 'binary large object' => array('type' => 'string', 'binary' => TRUE), + 'boolean' => array('type' => 'boolean'), + 'character large object' => array('type' => 'string'), + 'national character large object' => array('type' => 'string'), -// BIT -$config['bit'] = $config['boolean']; + // SQL:2003 + 'bigint' => array('type' => 'int', 'min' => -9223372036854775808, 'max' => 9223372036854775807), -// TIMESTAMP -$config['timestamp'] = $config['timestamp without time zone'] = $config['datetime']; + // SQL:2008 + 'binary' => array('type' => 'string', 'binary' => TRUE, 'exact' => TRUE), + 'binary varying' => array('type' => 'string', 'binary' => TRUE), -// ENUM -$config['enum'] = $config['set'] = $config['varchar']; + // MySQL + 'bigint unsigned' => array('type' => 'int', 'min' => 0, 'max' => 18446744073709551615), + 'decimal unsigned' => array('type' => 'float', 'exact' => TRUE, 'min' => 0.0), + 'double unsigned' => array('type' => 'float', 'min' => 0.0), + 'float unsigned' => array('type' => 'float', 'min' => 0.0), + 'integer unsigned' => array('type' => 'int', 'min' => 0, 'max' => 4294967295), + 'mediumint' => array('type' => 'int', 'min' => -8388608, 'max' => 8388607), + 'mediumint unsigned' => array('type' => 'int', 'min' => 0, 'max' => 16777215), + 'real unsigned' => array('type' => 'float', 'min' => 0.0), + 'smallint unsigned' => array('type' => 'int', 'min' => 0, 'max' => 65535), + 'text' => array('type' => 'string'), + 'tinyint' => array('type' => 'int', 'min' => -128, 'max' => 127), + 'tinyint unsigned' => array('type' => 'int', 'min' => 0, 'max' => 255), + 'year' => array('type' => 'string'), +); -// TEXT -$config['tinytext'] = $config['mediumtext'] = $config['longtext'] = $config['text']; +// SQL-92 +$config['char'] = $config['character']; +$config['char varying'] = $config['character varying']; +$config['dec'] = $config['decimal']; +$config['int'] = $config['integer']; +$config['nchar'] = $config['national char'] = $config['national character']; +$config['nchar varying'] = $config['national char varying'] = $config['national character varying']; +$config['varchar'] = $config['character varying']; -// BLOB -$config['tsvector'] = $config['tinyblob'] = $config['mediumblob'] = $config['longblob'] = $config['clob'] = $config['bytea'] = $config['blob']; +// SQL:1999 +$config['blob'] = $config['binary large object']; +$config['clob'] = $config['char large object'] = $config['character large object']; +$config['nclob'] = $config['nchar large object'] = $config['national character large object']; +$config['time without time zone'] = $config['time']; +$config['timestamp without time zone'] = $config['timestamp']; -// CHARACTER -$config['character'] = $config['char']; -$config['character varying'] = $config['varchar']; +// SQL:2008 +$config['varbinary'] = $config['binary varying']; -// TIME -$config['time without time zone'] = $config['time']; +// MySQL +$config['bool'] = $config['boolean']; +$config['datetime'] = $config['timestamp']; +$config['double'] = $config['double precision']; +$config['double precision unsigned'] = $config['double unsigned']; +$config['enum'] = $config['set'] = $config['character varying']; +$config['fixed'] = $config['decimal']; +$config['fixed unsigned'] = $config['decimal unsigned']; +$config['int unsigned'] = $config['integer unsigned']; +$config['longblob'] = $config['mediumblob'] = $config['tinyblob'] = $config['binary large object']; +$config['longtext'] = $config['mediumtext'] = $config['tinytext'] = $config['text']; +$config['numeric unsigned'] = $config['decimal unsigned']; +$config['nvarchar'] = $config['national varchar'] = $config['national character varying']; diff --git a/system/config/view.php b/system/config/view.php index 6bed22e0..a77af878 100644 --- a/system/config/view.php +++ b/system/config/view.php @@ -3,6 +3,7 @@ * @package Core * * Allowed non-php view types. Most file extensions are supported. + * Do not forget to add a valid MIME type in mimes.php */ $config['allowed_filetypes'] = array ( diff --git a/system/controllers/template.php b/system/controllers/template.php index 34d1a226..4267ee16 100644 --- a/system/controllers/template.php +++ b/system/controllers/template.php @@ -7,12 +7,12 @@ * To use it, declare your controller to extend this class: * `class Your_Controller extends Template_Controller` * - * $Id: template.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: template.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ abstract class Template_Controller extends Controller { diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index ce230f11..4b2f78b0 100644 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -2,12 +2,12 @@ /** * Simple benchmarking. * - * $Id: Benchmark.php 4149 2009-04-01 13:32:50Z Shadowhand $ + * $Id: Benchmark.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ final class Benchmark { @@ -22,6 +22,9 @@ final class Benchmark { */ public static function start($name) { + if (isset(self::$marks[$name]) AND self::$marks[$name][0]['stop'] === FALSE) + throw new Kohana_Exception('A benchmark named :name is already running.', array(':name' => $name)); + if ( ! isset(self::$marks[$name])) { self::$marks[$name] = array(); diff --git a/system/core/Bootstrap.php b/system/core/Bootstrap.php deleted file mode 100644 index edfb086d..00000000 --- a/system/core/Bootstrap.php +++ /dev/null @@ -1,58 +0,0 @@ - $event_callback) + foreach (Event::$events[$name] as $i => $event_callback) { if ($callback === $event_callback) { - unset(self::$events[$name][$i]); + unset(Event::$events[$name][$i]); } } } @@ -198,24 +199,24 @@ final class Event { */ public static function run($name, & $data = NULL) { - if ( ! empty(self::$events[$name])) + if ( ! empty(Event::$events[$name])) { // So callbacks can access Event::$data - self::$data =& $data; - $callbacks = self::get($name); + Event::$data =& $data; + $callbacks = Event::get($name); foreach ($callbacks as $callback) { - call_user_func($callback); + call_user_func_array($callback, array(&$data)); } // Do this to prevent data from getting 'stuck' $clear_data = ''; - self::$data =& $clear_data; + Event::$data =& $clear_data; } // The event has been run! - self::$has_run[$name] = $name; + Event::$has_run[$name] = $name; } /** @@ -226,7 +227,7 @@ final class Event { */ public static function has_run($name) { - return isset(self::$has_run[$name]); + return isset(Event::$has_run[$name]); } } // End Event \ No newline at end of file diff --git a/system/core/Kohana.php b/system/core/Kohana.php index 8027975d..5258d635 100644 --- a/system/core/Kohana.php +++ b/system/core/Kohana.php @@ -2,60 +2,48 @@ /** * Provides Kohana-specific helper functions. This is where the magic happens! * - * $Id: Kohana.php 4372 2009-05-28 17:00:34Z ixmatus $ + * $Id: Kohana.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ -final class Kohana { + +// Test of Kohana is running in Windows +define('KOHANA_IS_WIN', DIRECTORY_SEPARATOR === '\\'); + +abstract class Kohana_Core { + + const VERSION = '2.4'; + const CODENAME = 'no_codename'; + const CHARSET = 'UTF-8'; + const LOCALE = 'en_US'; // The singleton instance of the controller public static $instance; // Output buffering level - private static $buffer_level; - - // Will be set to TRUE when an exception is caught - public static $has_error = FALSE; + protected static $buffer_level; // The final output that will displayed by Kohana public static $output = ''; - // The current user agent - public static $user_agent; - // The current locale public static $locale; - // Configuration - private static $configuration; - // Include paths - private static $include_paths; - - // Logged messages - private static $log; + protected static $include_paths; // Cache lifetime - private static $cache_lifetime; - - // Log levels - private static $log_levels = array - ( - 'error' => 1, - 'alert' => 2, - 'info' => 3, - 'debug' => 4, - ); + protected static $cache_lifetime; // Internal caches and write status - private static $internal_cache = array(); - private static $write_cache; - private static $internal_cache_path; - private static $internal_cache_key; - private static $internal_cache_encrypt; + protected static $internal_cache = array(); + protected static $write_cache; + protected static $internal_cache_path; + protected static $internal_cache_key; + protected static $internal_cache_encrypt; /** * Sets up the PHP environment. Adds error/exception handling, output @@ -75,10 +63,12 @@ final class Kohana { { static $run; - // This function can only be run once + // Only run this function once if ($run === TRUE) return; + $run = TRUE; + // Start the environment setup benchmark Benchmark::start(SYSTEM_BENCHMARK.'_environment_setup'); @@ -91,89 +81,86 @@ final class Kohana { // Define database error constant define('E_DATABASE_ERROR', 44); - if (self::$cache_lifetime = self::config('core.internal_cache')) + // Set the default charset for mb_* functions + mb_internal_encoding(Kohana::CHARSET); + + if (Kohana_Config::instance()->loaded() === FALSE) + { + // Re-parse the include paths + Kohana::include_paths(TRUE); + } + + if (Kohana::$cache_lifetime = Kohana::config('core.internal_cache')) { // Are we using encryption for caches? - self::$internal_cache_encrypt = self::config('core.internal_cache_encrypt'); - - if(self::$internal_cache_encrypt===TRUE) + Kohana::$internal_cache_encrypt = Kohana::config('core.internal_cache_encrypt'); + + if(Kohana::$internal_cache_encrypt===TRUE) { - self::$internal_cache_key = self::config('core.internal_cache_key'); - + Kohana::$internal_cache_key = Kohana::config('core.internal_cache_key'); + // Be sure the key is of acceptable length for the mcrypt algorithm used - self::$internal_cache_key = substr(self::$internal_cache_key, 0, 24); + Kohana::$internal_cache_key = substr(Kohana::$internal_cache_key, 0, 24); } - + // Set the directory to be used for the internal cache - if ( ! self::$internal_cache_path = self::config('core.internal_cache_path')) + if ( ! Kohana::$internal_cache_path = Kohana::config('core.internal_cache_path')) { - self::$internal_cache_path = APPPATH.'cache/'; + Kohana::$internal_cache_path = APPPATH.'cache/'; } // Load cached configuration and language files - self::$internal_cache['configuration'] = self::cache('configuration', self::$cache_lifetime); - self::$internal_cache['language'] = self::cache('language', self::$cache_lifetime); + Kohana::$internal_cache['configuration'] = Kohana::cache('configuration', Kohana::$cache_lifetime); + Kohana::$internal_cache['language'] = Kohana::cache('language', Kohana::$cache_lifetime); // Load cached file paths - self::$internal_cache['find_file_paths'] = self::cache('find_file_paths', self::$cache_lifetime); + Kohana::$internal_cache['find_file_paths'] = Kohana::cache('find_file_paths', Kohana::$cache_lifetime); // Enable cache saving - Event::add('system.shutdown', array(__CLASS__, 'internal_cache_save')); - } - - // Disable notices and "strict" errors - $ER = error_reporting(~E_NOTICE & ~E_STRICT); - - // Set the user agent - self::$user_agent = ( ! empty($_SERVER['HTTP_USER_AGENT']) ? trim($_SERVER['HTTP_USER_AGENT']) : ''); - - if (function_exists('date_default_timezone_set')) - { - $timezone = self::config('locale.timezone'); - - // Set default timezone, due to increased validation of date settings - // which cause massive amounts of E_NOTICEs to be generated in PHP 5.2+ - date_default_timezone_set(empty($timezone) ? date_default_timezone_get() : $timezone); + Event::add('system.shutdown', array('Kohana', 'internal_cache_save')); } - // Restore error reporting - error_reporting($ER); - // Start output buffering - ob_start(array(__CLASS__, 'output_buffer')); + ob_start(array('Kohana', 'output_buffer')); // Save buffering level - self::$buffer_level = ob_get_level(); + Kohana::$buffer_level = ob_get_level(); // Set autoloader spl_autoload_register(array('Kohana', 'auto_load')); - // Set error handler - set_error_handler(array('Kohana', 'exception_handler')); - - // Set exception handler - set_exception_handler(array('Kohana', 'exception_handler')); + // Register a shutdown function to handle system.shutdown events + register_shutdown_function(array('Kohana', 'shutdown')); // Send default text/html UTF-8 header - header('Content-Type: text/html; charset=UTF-8'); + header('Content-Type: text/html; charset='.Kohana::CHARSET); + + // Load i18n + new I18n; + + // Enable exception handling + Kohana_Exception::enable(); + + // Enable error handling + Kohana_PHP_Exception::enable(); // Load locales - $locales = self::config('locale.language'); + $locales = Kohana::config('locale.language'); - // Make first locale UTF-8 - $locales[0] .= '.UTF-8'; + // Make first locale the defined Kohana charset + $locales[0] .= '.'.Kohana::CHARSET; // Set locale information - self::$locale = setlocale(LC_ALL, $locales); + Kohana::$locale = setlocale(LC_ALL, $locales); - if (self::$configuration['core']['log_threshold'] > 0) - { - // Set the log directory - self::log_directory(self::$configuration['core']['log_directory']); + // Default to the default locale when none of the user defined ones where accepted + Kohana::$locale = ! Kohana::$locale ? Kohana::LOCALE.'.'.Kohana::CHARSET : Kohana::$locale; - // Enable log writing at shutdown - register_shutdown_function(array(__CLASS__, 'log_save')); - } + // Set locale for the I18n system + I18n::set_locale(Kohana::$locale); + + // Set and validate the timezone + date_default_timezone_set(Kohana::config('locale.timezone')); // Enable Kohana routing Event::add('system.routing', array('Router', 'find_uri')); @@ -183,15 +170,12 @@ final class Kohana { Event::add('system.execute', array('Kohana', 'instance')); // Enable Kohana 404 pages - Event::add('system.404', array('Kohana', 'show_404')); - - // Enable Kohana output handling - Event::add('system.shutdown', array('Kohana', 'shutdown')); + Event::add('system.404', array('Kohana_404_Exception', 'trigger')); - if (self::config('core.enable_hooks') === TRUE) + if (Kohana::config('core.enable_hooks') === TRUE) { // Find all the hook files - $hooks = self::list_files('hooks', TRUE); + $hooks = Kohana::list_files('hooks', TRUE); foreach ($hooks as $file) { @@ -200,13 +184,38 @@ final class Kohana { } } - // Setup is complete, prevent it from being run again - $run = TRUE; - // Stop the environment setup routine Benchmark::stop(SYSTEM_BENCHMARK.'_environment_setup'); } + /** + * Cleans up the PHP environment. Disables error/exception handling and the + * auto-loading method and closes the output buffer. + * + * This method does not need to be called during normal system execution, + * however in some advanced situations it can be helpful. @see #1781 + * + * @return void + */ + public static function cleanup() + { + static $run; + + // Only run this function once + if ($run === TRUE) + return; + + $run = TRUE; + + Kohana_Exception::disable(); + + Kohana_PHP_Exception::disable(); + + spl_autoload_unregister(array('Kohana', 'auto_load')); + + Kohana::close_buffers(); + } + /** * Loads the controller and initializes it. Runs the pre_controller, * post_controller_constructor, and post_controller events. Triggers @@ -218,12 +227,12 @@ final class Kohana { */ public static function & instance() { - if (self::$instance === NULL) + if (Kohana::$instance === NULL) { Benchmark::start(SYSTEM_BENCHMARK.'_controller_setup'); // Include the Controller file - require Router::$controller_path; + require_once Router::$controller_path; try { @@ -297,7 +306,7 @@ final class Kohana { Benchmark::stop(SYSTEM_BENCHMARK.'_controller_execution'); } - return self::$instance; + return Kohana::$instance; } /** @@ -312,279 +321,44 @@ final class Kohana { if ($process === TRUE) { // Add APPPATH as the first path - self::$include_paths = array(APPPATH); + Kohana::$include_paths = array(APPPATH); - foreach (self::$configuration['core']['modules'] as $path) + foreach (Kohana::config('core.modules') as $path) { if ($path = str_replace('\\', '/', realpath($path))) { // Add a valid path - self::$include_paths[] = $path.'/'; + Kohana::$include_paths[] = $path.'/'; } } // Add SYSPATH as the last path - self::$include_paths[] = SYSPATH; - - // Local fix for Kohana Ticket:2276 - self::$internal_cache['find_file_paths'] = array(); - if ( ! isset(self::$write_cache['find_file_paths'])) - { - // Write cache at shutdown - self::$write_cache['find_file_paths'] = TRUE; - } - } - - return self::$include_paths; - } - - /** - * Get a config item or group. - * - * @param string item name - * @param boolean force a forward slash (/) at the end of the item - * @param boolean is the item required? - * @return mixed - */ - public static function config($key, $slash = FALSE, $required = TRUE) - { - if (self::$configuration === NULL) - { - // Load core configuration - self::$configuration['core'] = self::config_load('core'); - - // Re-parse the include paths - self::include_paths(TRUE); - } - - // Get the group name from the key - $group = explode('.', $key, 2); - $group = $group[0]; + Kohana::$include_paths[] = SYSPATH; - if ( ! isset(self::$configuration[$group])) - { - // Load the configuration group - self::$configuration[$group] = self::config_load($group, $required); - } - - // Get the value of the key string - $value = self::key_string(self::$configuration, $key); - - if ($slash === TRUE AND is_string($value) AND $value !== '') - { - // Force the value to end with "/" - $value = rtrim($value, '/').'/'; - } - - return $value; - } - - /** - * Sets a configuration item, if allowed. - * - * @param string config key string - * @param string config value - * @return boolean - */ - public static function config_set($key, $value) - { - // Do this to make sure that the config array is already loaded - self::config($key); - - if (substr($key, 0, 7) === 'routes.') - { - // Routes cannot contain sub keys due to possible dots in regex - $keys = explode('.', $key, 2); - } - else - { - // Convert dot-noted key string to an array - $keys = explode('.', $key); - } - - // Used for recursion - $conf =& self::$configuration; - $last = count($keys) - 1; - - foreach ($keys as $i => $k) - { - if ($i === $last) + // Clear cached include paths + self::$internal_cache['find_file_paths'] = array(); + if ( ! isset(self::$write_cache['find_file_paths'])) { - $conf[$k] = $value; + // Write cache at shutdown + self::$write_cache['find_file_paths'] = TRUE; } - else - { - $conf =& $conf[$k]; - } - } - if ($key === 'core.modules') - { - // Reprocess the include paths - self::include_paths(TRUE); } - return TRUE; + return Kohana::$include_paths; } /** - * Load a config file. + * Get a config item or group proxies Kohana_Config. * - * @param string config filename, without extension - * @param boolean is the file required? - * @return array - */ - public static function config_load($name, $required = TRUE) - { - if ($name === 'core') - { - // Load the application configuration file - require APPPATH.'config/config'.EXT; - - if ( ! isset($config['site_domain'])) - { - // Invalid config file - die('Your Kohana application configuration file is not valid.'); - } - - return $config; - } - - if (isset(self::$internal_cache['configuration'][$name])) - return self::$internal_cache['configuration'][$name]; - - // Load matching configs - $configuration = array(); - - if ($files = self::find_file('config', $name, $required)) - { - foreach ($files as $file) - { - require $file; - - if (isset($config) AND is_array($config)) - { - // Merge in configuration - $configuration = array_merge($configuration, $config); - } - } - } - - if ( ! isset(self::$write_cache['configuration'])) - { - // Cache has changed - self::$write_cache['configuration'] = TRUE; - } - - return self::$internal_cache['configuration'][$name] = $configuration; - } - - /** - * Clears a config group from the cached configuration. - * - * @param string config group - * @return void - */ - public static function config_clear($group) - { - // Remove the group from config - unset(self::$configuration[$group], self::$internal_cache['configuration'][$group]); - - if ( ! isset(self::$write_cache['configuration'])) - { - // Cache has changed - self::$write_cache['configuration'] = TRUE; - } - } - - /** - * Add a new message to the log. - * - * @param string type of message - * @param string message text - * @return void - */ - public static function log($type, $message) - { - if (self::$log_levels[$type] <= self::$configuration['core']['log_threshold']) - { - $message = array(date('Y-m-d H:i:s P'), $type, $message); - - // Run the system.log event - Event::run('system.log', $message); - - self::$log[] = $message; - } - } - - /** - * Save all currently logged messages. - * - * @return void - */ - public static function log_save() - { - if (empty(self::$log) OR self::$configuration['core']['log_threshold'] < 1) - return; - - // Filename of the log - $filename = self::log_directory().date('Y-m-d').'.log'.EXT; - - if ( ! is_file($filename)) - { - // Write the SYSPATH checking header - file_put_contents($filename, - ''.PHP_EOL.PHP_EOL); - - // Prevent external writes - chmod($filename, 0644); - } - - // Messages to write - $messages = array(); - - do - { - // Load the next mess - list ($date, $type, $text) = array_shift(self::$log); - - // Add a new message line - $messages[] = $date.' --- '.$type.': '.$text; - } - while ( ! empty(self::$log)); - - // Write messages to log file - file_put_contents($filename, implode(PHP_EOL, $messages).PHP_EOL, FILE_APPEND); - } - - /** - * Get or set the logging directory. - * - * @param string new log directory - * @return string + * @param string item name + * @param boolean force a forward slash (/) at the end of the item + * @param boolean is the item required? + * @return mixed */ - public static function log_directory($dir = NULL) + public static function config($key, $slash = FALSE, $required = FALSE) { - static $directory; - - if ( ! empty($dir)) - { - // Get the directory path - $dir = realpath($dir); - - if (is_dir($dir) AND is_writable($dir)) - { - // Change the log directory - $directory = str_replace('\\', '/', $dir).'/'; - } - else - { - // Log directory is invalid - throw new Kohana_Exception('core.log_dir_unwritable', $dir); - } - } - - return $directory; + return Kohana_Config::instance()->get($key,$slash,$required); } /** @@ -599,7 +373,7 @@ final class Kohana { { if ($lifetime > 0) { - $path = self::$internal_cache_path.'kohana_'.$name; + $path = Kohana::$internal_cache_path.'kohana_'.$name; if (is_file($path)) { @@ -607,17 +381,17 @@ final class Kohana { if ((time() - filemtime($path)) < $lifetime) { // Cache is valid! Now, do we need to decrypt it? - if(self::$internal_cache_encrypt===TRUE) + if(Kohana::$internal_cache_encrypt===TRUE) { $data = file_get_contents($path); - + $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); - - $decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, self::$internal_cache_key, $data, MCRYPT_MODE_ECB, $iv); - + + $decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, Kohana::$internal_cache_key, $data, MCRYPT_MODE_ECB, $iv); + $cache = unserialize($decrypted_text); - + // If the key changed, delete the cache file if(!$cache) unlink($path); @@ -656,7 +430,7 @@ final class Kohana { if ($lifetime < 1) return FALSE; - $path = self::$internal_cache_path.'kohana_'.$name; + $path = Kohana::$internal_cache_path.'kohana_'.$name; if ($data === NULL) { @@ -666,15 +440,15 @@ final class Kohana { else { // Using encryption? Encrypt the data when we write it - if(self::$internal_cache_encrypt===TRUE) + if(Kohana::$internal_cache_encrypt===TRUE) { // Encrypt and write data to cache file $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB); $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND); - + // Serialize and encrypt! - $encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, self::$internal_cache_key, serialize($data), MCRYPT_MODE_ECB, $iv); - + $encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, Kohana::$internal_cache_key, serialize($data), MCRYPT_MODE_ECB, $iv); + return (bool) file_put_contents($path, $encrypted_text); } else @@ -699,15 +473,16 @@ final class Kohana { // Run the send_headers event Event::run('system.send_headers'); } - - self::$output = $output; - + + // Set final output + Kohana::$output = $output; + // Set and return the final output - return self::$output; + return Kohana::$output; } /** - * Closes all open output buffers, either by flushing or cleaning, and stores the Kohana + * Closes all open output buffers, either by flushing or cleaning, and stores * output buffer for display during shutdown. * * @param boolean disable to clear buffers, rather than flushing @@ -715,12 +490,12 @@ final class Kohana { */ public static function close_buffers($flush = TRUE) { - if (ob_get_level() >= self::$buffer_level) + if (ob_get_level() >= Kohana::$buffer_level) { // Set the close function $close = ($flush === TRUE) ? 'ob_end_flush' : 'ob_end_clean'; - while (ob_get_level() > self::$buffer_level) + while (ob_get_level() > Kohana::$buffer_level) { // Flush or clean the buffer $close(); @@ -738,14 +513,25 @@ final class Kohana { */ public static function shutdown() { + static $run; + + // Only run this function once + if ($run === TRUE) + return; + + $run = TRUE; + + // Run system.shutdown event + Event::run('system.shutdown'); + // Close output buffers - self::close_buffers(TRUE); + Kohana::close_buffers(TRUE); // Run the output event - Event::run('system.display', self::$output); + Event::run('system.display', Kohana::$output); // Render the final output - self::render(self::$output); + Kohana::render(Kohana::$output); } /** @@ -756,7 +542,7 @@ final class Kohana { */ public static function render($output) { - if (self::config('core.render_stats') === TRUE) + if (Kohana::config('core.render_stats') === TRUE) { // Fetch memory usage in MB $memory = function_exists('memory_get_usage') ? (memory_get_usage() / 1024 / 1024) : 0; @@ -776,8 +562,8 @@ final class Kohana { ), array ( - KOHANA_VERSION, - KOHANA_CODENAME, + KOHANA::VERSION, + KOHANA::CODENAME, $benchmark['time'], number_format($memory, 2).'MB', count(get_included_files()), @@ -786,215 +572,44 @@ final class Kohana { ); } - if ($level = self::config('core.output_compression') AND ini_get('output_handler') !== 'ob_gzhandler' AND (int) ini_get('zlib.output_compression') === 0) + if ($level = Kohana::config('core.output_compression') AND ini_get('output_handler') !== 'ob_gzhandler' AND (int) ini_get('zlib.output_compression') === 0) { - if ($level < 1 OR $level > 9) - { - // Normalize the level to be an integer between 1 and 9. This - // step must be done to prevent gzencode from triggering an error - $level = max(1, min($level, 9)); - } - - if (stripos(@$_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE) + if ($compress = request::preferred_encoding(array('gzip','deflate'), TRUE)) { - $compress = 'gzip'; - } - elseif (stripos(@$_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') !== FALSE) - { - $compress = 'deflate'; - } - } + if ($level < 1 OR $level > 9) + { + // Normalize the level to be an integer between 1 and 9. This + // step must be done to prevent gzencode from triggering an error + $level = max(1, min($level, 9)); + } - if (isset($compress) AND $level > 0) - { - switch ($compress) - { - case 'gzip': + if ($compress === 'gzip') + { // Compress output using gzip $output = gzencode($output, $level); - break; - case 'deflate': + } + elseif ($compress === 'deflate') + { // Compress output using zlib (HTTP deflate) $output = gzdeflate($output, $level); - break; - } - - // This header must be sent with compressed content to prevent - // browser caches from breaking - header('Vary: Accept-Encoding'); - - // Send the content encoding header - header('Content-Encoding: '.$compress); + } - // Sending Content-Length in CGI can result in unexpected behavior - if (stripos(PHP_SAPI, 'cgi') === FALSE) - { - header('Content-Length: '.strlen($output)); - } - } + // This header must be sent with compressed content to prevent + // browser caches from breaking + header('Vary: Accept-Encoding'); - echo $output; - } + // Send the content encoding header + header('Content-Encoding: '.$compress); - /** - * Displays a 404 page. - * - * @throws Kohana_404_Exception - * @param string URI of page - * @param string custom template - * @return void - */ - public static function show_404($page = FALSE, $template = FALSE) - { - throw new Kohana_404_Exception($page, $template); - } - - /** - * Dual-purpose PHP error and exception handler. Uses the kohana_error_page - * view to display the message. - * - * @param integer|object exception object or error code - * @param string error message - * @param string filename - * @param integer line number - * @return void - */ - public static function exception_handler($exception, $message = NULL, $file = NULL, $line = NULL) - { - try - { - // PHP errors have 5 args, always - $PHP_ERROR = (func_num_args() === 5); - - // Test to see if errors should be displayed - if ($PHP_ERROR AND (error_reporting() & $exception) === 0) - return; - - // This is useful for hooks to determine if a page has an error - self::$has_error = TRUE; - - // Error handling will use exactly 5 args, every time - if ($PHP_ERROR) - { - $code = $exception; - $type = 'PHP Error'; - $template = 'kohana_error_page'; - } - else - { - $code = $exception->getCode(); - $type = get_class($exception); - $message = $exception->getMessage(); - $file = $exception->getFile(); - $line = $exception->getLine(); - $template = ($exception instanceof Kohana_Exception) ? $exception->getTemplate() : 'kohana_error_page'; - } - - if (is_numeric($code)) - { - $codes = self::lang('errors'); - - if ( ! empty($codes[$code])) - { - list($level, $error, $description) = $codes[$code]; - } - else - { - $level = 1; - $error = $PHP_ERROR ? 'Unknown Error' : get_class($exception); - $description = ''; - } - } - else - { - // Custom error message, this will never be logged - $level = 5; - $error = $code; - $description = ''; - } - - // Remove the DOCROOT from the path, as a security precaution - $file = str_replace('\\', '/', realpath($file)); - $file = preg_replace('|^'.preg_quote(DOCROOT).'|', '', $file); - - if ($level <= self::$configuration['core']['log_threshold']) - { - // Log the error - self::log('error', self::lang('core.uncaught_exception', $type, $message, $file, $line)); - } - - if ($PHP_ERROR) - { - $description = self::lang('errors.'.E_RECOVERABLE_ERROR); - $description = is_array($description) ? $description[2] : ''; - - if ( ! headers_sent()) + // Sending Content-Length in CGI can result in unexpected behavior + if (stripos(PHP_SAPI, 'cgi') === FALSE) { - // Send the 500 header - header('HTTP/1.1 500 Internal Server Error'); + header('Content-Length: '.strlen($output)); } } - else - { - if (method_exists($exception, 'sendHeaders') AND ! headers_sent()) - { - // Send the headers if they have not already been sent - $exception->sendHeaders(); - } - } - - // Close all output buffers except for Kohana - while (ob_get_level() > self::$buffer_level) - { - ob_end_clean(); - } - - // Test if display_errors is on - if (self::$configuration['core']['display_errors'] === TRUE) - { - if ( ! IN_PRODUCTION AND $line != FALSE) - { - // Remove the first entry of debug_backtrace(), it is the exception_handler call - $trace = $PHP_ERROR ? array_slice(debug_backtrace(), 1) : $exception->getTrace(); - - // Beautify backtrace - $trace = self::backtrace($trace); - } - - // Load the error - require self::find_file('views', empty($template) ? 'kohana_error_page' : $template); - } - else - { - // Get the i18n messages - $error = self::lang('core.generic_error'); - $message = self::lang('core.errors_disabled', url::site(), url::site(Router::$current_uri)); - - // Load the errors_disabled view - require self::find_file('views', 'kohana_error_disabled'); - } - - if ( ! Event::has_run('system.shutdown')) - { - // Run the shutdown even to ensure a clean exit - Event::run('system.shutdown'); - } - - // Turn off error reporting - error_reporting(0); - exit; - } - catch (Exception $e) - { - if (IN_PRODUCTION) - { - die('Fatal Error'); - } - else - { - die('Fatal Error: '.$e->getMessage().' File: '.$e->getFile().' Line: '.$e->getLine()); - } } + + echo $output; } /** @@ -1006,7 +621,7 @@ final class Kohana { */ public static function auto_load($class) { - if (class_exists($class, FALSE)) + if (class_exists($class, FALSE) OR interface_exists($class, FALSE)) return TRUE; if (($suffix = strrpos($class, '_')) > 0) @@ -1051,7 +666,7 @@ final class Kohana { $file = $class; } - if ($filename = self::find_file($type, $file)) + if ($filename = Kohana::find_file($type, $file)) { // Load the class require $filename; @@ -1062,7 +677,7 @@ final class Kohana { return FALSE; } - if ($filename = self::find_file($type, self::$configuration['core']['extension_prefix'].$class)) + if ($filename = Kohana::find_file($type, Kohana::config('core.extension_prefix').$class)) { // Load the class extension require $filename; @@ -1121,16 +736,16 @@ final class Kohana { // Search path $search = $directory.'/'.$filename.$ext; - if (isset(self::$internal_cache['find_file_paths'][$search])) - return self::$internal_cache['find_file_paths'][$search]; + if (isset(Kohana::$internal_cache['find_file_paths'][$search])) + return Kohana::$internal_cache['find_file_paths'][$search]; // Load include paths - $paths = self::$include_paths; + $paths = Kohana::$include_paths; // Nothing found, yet $found = NULL; - if ($directory === 'config' OR $directory === 'i18n') + if ($directory === 'config' OR $directory === 'messages' OR $directory === 'i18n') { // Search in reverse, for merging $paths = array_reverse($paths); @@ -1167,7 +782,7 @@ final class Kohana { $directory = 'core.'.inflector::singular($directory); // If the file is required, throw an exception - throw new Kohana_Exception('core.resource_not_found', self::lang($directory), $filename); + throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => Kohana::message($directory), ':file:' =>$filename)); } else { @@ -1176,13 +791,13 @@ final class Kohana { } } - if ( ! isset(self::$write_cache['find_file_paths'])) + if ( ! isset(Kohana::$write_cache['find_file_paths'])) { // Write cache at shutdown - self::$write_cache['find_file_paths'] = TRUE; + Kohana::$write_cache['find_file_paths'] = TRUE; } - return self::$internal_cache['find_file_paths'][$search] = $found; + return Kohana::$internal_cache['find_file_paths'][$search] = $found; } /** @@ -1190,45 +805,54 @@ final class Kohana { * * @param string directory to search * @param boolean list all files to the maximum depth? + * @param string list all files having extension $ext * @param string full path to search (used for recursion, *never* set this manually) * @return array filenames and directories */ - public static function list_files($directory, $recursive = FALSE, $path = FALSE) + public static function list_files($directory, $recursive = FALSE, $ext = EXT, $path = FALSE) { $files = array(); if ($path === FALSE) { - $paths = array_reverse(self::include_paths()); + $paths = array_reverse(Kohana::include_paths()); foreach ($paths as $path) { // Recursively get and merge all files - $files = array_merge($files, self::list_files($directory, $recursive, $path.$directory)); + $files = array_merge($files, Kohana::list_files($directory, $recursive, $ext, $path.$directory)); } } else { $path = rtrim($path, '/').'/'; - if (is_readable($path)) + if (is_readable($path) AND $items = glob($path.'*')) { - $items = (array) glob($path.'*'); + $ext_pos = 0 - strlen($ext); - if ( ! empty($items)) + foreach ($items as $index => $item) { - foreach ($items as $index => $item) - { - $files[] = $item = str_replace('\\', '/', $item); + $item = str_replace('\\', '/', $item); + if (is_dir($item)) + { // Handle recursion - if (is_dir($item) AND $recursive == TRUE) + if ($recursive === TRUE) { // Filename should only be the basename $item = pathinfo($item, PATHINFO_BASENAME); // Append sub-directory search - $files = array_merge($files, self::list_files($directory, TRUE, $path.$item)); + $files = array_merge($files, Kohana::list_files($directory, TRUE, $ext, $path.$item)); + } + } + else + { + // File extension must match + if ($ext_pos === 0 OR substr($item, $ext_pos) === $ext) + { + $files[] = $item; } } } @@ -1238,59 +862,48 @@ final class Kohana { return $files; } + /** - * Fetch an i18n language item. + * Fetch a message item. * * @param string language key to fetch * @param array additional information to insert into the line * @return string i18n language string, or the requested key if the i18n item is not found */ - public static function lang($key, $args = array()) + public static function message($key, $args = array()) { // Extract the main group from the key $group = explode('.', $key, 2); $group = $group[0]; // Get locale name - $locale = self::config('locale.language.0'); + $locale = Kohana::config('locale.language.0'); - if ( ! isset(self::$internal_cache['language'][$locale][$group])) + if ( ! isset(Kohana::$internal_cache['messages'][$group])) { // Messages for this group $messages = array(); - if ($files = self::find_file('i18n', $locale.'/'.$group)) + if ($file = Kohana::find_file('messages', $group)) { - foreach ($files as $file) - { - include $file; - - // Merge in configuration - if ( ! empty($lang) AND is_array($lang)) - { - foreach ($lang as $k => $v) - { - $messages[$k] = $v; - } - } - } + include $file[0]; } - if ( ! isset(self::$write_cache['language'])) + if ( ! isset(Kohana::$write_cache['messages'])) { // Write language cache - self::$write_cache['language'] = TRUE; + Kohana::$write_cache['messages'] = TRUE; } - self::$internal_cache['language'][$locale][$group] = $messages; + Kohana::$internal_cache['messages'][$group] = $messages; } // Get the line from cache - $line = self::key_string(self::$internal_cache['language'][$locale], $key); + $line = Kohana::key_string(Kohana::$internal_cache['messages'], $key); if ($line === NULL) { - self::log('error', 'Missing i18n entry '.$key.' for language '.$locale); + Kohana_Log::add('error', 'Missing messages entry '.$key.' for message '.$group); // Return the key string as fallback return $key; @@ -1426,121 +1039,6 @@ final class Kohana { } } - /** - * Retrieves current user agent information: - * keys: browser, version, platform, mobile, robot, referrer, languages, charsets - * tests: is_browser, is_mobile, is_robot, accept_lang, accept_charset - * - * @param string key or test name - * @param string used with "accept" tests: user_agent(accept_lang, en) - * @return array languages and charsets - * @return string all other keys - * @return boolean all tests - */ - public static function user_agent($key = 'agent', $compare = NULL) - { - static $info; - - // Return the raw string - if ($key === 'agent') - return self::$user_agent; - - if ($info === NULL) - { - // Parse the user agent and extract basic information - $agents = self::config('user_agents'); - - foreach ($agents as $type => $data) - { - foreach ($data as $agent => $name) - { - if (stripos(self::$user_agent, $agent) !== FALSE) - { - if ($type === 'browser' AND preg_match('|'.preg_quote($agent).'[^0-9.]*+([0-9.][0-9.a-z]*)|i', self::$user_agent, $match)) - { - // Set the browser version - $info['version'] = $match[1]; - } - - // Set the agent name - $info[$type] = $name; - break; - } - } - } - } - - if (empty($info[$key])) - { - switch ($key) - { - case 'is_robot': - case 'is_browser': - case 'is_mobile': - // A boolean result - $return = ! empty($info[substr($key, 3)]); - break; - case 'languages': - $return = array(); - if ( ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) - { - if (preg_match_all('/[-a-z]{2,}/', strtolower(trim($_SERVER['HTTP_ACCEPT_LANGUAGE'])), $matches)) - { - // Found a result - $return = $matches[0]; - } - } - break; - case 'charsets': - $return = array(); - if ( ! empty($_SERVER['HTTP_ACCEPT_CHARSET'])) - { - if (preg_match_all('/[-a-z0-9]{2,}/', strtolower(trim($_SERVER['HTTP_ACCEPT_CHARSET'])), $matches)) - { - // Found a result - $return = $matches[0]; - } - } - break; - case 'referrer': - if ( ! empty($_SERVER['HTTP_REFERER'])) - { - // Found a result - $return = trim($_SERVER['HTTP_REFERER']); - } - break; - } - - // Cache the return value - isset($return) and $info[$key] = $return; - } - - if ( ! empty($compare)) - { - // The comparison must always be lowercase - $compare = strtolower($compare); - - switch ($key) - { - case 'accept_lang': - // Check if the lange is accepted - return in_array($compare, self::user_agent('languages')); - break; - case 'accept_charset': - // Check if the charset is accepted - return in_array($compare, self::user_agent('charsets')); - break; - default: - // Invalid comparison - return FALSE; - break; - } - } - - // Return the key, if set - return isset($info[$key]) ? $info[$key] : NULL; - } - /** * Quick debugging of any variable. Any number of parameters can be set. * @@ -1557,76 +1055,13 @@ final class Kohana { foreach ($params as $var) { - $output[] = '
('.gettype($var).') '.html::specialchars(print_r($var, TRUE)).'
'; + $value = is_bool($var) ? ($var ? 'true' : 'false') : print_r($var, TRUE); + $output[] = '
('.gettype($var).') '.htmlspecialchars($value, ENT_QUOTES, Kohana::CHARSET).'
'; } return implode("\n", $output); } - /** - * Displays nice backtrace information. - * @see http://php.net/debug_backtrace - * - * @param array backtrace generated by an exception or debug_backtrace - * @return string - */ - public static function backtrace($trace) - { - if ( ! is_array($trace)) - return; - - // Final output - $output = array(); - - foreach ($trace as $entry) - { - $temp = '
  • '; - - if (isset($entry['file'])) - { - $temp .= self::lang('core.error_file_line', preg_replace('!^'.preg_quote(DOCROOT).'!', '', $entry['file']), $entry['line']); - } - - $temp .= '
    ';
-
-			if (isset($entry['class']))
-			{
-				// Add class and call type
-				$temp .= $entry['class'].$entry['type'];
-			}
-
-			// Add function
-			$temp .= $entry['function'].'( ';
-
-			// Add function args
-			if (isset($entry['args']) AND is_array($entry['args']))
-			{
-				// Separator starts as nothing
-				$sep = '';
-
-				while ($arg = array_shift($entry['args']))
-				{
-					if (is_string($arg) AND is_file($arg))
-					{
-						// Remove docroot from filename
-						$arg = preg_replace('!^'.preg_quote(DOCROOT).'!', '', $arg);
-					}
-
-					$temp .= $sep.html::specialchars(print_r($arg, TRUE));
-
-					// Change separator to a comma
-					$sep = ', ';
-				}
-			}
-
-			$temp .= ' )
    • '; - - $output[] = $temp; - } - - return ''; - } - /** * Saves the internal caches: configuration, include paths, etc. * @@ -1634,21 +1069,21 @@ final class Kohana { */ public static function internal_cache_save() { - if ( ! is_array(self::$write_cache)) + if ( ! is_array(Kohana::$write_cache)) return FALSE; // Get internal cache names - $caches = array_keys(self::$write_cache); + $caches = array_keys(Kohana::$write_cache); // Nothing written $written = FALSE; foreach ($caches as $cache) { - if (isset(self::$internal_cache[$cache])) + if (isset(Kohana::$internal_cache[$cache])) { // Write the cache file - self::cache_save($cache, self::$internal_cache[$cache], self::$configuration['core']['internal_cache']); + Kohana::cache_save($cache, Kohana::$internal_cache[$cache], Kohana::config('core.internal_cache')); // A cache has been written $written = TRUE; @@ -1659,138 +1094,3 @@ final class Kohana { } } // End Kohana - -/** - * Creates a generic i18n exception. - */ -class Kohana_Exception extends Exception { - - // Template file - protected $template = 'kohana_error_page'; - - // Header - protected $header = FALSE; - - // Error code - protected $code = E_KOHANA; - - /** - * Set exception message. - * - * @param string i18n language key for the message - * @param array addition line parameters - */ - public function __construct($error) - { - $args = array_slice(func_get_args(), 1); - - // Fetch the error message - $message = Kohana::lang($error, $args); - - if ($message === $error OR empty($message)) - { - // Unable to locate the message for the error - $message = 'Unknown Exception: '.$error; - } - - // Sets $this->message the proper way - parent::__construct($message); - } - - /** - * Magic method for converting an object to a string. - * - * @return string i18n message - */ - public function __toString() - { - return (string) $this->message; - } - - /** - * Fetch the template name. - * - * @return string - */ - public function getTemplate() - { - return $this->template; - } - - /** - * Sends an Internal Server Error header. - * - * @return void - */ - public function sendHeaders() - { - // Send the 500 header - header('HTTP/1.1 500 Internal Server Error'); - } - -} // End Kohana Exception - -/** - * Creates a custom exception. - */ -class Kohana_User_Exception extends Kohana_Exception { - - /** - * Set exception title and message. - * - * @param string exception title string - * @param string exception message string - * @param string custom error template - */ - public function __construct($title, $message, $template = FALSE) - { - Exception::__construct($message); - - $this->code = $title; - - if ($template !== FALSE) - { - $this->template = $template; - } - } - -} // End Kohana PHP Exception - -/** - * Creates a Page Not Found exception. - */ -class Kohana_404_Exception extends Kohana_Exception { - - protected $code = E_PAGE_NOT_FOUND; - - /** - * Set internal properties. - * - * @param string URL of page - * @param string custom error template - */ - public function __construct($page = FALSE, $template = FALSE) - { - if ($page === FALSE) - { - // Construct the page URI using Router properties - $page = Router::$current_uri.Router::$url_suffix.Router::$query_string; - } - - Exception::__construct(Kohana::lang('core.page_not_found', $page)); - - $this->template = $template; - } - - /** - * Sends "File Not Found" headers, to emulate server behavior. - * - * @return void - */ - public function sendHeaders() - { - // Send the 404 header - header('HTTP/1.1 404 File Not Found'); - } - -} // End Kohana 404 Exception diff --git a/system/core/Kohana_Config.php b/system/core/Kohana_Config.php new file mode 100644 index 00000000..f961f391 --- /dev/null +++ b/system/core/Kohana_Config.php @@ -0,0 +1,331 @@ +array( + ), 'internal_cache'=>FALSE + )); + $core_config = $config->get('core'); + Kohana_Config::$instance = new Kohana_Config($core_config); + } + + // Return the Kohana_Config driver requested + return Kohana_Config::$instance; + } + + /** + * The drivers for this object + * + * @var Kohana_Config_Driver + */ + protected $drivers; + + /** + * Kohana_Config constructor to load the supplied driver. + * Enforces the singleton pattern. + * + * @param string driver + * @access protected + */ + protected function __construct(array $core_config) + { + $drivers = $core_config['config_drivers']; + + //remove array if it's found in config + if (in_array('array', $drivers)) + unset($drivers[array_search('array', $drivers)]); + + //add array at the very end + $this->drivers = $drivers = array_merge($drivers, array( + 'array' + )); + + foreach ($this->drivers as & $driver) + { + // Create the driver name + $driver = 'Config_'.ucfirst($driver).'_Driver'; + + // Ensure the driver loads correctly + if (!Kohana::auto_load($driver)) + throw new Kohana_Exception('The :driver: driver for the :library: library could not be found.', array( + ':driver:' => $driver, ':library:' => get_class($this) + )); + + // Load the new driver + $driver = new $driver($core_config); + + // Ensure the new driver is valid + if (!$driver instanceof Config_Driver) + throw new Kohana_Exception('The :driver: driver for the :library: library must implement the :interface: interface', array( + ':driver:' => $driver, ':library:' => get_class($this), ':interface:' => 'Config_Driver' + )); + } + } + + /** + * Gets a value from the configuration driver + * + * @param string key + * @param bool slash + * @param bool required + * @return mixed + * @access public + */ + public function get($key, $slash = FALSE, $required = FALSE) + { + foreach ($this->drivers as $driver) + { + try + { + return $driver->get($key, $slash, $required); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + } + + /** + * Sets a value to the configuration drivers + * + * @param string key + * @param mixed value + * @return bool + * @access public + */ + public function set($key, $value) + { + foreach ($this->drivers as $driver) + { + try + { + $driver->set($key, $value); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + return TRUE; + } + + /** + * Clears a group from configuration + * + * @param string group + * @return bool + * @access public + */ + public function clear($group) + { + foreach ($this->drivers as $driver) + { + try + { + $driver->clear($group); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + return TRUE; + } + + /** + * Loads a configuration group + * + * @param string group + * @param bool required + * @return array + * @access public + */ + public function load($group, $required = FALSE) + { + foreach ($this->drivers as $driver) + { + try + { + return $driver->load($group, $required); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + } + + /** + * Returns true or false if any config has been loaded(either manually or from cache) + * + * @return boolean + */ + public function loaded() + { + return $this->drivers[(count($this->drivers) - 1)]->loaded; + } + + /** + * The following allows access using + * array syntax. + * + * @example $config['core.site_domain'] + */ + + /** + * Allows access to configuration settings + * using the ArrayAccess interface + * + * @param string key + * @return mixed + * @access public + */ + public function offsetGet($key) + { + foreach ($this->drivers as $driver) + { + try + { + return $driver->get($key); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + } + + /** + * Allows access to configuration settings + * using the ArrayAccess interface + * + * @param string key + * @param mixed value + * @return bool + * @access public + */ + public function offsetSet($key, $value) + { + foreach ($this->drivers as $driver) + { + try + { + $driver->set($key, $value); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + return TRUE; + } + + /** + * Allows access to configuration settings + * using the ArrayAccess interface + * + * @param string key + * @return bool + * @access public + */ + public function offsetExists($key) + { + foreach ($this->drivers as $driver) + { + try + { + return $driver->setting_exists($key); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + } + + /** + * Allows access to configuration settings + * using the ArrayAccess interface + * + * @param string key + * @return bool + * @access public + */ + public function offsetUnset($key) + { + foreach ($this->drivers as $driver) + { + try + { + return $driver->set($key, NULL); + } + catch (Kohana_Config_Exception $e) + { + //if it's the last driver in the list and it threw an exception, re throw it + if ($driver === $this->drivers[(count($this->drivers) - 1)]) + throw $e; + } + } + return TRUE; + } +} // End KohanaConfig + +class Kohana_Config_Exception extends Kohana_Exception {} diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php new file mode 100644 index 00000000..cdb06a62 --- /dev/null +++ b/system/core/Kohana_Exception.php @@ -0,0 +1,619 @@ +instance_identifier = uniqid(); + + // Translate the error message + $message = __($message, $variables); + + // Sets $this->message the proper way + parent::__construct($message, $code); + } + + /** + * Enable Kohana exception handling. + * + * @uses Kohana_Exception::$template + * @return void + */ + public static function enable() + { + if ( ! Kohana_Exception::$enabled) + { + set_exception_handler(array('Kohana_Exception', 'handle')); + + Kohana_Exception::$enabled = TRUE; + } + } + + /** + * Disable Kohana exception handling. + * + * @return void + */ + public static function disable() + { + if (Kohana_Exception::$enabled) + { + restore_exception_handler(); + + Kohana_Exception::$enabled = FALSE; + } + } + + /** + * Get a single line of text representing the exception: + * + * Error [ Code ]: Message ~ File [ Line ] + * + * @param object Exception + * @return string + */ + public static function text($e) + { + return sprintf('%s [ %s ]: %s ~ %s [ %d ]', + get_class($e), $e->getCode(), strip_tags($e->getMessage()), Kohana_Exception::debug_path($e->getFile()), $e->getLine()); + } + + /** + * exception handler, displays the error message, source of the + * exception, and the stack trace of the error. + * + * @uses Kohana::message() + * @uses Kohana_Exception::text() + * @param object exception object + * @return void + */ + public static function handle(Exception $e) + { + try + { + // Get the exception information + $type = get_class($e); + $code = $e->getCode(); + $message = $e->getMessage(); + + // Create a text version of the exception + $error = Kohana_Exception::text($e); + + // Add this exception to the log + Kohana_Log::add('error', $error); + + // Manually save logs after exceptions + Kohana_Log::save(); + + if (Kohana::config('core.display_errors') === FALSE) + { + // Do not show the details + $file = $line = NULL; + $trace = array(); + + $template = '_disabled'; + } + else + { + $file = $e->getFile(); + $line = $e->getLine(); + $trace = $e->getTrace(); + + $template = ''; + } + + if ($e instanceof Kohana_Exception) + { + $template = $e->getTemplate().$template; + + if ( ! headers_sent()) + { + $e->sendHeaders(); + } + + // Use the human-readable error name + $code = Kohana::message('core.errors.'.$code); + } + else + { + $template = Kohana_Exception::$template.$template; + + if ( ! headers_sent()) + { + header('HTTP/1.1 500 Internal Server Error'); + } + + if ($e instanceof ErrorException) + { + // Use the human-readable error name + $code = Kohana::message('core.errors.'.$e->getSeverity()); + + if (version_compare(PHP_VERSION, '5.3', '<')) + { + // Workaround for a bug in ErrorException::getTrace() that exists in + // all PHP 5.2 versions. @see http://bugs.php.net/45895 + for ($i = count($trace) - 1; $i > 0; --$i) + { + if (isset($trace[$i - 1]['args'])) + { + // Re-position the arguments + $trace[$i]['args'] = $trace[$i - 1]['args']; + + unset($trace[$i - 1]['args']); + } + } + } + } + } + + // Clean the output buffer if one exists + ob_get_level() and ob_clean(); + + if ($template = Kohana::find_file('views', $template)) + { + include $template; + } + } + catch (Exception $e) + { + // Clean the output buffer if one exists + ob_get_level() and ob_clean(); + + // Display the exception text + echo Kohana_Exception::text($e), "\n"; + } + + if (PHP_SAPI === 'cli') + { + // Exit with an error status + exit(1); + } + } + + /** + * Returns the template for this exception. + * + * @uses Kohana_Exception::$template + * @return string + */ + public function getTemplate() + { + return Kohana_Exception::$template; + } + + /** + * Sends an Internal Server Error header. + * + * @return void + */ + public function sendHeaders() + { + // Send the 500 header + header('HTTP/1.1 500 Internal Server Error'); + } + + /** + * Returns an HTML string of information about a single variable. + * + * Borrows heavily on concepts from the Debug class of {@link http://nettephp.com/ Nette}. + * + * @param mixed variable to dump + * @param integer maximum length of strings + * @return string + */ + public static function dump($value, $length = 128) + { + return Kohana_Exception::_dump($value, $length); + } + + /** + * Helper for Kohana_Exception::dump(), handles recursion in arrays and objects. + * + * @param mixed variable to dump + * @param integer maximum length of strings + * @param integer recursion level (internal) + * @return string + */ + private static function _dump( & $var, $length = 128, $level = 0) + { + if ($var === NULL) + { + return 'NULL'; + } + elseif (is_bool($var)) + { + return 'bool '.($var ? 'TRUE' : 'FALSE'); + } + elseif (is_float($var)) + { + return 'float '.$var; + } + elseif (is_resource($var)) + { + if (($type = get_resource_type($var)) === 'stream' AND $meta = stream_get_meta_data($var)) + { + $meta = stream_get_meta_data($var); + + if (isset($meta['uri'])) + { + $file = $meta['uri']; + + if (function_exists('stream_is_local')) + { + // Only exists on PHP >= 5.2.4 + if (stream_is_local($file)) + { + $file = Kohana_Exception::debug_path($file); + } + } + + return 'resource('.$type.') '.htmlspecialchars($file, ENT_NOQUOTES, Kohana::CHARSET); + } + } + else + { + return 'resource('.$type.')'; + } + } + elseif (is_string($var)) + { + if (strlen($var) > $length) + { + // Encode the truncated string + $str = htmlspecialchars(substr($var, 0, $length), ENT_NOQUOTES, Kohana::CHARSET).' …'; + } + else + { + // Encode the string + $str = htmlspecialchars($var, ENT_NOQUOTES, Kohana::CHARSET); + } + + return 'string('.strlen($var).') "'.$str.'"'; + } + elseif (is_array($var)) + { + $output = array(); + + // Indentation for this variable + $space = str_repeat($s = ' ', $level); + + static $marker; + + if ($marker === NULL) + { + // Make a unique marker + $marker = uniqid("\x00"); + } + + if (empty($var)) + { + // Do nothing + } + elseif (isset($var[$marker])) + { + $output[] = "(\n$space$s*RECURSION*\n$space)"; + } + elseif ($level < 5) + { + $output[] = "("; + + $var[$marker] = TRUE; + foreach ($var as $key => & $val) + { + if ($key === $marker) continue; + if ( ! is_int($key)) + { + $key = '"'.$key.'"'; + } + + $output[] = "$space$s$key => ".Kohana_Exception::_dump($val, $length, $level + 1); + } + unset($var[$marker]); + + $output[] = "$space)"; + } + else + { + // Depth too great + $output[] = "(\n$space$s...\n$space)"; + } + + return 'array('.count($var).') '.implode("\n", $output); + } + elseif (is_object($var)) + { + // Copy the object as an array + $array = (array) $var; + + $output = array(); + + // Indentation for this variable + $space = str_repeat($s = ' ', $level); + + $hash = spl_object_hash($var); + + // Objects that are being dumped + static $objects = array(); + + if (empty($var)) + { + // Do nothing + } + elseif (isset($objects[$hash])) + { + $output[] = "{\n$space$s*RECURSION*\n$space}"; + } + elseif ($level < 5) + { + $output[] = "{"; + + $objects[$hash] = TRUE; + foreach ($array as $key => & $val) + { + if ($key[0] === "\x00") + { + // Determine if the access is private or protected + $access = ''.($key[1] === '*' ? 'protected' : 'private').''; + + // Remove the access level from the variable name + $key = substr($key, strrpos($key, "\x00") + 1); + } + else + { + $access = 'public'; + } + + $output[] = "$space$s$access $key => ".Kohana_Exception::_dump($val, $length, $level + 1); + } + unset($objects[$hash]); + + $output[] = "$space}"; + } + else + { + // Depth too great + $output[] = "{\n$space$s...\n$space}"; + } + + return 'object '.get_class($var).'('.count($array).') '.implode("\n", $output); + } + else + { + return ''.gettype($var).' '.htmlspecialchars(print_r($var, TRUE), ENT_NOQUOTES, Kohana::CHARSET); + } + } + + /** + * Removes APPPATH, SYSPATH, MODPATH, and DOCROOT from filenames, replacing + * them with the plain text equivalents. + * + * @param string path to sanitize + * @return string + */ + public static function debug_path($file) + { + if (strpos($file, APPPATH) === 0) + { + $file = 'APPPATH/'.substr($file, strlen(APPPATH)); + } + elseif (strpos($file, SYSPATH) === 0) + { + $file = 'SYSPATH/'.substr($file, strlen(SYSPATH)); + } + elseif (strpos($file, MODPATH) === 0) + { + $file = 'MODPATH/'.substr($file, strlen(MODPATH)); + } + elseif (strpos($file, DOCROOT) === 0) + { + $file = 'DOCROOT/'.substr($file, strlen(DOCROOT)); + } + + return $file; + } + + /** + * Returns an array of lines from a file. + * + * // Returns the current line of the current file + * echo Kohana_Exception::debug_source(__FILE__, __LINE__); + * + * @param string file to open + * @param integer line number to find + * @param integer number of padding lines + * @return array + */ + public static function debug_source($file, $line_number, $padding = 5) + { + // Make sure we can read the source file + if ( ! is_readable($file)) + return array(); + + // Open the file and set the line position + $file = fopen($file, 'r'); + $line = 0; + + // Set the reading range + $range = array('start' => $line_number - $padding, 'end' => $line_number + $padding); + + // Set the zero-padding amount for line numbers + $format = '% '.strlen($range['end']).'d'; + + $source = array(); + while (($row = fgets($file)) !== FALSE) + { + // Increment the line number + if (++$line > $range['end']) + break; + + if ($line >= $range['start']) + { + $source[sprintf($format, $line)] = $row; + } + } + + // Close the file + fclose($file); + + return $source; + } + + /** + * Returns an array of strings that represent each step in the backtrace. + * + * @param array trace to analyze + * @return array + */ + public static function trace($trace = NULL) + { + if ($trace === NULL) + { + // Start a new trace + $trace = debug_backtrace(); + } + + // Non-standard function calls + $statements = array('include', 'include_once', 'require', 'require_once'); + + $output = array(); + foreach ($trace as $step) + { + if ( ! isset($step['function'])) + { + // Invalid trace step + continue; + } + + if (isset($step['file']) AND isset($step['line'])) + { + // Include the source of this step + $source = Kohana_Exception::debug_source($step['file'], $step['line']); + } + + if (isset($step['file'])) + { + $file = $step['file']; + + if (isset($step['line'])) + { + $line = $step['line']; + } + } + + // function() + $function = $step['function']; + + if (in_array($step['function'], $statements)) + { + if (empty($step['args'])) + { + // No arguments + $args = array(); + } + else + { + // Sanitize the file path + $args = array($step['args'][0]); + } + } + elseif (isset($step['args'])) + { + if ($step['function'] === '{closure}') + { + // Introspection on closures in a stack trace is impossible + $params = NULL; + } + else + { + if (isset($step['class'])) + { + if (method_exists($step['class'], $step['function'])) + { + $reflection = new ReflectionMethod($step['class'], $step['function']); + } + else + { + $reflection = new ReflectionMethod($step['class'], '__call'); + } + } + else + { + $reflection = new ReflectionFunction($step['function']); + } + + // Get the function parameters + $params = $reflection->getParameters(); + } + + $args = array(); + + foreach ($step['args'] as $i => $arg) + { + if (isset($params[$i])) + { + // Assign the argument by the parameter name + $args[$params[$i]->name] = $arg; + } + else + { + // Assign the argument by number + $args[$i] = $arg; + } + } + } + + if (isset($step['class'])) + { + // Class->method() or Class::method() + $function = $step['class'].$step['type'].$step['function']; + } + + $output[] = array( + 'function' => $function, + 'args' => isset($args) ? $args : NULL, + 'file' => isset($file) ? $file : NULL, + 'line' => isset($line) ? $line : NULL, + 'source' => isset($source) ? $source : NULL, + ); + + unset($function, $args, $file, $line, $source); + } + + return $output; + } + +} // End Kohana Exception diff --git a/system/core/utf8.php b/system/core/utf8.php deleted file mode 100644 index 9f20f421..00000000 --- a/system/core/utf8.php +++ /dev/null @@ -1,743 +0,0 @@ -PCRE has not been compiled with UTF-8 support. '. - 'See PCRE Pattern Modifiers '. - 'for more information. This application cannot be run without UTF-8 support.', - E_USER_ERROR - ); -} - -if ( ! extension_loaded('iconv')) -{ - trigger_error - ( - 'The iconv extension is not loaded. '. - 'Without iconv, strings cannot be properly translated to UTF-8 from user input. '. - 'This application cannot be run without UTF-8 support.', - E_USER_ERROR - ); -} - -if (extension_loaded('mbstring') AND (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING)) -{ - trigger_error - ( - 'The mbstring extension is overloading PHP\'s native string functions. '. - 'Disable this by setting mbstring.func_overload to 0, 1, 4 or 5 in php.ini or a .htaccess file.'. - 'This application cannot be run without UTF-8 support.', - E_USER_ERROR - ); -} - -// Check PCRE support for Unicode properties such as \p and \X. -$ER = error_reporting(0); -define('PCRE_UNICODE_PROPERTIES', (bool) preg_match('/^\pL$/u', 'ñ')); -error_reporting($ER); - -// SERVER_UTF8 ? use mb_* functions : use non-native functions -if (extension_loaded('mbstring')) -{ - mb_internal_encoding('UTF-8'); - define('SERVER_UTF8', TRUE); -} -else -{ - define('SERVER_UTF8', FALSE); -} - -// Convert all global variables to UTF-8. -$_GET = utf8::clean($_GET); -$_POST = utf8::clean($_POST); -$_COOKIE = utf8::clean($_COOKIE); -$_SERVER = utf8::clean($_SERVER); - -if (PHP_SAPI == 'cli') -{ - // Convert command line arguments - $_SERVER['argv'] = utf8::clean($_SERVER['argv']); -} - -final class utf8 { - - // Called methods - static $called = array(); - - /** - * Recursively cleans arrays, objects, and strings. Removes ASCII control - * codes and converts to UTF-8 while silently discarding incompatible - * UTF-8 characters. - * - * @param string string to clean - * @return string - */ - public static function clean($str) - { - if (is_array($str) OR is_object($str)) - { - foreach ($str as $key => $val) - { - // Recursion! - $str[self::clean($key)] = self::clean($val); - } - } - elseif (is_string($str) AND $str !== '') - { - // Remove control characters - $str = self::strip_ascii_ctrl($str); - - if ( ! self::is_ascii($str)) - { - // Disable notices - $ER = error_reporting(~E_NOTICE); - - // iconv is expensive, so it is only used when needed - $str = iconv('UTF-8', 'UTF-8//IGNORE', $str); - - // Turn notices back on - error_reporting($ER); - } - } - - return $str; - } - - /** - * Tests whether a string contains only 7bit ASCII bytes. This is used to - * determine when to use native functions or UTF-8 functions. - * - * @param string string to check - * @return bool - */ - public static function is_ascii($str) - { - return ! preg_match('/[^\x00-\x7F]/S', $str); - } - - /** - * Strips out device control codes in the ASCII range. - * - * @param string string to clean - * @return string - */ - public static function strip_ascii_ctrl($str) - { - return preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S', '', $str); - } - - /** - * Strips out all non-7bit ASCII bytes. - * - * @param string string to clean - * @return string - */ - public static function strip_non_ascii($str) - { - return preg_replace('/[^\x00-\x7F]+/S', '', $str); - } - - /** - * Replaces special/accented UTF-8 characters by ASCII-7 'equivalents'. - * - * @author Andreas Gohr - * - * @param string string to transliterate - * @param integer -1 lowercase only, +1 uppercase only, 0 both cases - * @return string - */ - public static function transliterate_to_ascii($str, $case = 0) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _transliterate_to_ascii($str, $case); - } - - /** - * Returns the length of the given string. - * @see http://php.net/strlen - * - * @param string string being measured for length - * @return integer - */ - public static function strlen($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strlen($str); - } - - /** - * Finds position of first occurrence of a UTF-8 string. - * @see http://php.net/strlen - * - * @author Harry Fuecks - * - * @param string haystack - * @param string needle - * @param integer offset from which character in haystack to start searching - * @return integer position of needle - * @return boolean FALSE if the needle is not found - */ - public static function strpos($str, $search, $offset = 0) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strpos($str, $search, $offset); - } - - /** - * Finds position of last occurrence of a char in a UTF-8 string. - * @see http://php.net/strrpos - * - * @author Harry Fuecks - * - * @param string haystack - * @param string needle - * @param integer offset from which character in haystack to start searching - * @return integer position of needle - * @return boolean FALSE if the needle is not found - */ - public static function strrpos($str, $search, $offset = 0) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strrpos($str, $search, $offset); - } - - /** - * Returns part of a UTF-8 string. - * @see http://php.net/substr - * - * @author Chris Smith - * - * @param string input string - * @param integer offset - * @param integer length limit - * @return string - */ - public static function substr($str, $offset, $length = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _substr($str, $offset, $length); - } - - /** - * Replaces text within a portion of a UTF-8 string. - * @see http://php.net/substr_replace - * - * @author Harry Fuecks - * - * @param string input string - * @param string replacement string - * @param integer offset - * @return string - */ - public static function substr_replace($str, $replacement, $offset, $length = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _substr_replace($str, $replacement, $offset, $length); - } - - /** - * Makes a UTF-8 string lowercase. - * @see http://php.net/strtolower - * - * @author Andreas Gohr - * - * @param string mixed case string - * @return string - */ - public static function strtolower($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strtolower($str); - } - - /** - * Makes a UTF-8 string uppercase. - * @see http://php.net/strtoupper - * - * @author Andreas Gohr - * - * @param string mixed case string - * @return string - */ - public static function strtoupper($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strtoupper($str); - } - - /** - * Makes a UTF-8 string's first character uppercase. - * @see http://php.net/ucfirst - * - * @author Harry Fuecks - * - * @param string mixed case string - * @return string - */ - public static function ucfirst($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _ucfirst($str); - } - - /** - * Makes the first character of every word in a UTF-8 string uppercase. - * @see http://php.net/ucwords - * - * @author Harry Fuecks - * - * @param string mixed case string - * @return string - */ - public static function ucwords($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _ucwords($str); - } - - /** - * Case-insensitive UTF-8 string comparison. - * @see http://php.net/strcasecmp - * - * @author Harry Fuecks - * - * @param string string to compare - * @param string string to compare - * @return integer less than 0 if str1 is less than str2 - * @return integer greater than 0 if str1 is greater than str2 - * @return integer 0 if they are equal - */ - public static function strcasecmp($str1, $str2) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strcasecmp($str1, $str2); - } - - /** - * Returns a string or an array with all occurrences of search in subject (ignoring case). - * replaced with the given replace value. - * @see http://php.net/str_ireplace - * - * @note It's not fast and gets slower if $search and/or $replace are arrays. - * @author Harry Fuecks - * - * @param string input string - * @param string needle - * @return string matched substring if found - * @return boolean FALSE if the substring was not found - */ - public static function stristr($str, $search) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _stristr($str, $search); - } - - /** - * Finds the length of the initial segment matching mask. - * @see http://php.net/strspn - * - * @author Harry Fuecks - * - * @param string input string - * @param string mask for search - * @param integer start position of the string to examine - * @param integer length of the string to examine - * @return integer length of the initial segment that contains characters in the mask - */ - public static function strspn($str, $mask, $offset = NULL, $length = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strspn($str, $mask, $offset, $length); - } - - /** - * Finds the length of the initial segment not matching mask. - * @see http://php.net/strcspn - * - * @author Harry Fuecks - * - * @param string input string - * @param string mask for search - * @param integer start position of the string to examine - * @param integer length of the string to examine - * @return integer length of the initial segment that contains characters not in the mask - */ - public static function strcspn($str, $mask, $offset = NULL, $length = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strcspn($str, $mask, $offset, $length); - } - - /** - * Pads a UTF-8 string to a certain length with another string. - * @see http://php.net/str_pad - * - * @author Harry Fuecks - * - * @param string input string - * @param integer desired string length after padding - * @param string string to use as padding - * @param string padding type: STR_PAD_RIGHT, STR_PAD_LEFT, or STR_PAD_BOTH - * @return string - */ - public static function str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_RIGHT) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _str_pad($str, $final_str_length, $pad_str, $pad_type); - } - - /** - * Converts a UTF-8 string to an array. - * @see http://php.net/str_split - * - * @author Harry Fuecks - * - * @param string input string - * @param integer maximum length of each chunk - * @return array - */ - public static function str_split($str, $split_length = 1) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _str_split($str, $split_length); - } - - /** - * Reverses a UTF-8 string. - * @see http://php.net/strrev - * - * @author Harry Fuecks - * - * @param string string to be reversed - * @return string - */ - public static function strrev($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _strrev($str); - } - - /** - * Strips whitespace (or other UTF-8 characters) from the beginning and - * end of a string. - * @see http://php.net/trim - * - * @author Andreas Gohr - * - * @param string input string - * @param string string of characters to remove - * @return string - */ - public static function trim($str, $charlist = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _trim($str, $charlist); - } - - /** - * Strips whitespace (or other UTF-8 characters) from the beginning of a string. - * @see http://php.net/ltrim - * - * @author Andreas Gohr - * - * @param string input string - * @param string string of characters to remove - * @return string - */ - public static function ltrim($str, $charlist = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _ltrim($str, $charlist); - } - - /** - * Strips whitespace (or other UTF-8 characters) from the end of a string. - * @see http://php.net/rtrim - * - * @author Andreas Gohr - * - * @param string input string - * @param string string of characters to remove - * @return string - */ - public static function rtrim($str, $charlist = NULL) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _rtrim($str, $charlist); - } - - /** - * Returns the unicode ordinal for a character. - * @see http://php.net/ord - * - * @author Harry Fuecks - * - * @param string UTF-8 encoded character - * @return integer - */ - public static function ord($chr) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _ord($chr); - } - - /** - * Takes an UTF-8 string and returns an array of ints representing the Unicode characters. - * Astral planes are supported i.e. the ints in the output can be > 0xFFFF. - * Occurrances of the BOM are ignored. Surrogates are not allowed. - * - * The Original Code is Mozilla Communicator client code. - * The Initial Developer of the Original Code is Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer. - * Ported to PHP by Henri Sivonen , see http://hsivonen.iki.fi/php-utf8/. - * Slight modifications to fit with phputf8 library by Harry Fuecks . - * - * @param string UTF-8 encoded string - * @return array unicode code points - * @return boolean FALSE if the string is invalid - */ - public static function to_unicode($str) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _to_unicode($str); - } - - /** - * Takes an array of ints representing the Unicode characters and returns a UTF-8 string. - * Astral planes are supported i.e. the ints in the input can be > 0xFFFF. - * Occurrances of the BOM are ignored. Surrogates are not allowed. - * - * The Original Code is Mozilla Communicator client code. - * The Initial Developer of the Original Code is Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer. - * Ported to PHP by Henri Sivonen , see http://hsivonen.iki.fi/php-utf8/. - * Slight modifications to fit with phputf8 library by Harry Fuecks . - * - * @param array unicode code points representing a string - * @return string utf8 string of characters - * @return boolean FALSE if a code point cannot be found - */ - public static function from_unicode($arr) - { - if ( ! isset(self::$called[__FUNCTION__])) - { - require SYSPATH.'core/utf8/'.__FUNCTION__.EXT; - - // Function has been called - self::$called[__FUNCTION__] = TRUE; - } - - return _from_unicode($arr); - } - -} // End utf8 \ No newline at end of file diff --git a/system/core/utf8/from_unicode.php b/system/core/utf8/from_unicode.php deleted file mode 100644 index 66c6742d..00000000 --- a/system/core/utf8/from_unicode.php +++ /dev/null @@ -1,68 +0,0 @@ -= 0) AND ($arr[$k] <= 0x007f)) - { - echo chr($arr[$k]); - } - // 2 byte sequence - elseif ($arr[$k] <= 0x07ff) - { - echo chr(0xc0 | ($arr[$k] >> 6)); - echo chr(0x80 | ($arr[$k] & 0x003f)); - } - // Byte order mark (skip) - elseif ($arr[$k] == 0xFEFF) - { - // nop -- zap the BOM - } - // Test for illegal surrogates - elseif ($arr[$k] >= 0xD800 AND $arr[$k] <= 0xDFFF) - { - // Found a surrogate - trigger_error('utf8::from_unicode: Illegal surrogate at index: '.$k.', value: '.$arr[$k], E_USER_WARNING); - return FALSE; - } - // 3 byte sequence - elseif ($arr[$k] <= 0xffff) - { - echo chr(0xe0 | ($arr[$k] >> 12)); - echo chr(0x80 | (($arr[$k] >> 6) & 0x003f)); - echo chr(0x80 | ($arr[$k] & 0x003f)); - } - // 4 byte sequence - elseif ($arr[$k] <= 0x10ffff) - { - echo chr(0xf0 | ($arr[$k] >> 18)); - echo chr(0x80 | (($arr[$k] >> 12) & 0x3f)); - echo chr(0x80 | (($arr[$k] >> 6) & 0x3f)); - echo chr(0x80 | ($arr[$k] & 0x3f)); - } - // Out of range - else - { - trigger_error('utf8::from_unicode: Codepoint out of Unicode range at index: '.$k.', value: '.$arr[$k], E_USER_WARNING); - return FALSE; - } - } - - $result = ob_get_contents(); - ob_end_clean(); - return $result; -} diff --git a/system/core/utf8/ltrim.php b/system/core/utf8/ltrim.php deleted file mode 100644 index 556fe07f..00000000 --- a/system/core/utf8/ltrim.php +++ /dev/null @@ -1,22 +0,0 @@ -= 0 AND $ord0 <= 127) - { - return $ord0; - } - - if ( ! isset($chr[1])) - { - trigger_error('Short sequence - at least 2 bytes expected, only 1 seen', E_USER_WARNING); - return FALSE; - } - - $ord1 = ord($chr[1]); - - if ($ord0 >= 192 AND $ord0 <= 223) - { - return ($ord0 - 192) * 64 + ($ord1 - 128); - } - - if ( ! isset($chr[2])) - { - trigger_error('Short sequence - at least 3 bytes expected, only 2 seen', E_USER_WARNING); - return FALSE; - } - - $ord2 = ord($chr[2]); - - if ($ord0 >= 224 AND $ord0 <= 239) - { - return ($ord0 - 224) * 4096 + ($ord1 - 128) * 64 + ($ord2 - 128); - } - - if ( ! isset($chr[3])) - { - trigger_error('Short sequence - at least 4 bytes expected, only 3 seen', E_USER_WARNING); - return FALSE; - } - - $ord3 = ord($chr[3]); - - if ($ord0 >= 240 AND $ord0 <= 247) - { - return ($ord0 - 240) * 262144 + ($ord1 - 128) * 4096 + ($ord2-128) * 64 + ($ord3 - 128); - } - - if ( ! isset($chr[4])) - { - trigger_error('Short sequence - at least 5 bytes expected, only 4 seen', E_USER_WARNING); - return FALSE; - } - - $ord4 = ord($chr[4]); - - if ($ord0 >= 248 AND $ord0 <= 251) - { - return ($ord0 - 248) * 16777216 + ($ord1-128) * 262144 + ($ord2 - 128) * 4096 + ($ord3 - 128) * 64 + ($ord4 - 128); - } - - if ( ! isset($chr[5])) - { - trigger_error('Short sequence - at least 6 bytes expected, only 5 seen', E_USER_WARNING); - return FALSE; - } - - if ($ord0 >= 252 AND $ord0 <= 253) - { - return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (ord($chr[5]) - 128); - } - - if ($ord0 >= 254 AND $ord0 <= 255) - { - trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0, E_USER_WARNING); - return FALSE; - } -} \ No newline at end of file diff --git a/system/core/utf8/rtrim.php b/system/core/utf8/rtrim.php deleted file mode 100644 index efa0e19d..00000000 --- a/system/core/utf8/rtrim.php +++ /dev/null @@ -1,22 +0,0 @@ - $val) - { - $str[$key] = utf8::str_ireplace($search, $replace, $val, $count); - } - return $str; - } - - if (is_array($search)) - { - $keys = array_keys($search); - - foreach ($keys as $k) - { - if (is_array($replace)) - { - if (array_key_exists($k, $replace)) - { - $str = utf8::str_ireplace($search[$k], $replace[$k], $str, $count); - } - else - { - $str = utf8::str_ireplace($search[$k], '', $str, $count); - } - } - else - { - $str = utf8::str_ireplace($search[$k], $replace, $str, $count); - } - } - return $str; - } - - $search = utf8::strtolower($search); - $str_lower = utf8::strtolower($str); - - $total_matched_strlen = 0; - $i = 0; - - while (preg_match('/(.*?)'.preg_quote($search, '/').'/s', $str_lower, $matches)) - { - $matched_strlen = strlen($matches[0]); - $str_lower = substr($str_lower, $matched_strlen); - - $offset = $total_matched_strlen + strlen($matches[1]) + ($i * (strlen($replace) - 1)); - $str = substr_replace($str, $replace, $offset, strlen($search)); - - $total_matched_strlen += $matched_strlen; - $i++; - } - - $count += $i; - return $str; -} diff --git a/system/core/utf8/str_pad.php b/system/core/utf8/str_pad.php deleted file mode 100644 index aab4ccc7..00000000 --- a/system/core/utf8/str_pad.php +++ /dev/null @@ -1,54 +0,0 @@ -0x0061, 0x03A6=>0x03C6, 0x0162=>0x0163, 0x00C5=>0x00E5, 0x0042=>0x0062, - 0x0139=>0x013A, 0x00C1=>0x00E1, 0x0141=>0x0142, 0x038E=>0x03CD, 0x0100=>0x0101, - 0x0490=>0x0491, 0x0394=>0x03B4, 0x015A=>0x015B, 0x0044=>0x0064, 0x0393=>0x03B3, - 0x00D4=>0x00F4, 0x042A=>0x044A, 0x0419=>0x0439, 0x0112=>0x0113, 0x041C=>0x043C, - 0x015E=>0x015F, 0x0143=>0x0144, 0x00CE=>0x00EE, 0x040E=>0x045E, 0x042F=>0x044F, - 0x039A=>0x03BA, 0x0154=>0x0155, 0x0049=>0x0069, 0x0053=>0x0073, 0x1E1E=>0x1E1F, - 0x0134=>0x0135, 0x0427=>0x0447, 0x03A0=>0x03C0, 0x0418=>0x0438, 0x00D3=>0x00F3, - 0x0420=>0x0440, 0x0404=>0x0454, 0x0415=>0x0435, 0x0429=>0x0449, 0x014A=>0x014B, - 0x0411=>0x0431, 0x0409=>0x0459, 0x1E02=>0x1E03, 0x00D6=>0x00F6, 0x00D9=>0x00F9, - 0x004E=>0x006E, 0x0401=>0x0451, 0x03A4=>0x03C4, 0x0423=>0x0443, 0x015C=>0x015D, - 0x0403=>0x0453, 0x03A8=>0x03C8, 0x0158=>0x0159, 0x0047=>0x0067, 0x00C4=>0x00E4, - 0x0386=>0x03AC, 0x0389=>0x03AE, 0x0166=>0x0167, 0x039E=>0x03BE, 0x0164=>0x0165, - 0x0116=>0x0117, 0x0108=>0x0109, 0x0056=>0x0076, 0x00DE=>0x00FE, 0x0156=>0x0157, - 0x00DA=>0x00FA, 0x1E60=>0x1E61, 0x1E82=>0x1E83, 0x00C2=>0x00E2, 0x0118=>0x0119, - 0x0145=>0x0146, 0x0050=>0x0070, 0x0150=>0x0151, 0x042E=>0x044E, 0x0128=>0x0129, - 0x03A7=>0x03C7, 0x013D=>0x013E, 0x0422=>0x0442, 0x005A=>0x007A, 0x0428=>0x0448, - 0x03A1=>0x03C1, 0x1E80=>0x1E81, 0x016C=>0x016D, 0x00D5=>0x00F5, 0x0055=>0x0075, - 0x0176=>0x0177, 0x00DC=>0x00FC, 0x1E56=>0x1E57, 0x03A3=>0x03C3, 0x041A=>0x043A, - 0x004D=>0x006D, 0x016A=>0x016B, 0x0170=>0x0171, 0x0424=>0x0444, 0x00CC=>0x00EC, - 0x0168=>0x0169, 0x039F=>0x03BF, 0x004B=>0x006B, 0x00D2=>0x00F2, 0x00C0=>0x00E0, - 0x0414=>0x0434, 0x03A9=>0x03C9, 0x1E6A=>0x1E6B, 0x00C3=>0x00E3, 0x042D=>0x044D, - 0x0416=>0x0436, 0x01A0=>0x01A1, 0x010C=>0x010D, 0x011C=>0x011D, 0x00D0=>0x00F0, - 0x013B=>0x013C, 0x040F=>0x045F, 0x040A=>0x045A, 0x00C8=>0x00E8, 0x03A5=>0x03C5, - 0x0046=>0x0066, 0x00DD=>0x00FD, 0x0043=>0x0063, 0x021A=>0x021B, 0x00CA=>0x00EA, - 0x0399=>0x03B9, 0x0179=>0x017A, 0x00CF=>0x00EF, 0x01AF=>0x01B0, 0x0045=>0x0065, - 0x039B=>0x03BB, 0x0398=>0x03B8, 0x039C=>0x03BC, 0x040C=>0x045C, 0x041F=>0x043F, - 0x042C=>0x044C, 0x00DE=>0x00FE, 0x00D0=>0x00F0, 0x1EF2=>0x1EF3, 0x0048=>0x0068, - 0x00CB=>0x00EB, 0x0110=>0x0111, 0x0413=>0x0433, 0x012E=>0x012F, 0x00C6=>0x00E6, - 0x0058=>0x0078, 0x0160=>0x0161, 0x016E=>0x016F, 0x0391=>0x03B1, 0x0407=>0x0457, - 0x0172=>0x0173, 0x0178=>0x00FF, 0x004F=>0x006F, 0x041B=>0x043B, 0x0395=>0x03B5, - 0x0425=>0x0445, 0x0120=>0x0121, 0x017D=>0x017E, 0x017B=>0x017C, 0x0396=>0x03B6, - 0x0392=>0x03B2, 0x0388=>0x03AD, 0x1E84=>0x1E85, 0x0174=>0x0175, 0x0051=>0x0071, - 0x0417=>0x0437, 0x1E0A=>0x1E0B, 0x0147=>0x0148, 0x0104=>0x0105, 0x0408=>0x0458, - 0x014C=>0x014D, 0x00CD=>0x00ED, 0x0059=>0x0079, 0x010A=>0x010B, 0x038F=>0x03CE, - 0x0052=>0x0072, 0x0410=>0x0430, 0x0405=>0x0455, 0x0402=>0x0452, 0x0126=>0x0127, - 0x0136=>0x0137, 0x012A=>0x012B, 0x038A=>0x03AF, 0x042B=>0x044B, 0x004C=>0x006C, - 0x0397=>0x03B7, 0x0124=>0x0125, 0x0218=>0x0219, 0x00DB=>0x00FB, 0x011E=>0x011F, - 0x041E=>0x043E, 0x1E40=>0x1E41, 0x039D=>0x03BD, 0x0106=>0x0107, 0x03AB=>0x03CB, - 0x0426=>0x0446, 0x00DE=>0x00FE, 0x00C7=>0x00E7, 0x03AA=>0x03CA, 0x0421=>0x0441, - 0x0412=>0x0432, 0x010E=>0x010F, 0x00D8=>0x00F8, 0x0057=>0x0077, 0x011A=>0x011B, - 0x0054=>0x0074, 0x004A=>0x006A, 0x040B=>0x045B, 0x0406=>0x0456, 0x0102=>0x0103, - 0x039B=>0x03BB, 0x00D1=>0x00F1, 0x041D=>0x043D, 0x038C=>0x03CC, 0x00C9=>0x00E9, - 0x00D0=>0x00F0, 0x0407=>0x0457, 0x0122=>0x0123, - ); - } - - $uni = utf8::to_unicode($str); - - if ($uni === FALSE) - return FALSE; - - for ($i = 0, $c = count($uni); $i < $c; $i++) - { - if (isset($UTF8_UPPER_TO_LOWER[$uni[$i]])) - { - $uni[$i] = $UTF8_UPPER_TO_LOWER[$uni[$i]]; - } - } - - return utf8::from_unicode($uni); -} \ No newline at end of file diff --git a/system/core/utf8/strtoupper.php b/system/core/utf8/strtoupper.php deleted file mode 100644 index f3ded739..00000000 --- a/system/core/utf8/strtoupper.php +++ /dev/null @@ -1,84 +0,0 @@ -0x0041, 0x03C6=>0x03A6, 0x0163=>0x0162, 0x00E5=>0x00C5, 0x0062=>0x0042, - 0x013A=>0x0139, 0x00E1=>0x00C1, 0x0142=>0x0141, 0x03CD=>0x038E, 0x0101=>0x0100, - 0x0491=>0x0490, 0x03B4=>0x0394, 0x015B=>0x015A, 0x0064=>0x0044, 0x03B3=>0x0393, - 0x00F4=>0x00D4, 0x044A=>0x042A, 0x0439=>0x0419, 0x0113=>0x0112, 0x043C=>0x041C, - 0x015F=>0x015E, 0x0144=>0x0143, 0x00EE=>0x00CE, 0x045E=>0x040E, 0x044F=>0x042F, - 0x03BA=>0x039A, 0x0155=>0x0154, 0x0069=>0x0049, 0x0073=>0x0053, 0x1E1F=>0x1E1E, - 0x0135=>0x0134, 0x0447=>0x0427, 0x03C0=>0x03A0, 0x0438=>0x0418, 0x00F3=>0x00D3, - 0x0440=>0x0420, 0x0454=>0x0404, 0x0435=>0x0415, 0x0449=>0x0429, 0x014B=>0x014A, - 0x0431=>0x0411, 0x0459=>0x0409, 0x1E03=>0x1E02, 0x00F6=>0x00D6, 0x00F9=>0x00D9, - 0x006E=>0x004E, 0x0451=>0x0401, 0x03C4=>0x03A4, 0x0443=>0x0423, 0x015D=>0x015C, - 0x0453=>0x0403, 0x03C8=>0x03A8, 0x0159=>0x0158, 0x0067=>0x0047, 0x00E4=>0x00C4, - 0x03AC=>0x0386, 0x03AE=>0x0389, 0x0167=>0x0166, 0x03BE=>0x039E, 0x0165=>0x0164, - 0x0117=>0x0116, 0x0109=>0x0108, 0x0076=>0x0056, 0x00FE=>0x00DE, 0x0157=>0x0156, - 0x00FA=>0x00DA, 0x1E61=>0x1E60, 0x1E83=>0x1E82, 0x00E2=>0x00C2, 0x0119=>0x0118, - 0x0146=>0x0145, 0x0070=>0x0050, 0x0151=>0x0150, 0x044E=>0x042E, 0x0129=>0x0128, - 0x03C7=>0x03A7, 0x013E=>0x013D, 0x0442=>0x0422, 0x007A=>0x005A, 0x0448=>0x0428, - 0x03C1=>0x03A1, 0x1E81=>0x1E80, 0x016D=>0x016C, 0x00F5=>0x00D5, 0x0075=>0x0055, - 0x0177=>0x0176, 0x00FC=>0x00DC, 0x1E57=>0x1E56, 0x03C3=>0x03A3, 0x043A=>0x041A, - 0x006D=>0x004D, 0x016B=>0x016A, 0x0171=>0x0170, 0x0444=>0x0424, 0x00EC=>0x00CC, - 0x0169=>0x0168, 0x03BF=>0x039F, 0x006B=>0x004B, 0x00F2=>0x00D2, 0x00E0=>0x00C0, - 0x0434=>0x0414, 0x03C9=>0x03A9, 0x1E6B=>0x1E6A, 0x00E3=>0x00C3, 0x044D=>0x042D, - 0x0436=>0x0416, 0x01A1=>0x01A0, 0x010D=>0x010C, 0x011D=>0x011C, 0x00F0=>0x00D0, - 0x013C=>0x013B, 0x045F=>0x040F, 0x045A=>0x040A, 0x00E8=>0x00C8, 0x03C5=>0x03A5, - 0x0066=>0x0046, 0x00FD=>0x00DD, 0x0063=>0x0043, 0x021B=>0x021A, 0x00EA=>0x00CA, - 0x03B9=>0x0399, 0x017A=>0x0179, 0x00EF=>0x00CF, 0x01B0=>0x01AF, 0x0065=>0x0045, - 0x03BB=>0x039B, 0x03B8=>0x0398, 0x03BC=>0x039C, 0x045C=>0x040C, 0x043F=>0x041F, - 0x044C=>0x042C, 0x00FE=>0x00DE, 0x00F0=>0x00D0, 0x1EF3=>0x1EF2, 0x0068=>0x0048, - 0x00EB=>0x00CB, 0x0111=>0x0110, 0x0433=>0x0413, 0x012F=>0x012E, 0x00E6=>0x00C6, - 0x0078=>0x0058, 0x0161=>0x0160, 0x016F=>0x016E, 0x03B1=>0x0391, 0x0457=>0x0407, - 0x0173=>0x0172, 0x00FF=>0x0178, 0x006F=>0x004F, 0x043B=>0x041B, 0x03B5=>0x0395, - 0x0445=>0x0425, 0x0121=>0x0120, 0x017E=>0x017D, 0x017C=>0x017B, 0x03B6=>0x0396, - 0x03B2=>0x0392, 0x03AD=>0x0388, 0x1E85=>0x1E84, 0x0175=>0x0174, 0x0071=>0x0051, - 0x0437=>0x0417, 0x1E0B=>0x1E0A, 0x0148=>0x0147, 0x0105=>0x0104, 0x0458=>0x0408, - 0x014D=>0x014C, 0x00ED=>0x00CD, 0x0079=>0x0059, 0x010B=>0x010A, 0x03CE=>0x038F, - 0x0072=>0x0052, 0x0430=>0x0410, 0x0455=>0x0405, 0x0452=>0x0402, 0x0127=>0x0126, - 0x0137=>0x0136, 0x012B=>0x012A, 0x03AF=>0x038A, 0x044B=>0x042B, 0x006C=>0x004C, - 0x03B7=>0x0397, 0x0125=>0x0124, 0x0219=>0x0218, 0x00FB=>0x00DB, 0x011F=>0x011E, - 0x043E=>0x041E, 0x1E41=>0x1E40, 0x03BD=>0x039D, 0x0107=>0x0106, 0x03CB=>0x03AB, - 0x0446=>0x0426, 0x00FE=>0x00DE, 0x00E7=>0x00C7, 0x03CA=>0x03AA, 0x0441=>0x0421, - 0x0432=>0x0412, 0x010F=>0x010E, 0x00F8=>0x00D8, 0x0077=>0x0057, 0x011B=>0x011A, - 0x0074=>0x0054, 0x006A=>0x004A, 0x045B=>0x040B, 0x0456=>0x0406, 0x0103=>0x0102, - 0x03BB=>0x039B, 0x00F1=>0x00D1, 0x043D=>0x041D, 0x03CC=>0x038C, 0x00E9=>0x00C9, - 0x00F0=>0x00D0, 0x0457=>0x0407, 0x0123=>0x0122, - ); - } - - $uni = utf8::to_unicode($str); - - if ($uni === FALSE) - return FALSE; - - for ($i = 0, $c = count($uni); $i < $c; $i++) - { - if (isset($UTF8_LOWER_TO_UPPER[$uni[$i]])) - { - $uni[$i] = $UTF8_LOWER_TO_UPPER[$uni[$i]]; - } - } - - return utf8::from_unicode($uni); -} \ No newline at end of file diff --git a/system/core/utf8/substr.php b/system/core/utf8/substr.php deleted file mode 100644 index daf66b81..00000000 --- a/system/core/utf8/substr.php +++ /dev/null @@ -1,75 +0,0 @@ -= $strlen OR ($length < 0 AND $length <= $offset - $strlen)) - return ''; - - // Whole string - if ($offset == 0 AND ($length === NULL OR $length >= $strlen)) - return $str; - - // Build regex - $regex = '^'; - - // Create an offset expression - if ($offset > 0) - { - // PCRE repeating quantifiers must be less than 65536, so repeat when necessary - $x = (int) ($offset / 65535); - $y = (int) ($offset % 65535); - $regex .= ($x == 0) ? '' : '(?:.{65535}){'.$x.'}'; - $regex .= ($y == 0) ? '' : '.{'.$y.'}'; - } - - // Create a length expression - if ($length === NULL) - { - $regex .= '(.*)'; // No length set, grab it all - } - // Find length from the left (positive length) - elseif ($length > 0) - { - // Reduce length so that it can't go beyond the end of the string - $length = min($strlen - $offset, $length); - - $x = (int) ($length / 65535); - $y = (int) ($length % 65535); - $regex .= '('; - $regex .= ($x == 0) ? '' : '(?:.{65535}){'.$x.'}'; - $regex .= '.{'.$y.'})'; - } - // Find length from the right (negative length) - else - { - $x = (int) (-$length / 65535); - $y = (int) (-$length % 65535); - $regex .= '(.*)'; - $regex .= ($x == 0) ? '' : '(?:.{65535}){'.$x.'}'; - $regex .= '.{'.$y.'}'; - } - - preg_match('/'.$regex.'/us', $str, $matches); - return $matches[1]; -} \ No newline at end of file diff --git a/system/core/utf8/substr_replace.php b/system/core/utf8/substr_replace.php deleted file mode 100644 index 45e2d2a3..00000000 --- a/system/core/utf8/substr_replace.php +++ /dev/null @@ -1,22 +0,0 @@ - 0x10FFFF)) - { - trigger_error('utf8::to_unicode: Illegal sequence or codepoint in UTF-8 at byte '.$i, E_USER_WARNING); - return FALSE; - } - - if (0xFEFF != $mUcs4) - { - // BOM is legal but we don't want to output it - $out[] = $mUcs4; - } - - // Initialize UTF-8 cache - $mState = 0; - $mUcs4 = 0; - $mBytes = 1; - } - } - else - { - // ((0xC0 & (*in) != 0x80) AND (mState != 0)) - // Incomplete multi-octet sequence - trigger_error('utf8::to_unicode: Incomplete multi-octet sequence in UTF-8 at byte '.$i, E_USER_WARNING); - return FALSE; - } - } - } - - return $out; -} \ No newline at end of file diff --git a/system/core/utf8/transliterate_to_ascii.php b/system/core/utf8/transliterate_to_ascii.php deleted file mode 100644 index 07461fbb..00000000 --- a/system/core/utf8/transliterate_to_ascii.php +++ /dev/null @@ -1,77 +0,0 @@ - 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o', - 'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k', - 'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o', - 'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o', - 'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c', - 'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't', - 'ū' => 'u', 'č' => 'c', 'ö' => 'o', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l', - 'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z', - 'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't', - 'ŗ' => 'r', 'ä' => 'a', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'u', 'ò' => 'o', - 'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j', - 'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o', - 'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g', - 'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a', - 'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e', - ); - } - - $str = str_replace( - array_keys($UTF8_LOWER_ACCENTS), - array_values($UTF8_LOWER_ACCENTS), - $str - ); - } - - if ($case >= 0) - { - if ($UTF8_UPPER_ACCENTS === NULL) - { - $UTF8_UPPER_ACCENTS = array( - 'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O', - 'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K', 'Ĕ' => 'E', - 'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O', - 'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O', - 'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C', - 'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T', - 'Ū' => 'U', 'Č' => 'C', 'Ö' => 'O', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L', - 'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z', - 'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T', - 'Ŗ' => 'R', 'Ä' => 'A', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'U', 'Ò' => 'O', - 'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J', - 'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O', - 'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G', - 'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A', - 'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', - ); - } - - $str = str_replace( - array_keys($UTF8_UPPER_ACCENTS), - array_values($UTF8_UPPER_ACCENTS), - $str - ); - } - - return $str; -} \ No newline at end of file diff --git a/system/core/utf8/trim.php b/system/core/utf8/trim.php deleted file mode 100644 index 7434102a..00000000 --- a/system/core/utf8/trim.php +++ /dev/null @@ -1,17 +0,0 @@ -> 1; - - if ($haystack[$mid] < $needle) - { - $low = $mid + 1; - } - elseif ($haystack[$mid] > $needle) - { - $high = $mid - 1; - } - else - { - return $mid; - } - } - - return FALSE; - } - - /** * Emulates array_merge_recursive, but appends numeric keys and replaces * associative keys, instead of appending all keys. @@ -263,27 +231,6 @@ class arr_Core { return $array1; } - /** - * Fill an array with a range of numbers. - * - * @param integer stepping - * @param integer ending number - * @return array - */ - public static function range($step = 10, $max = 100) - { - if ($step < 1) - return array(); - - $array = array(); - for ($i = $step; $i <= $max; $i += $step) - { - $array[$i] = $i; - } - - return $array; - } - /** * Recursively convert an array to an object. * @@ -309,4 +256,20 @@ class arr_Core { return $object; } + /** + * Returns specific key/column from an array of objects. + * + * @param string|integer $key The key or column number to pluck from each object. + * @param array $array The array of objects to pluck from. + * @return array + */ + public static function pluck($key, $array) + { + $result = array(); + foreach ($array as $i => $object) + { + $result[$i] = isset($object[$key]) ? $object[$key] : NULL; + } + return $result; + } } // End arr diff --git a/system/helpers/cookie.php b/system/helpers/cookie.php index 901b6d86..8a2e3659 100644 --- a/system/helpers/cookie.php +++ b/system/helpers/cookie.php @@ -2,12 +2,12 @@ /** * Cookie helper class. * - * $Id: cookie.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: cookie.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class cookie_Core { @@ -42,8 +42,13 @@ class cookie_Core { } } - // Expiration timestamp - $expire = ($expire == 0) ? 0 : time() + (int) $expire; + if ($expire !== 0) + { + // The expiration is expected to be a UNIX timestamp + $expire += time(); + } + + $value = cookie::salt($name, $value).'~'.$value; return setcookie($name, $value, $expire, $path, $domain, $secure, $httponly); } @@ -56,9 +61,51 @@ class cookie_Core { * @param boolean use XSS cleaning on the value * @return string */ - public static function get($name, $default = NULL, $xss_clean = FALSE) + public static function get($name = NULL, $default = NULL, $xss_clean = FALSE) { - return Input::instance()->cookie($name, $default, $xss_clean); + // Return an array of all the cookies if we don't have a name + if ($name === NULL) + { + $cookies = array(); + + foreach($_COOKIE AS $key => $value) + { + $cookies[$key] = cookie::get($key, $default, $xss_clean); + } + return $cookies; + } + + if ( ! isset($_COOKIE[$name])) + { + return $default; + } + + // Get the cookie value + $cookie = $_COOKIE[$name]; + + // Find the position of the split between salt and contents + $split = strlen(cookie::salt($name, NULL)); + + if (isset($cookie[$split]) AND $cookie[$split] === '~') + { + // Separate the salt and the value + list ($hash, $value) = explode('~', $cookie, 2); + + if (cookie::salt($name, $value) === $hash) + { + if ($xss_clean === TRUE AND Kohana::config('core.global_xss_filtering') === FALSE) + { + return Input::instance()->xss_clean($value); + } + // Cookie signature is valid + return $value; + } + + // The cookie signature is invalid, delete it + cookie::delete($name); + } + + return $default; } /** @@ -71,9 +118,6 @@ class cookie_Core { */ public static function delete($name, $path = NULL, $domain = NULL) { - if ( ! isset($_COOKIE[$name])) - return FALSE; - // Delete the cookie from globals unset($_COOKIE[$name]); @@ -81,4 +125,27 @@ class cookie_Core { return cookie::set($name, '', -86400, $path, $domain, FALSE, FALSE); } + /** + * Generates a salt string for a cookie based on the name and value. + * + * @param string $name name of cookie + * @param string $value value of cookie + * @return string sha1 hash + */ + public static function salt($name, $value) + { + // Determine the user agent + $agent = isset($_SERVER['HTTP_USER_AGENT']) ? strtolower($_SERVER['HTTP_USER_AGENT']) : 'unknown'; + + // Cookie salt. + $salt = Kohana::config('cookie.salt'); + + return sha1($agent.$name.$value.$salt); + } + + final private function __construct() + { + // Static class. + } + } // End cookie \ No newline at end of file diff --git a/system/helpers/date.php b/system/helpers/date.php index 7d5a9ab6..af7e85bd 100644 --- a/system/helpers/date.php +++ b/system/helpers/date.php @@ -2,12 +2,12 @@ /** * Date helper class. * - * $Id: date.php 4316 2009-05-04 01:03:54Z kiall $ + * $Id: date.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class date_Core { @@ -57,36 +57,28 @@ class date_Core { * Returns the offset (in seconds) between two time zones. * @see http://php.net/timezones * - * @param string timezone that to find the offset of + * @param string timezone to find the offset of * @param string|boolean timezone used as the baseline + * @param string time at which to calculate * @return integer */ - public static function offset($remote, $local = TRUE) + public static function offset($remote, $local = TRUE, $when = 'now') { - static $offsets; - - // Default values - $remote = (string) $remote; - $local = ($local === TRUE) ? date_default_timezone_get() : (string) $local; - - // Cache key name - $cache = $remote.$local; - - if (empty($offsets[$cache])) + if ($local === TRUE) { - // Create timezone objects - $remote = new DateTimeZone($remote); - $local = new DateTimeZone($local); + $local = date_default_timezone_get(); + } - // Create date objects from timezones - $time_there = new DateTime('now', $remote); - $time_here = new DateTime('now', $local); + // Create timezone objects + $remote = new DateTimeZone($remote); + $local = new DateTimeZone($local); - // Find the offset - $offsets[$cache] = $remote->getOffset($time_there) - $local->getOffset($time_here); - } + // Create date objects from timezones + $time_there = new DateTime($when, $remote); + $time_here = new DateTime($when, $local); - return $offsets[$cache]; + // Find the offset + return $remote->getOffset($time_there) - $local->getOffset($time_here); } /** diff --git a/system/helpers/db.php b/system/helpers/db.php new file mode 100644 index 00000000..ce7583b7 --- /dev/null +++ b/system/helpers/db.php @@ -0,0 +1,49 @@ +select($columns); + } + + public static function insert($table = NULL, $set = NULL) + { + return db::build()->insert($table, $set); + } + + public static function update($table = NULL, $set = NULL, $where = NULL) + { + return db::build()->update($table, $set, $where); + } + + public static function delete($table = NULL, $where = NULL) + { + return db::build()->delete($table, $where); + } + + public static function expr($expression) + { + return new Database_Expression($expression); + } + +} // End db diff --git a/system/helpers/download.php b/system/helpers/download.php index 49fed42c..58a7ab94 100644 --- a/system/helpers/download.php +++ b/system/helpers/download.php @@ -2,104 +2,136 @@ /** * Download helper class. * - * $Id: download.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: download.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class download_Core { /** - * Force a download of a file to the user's browser. This function is - * binary-safe and will work with any MIME type that Kohana is aware of. + * Send headers necessary to invoke a "Save As" dialog + * + * @link http://support.microsoft.com/kb/260519 + * @link http://greenbytes.de/tech/tc2231/ + * + * @param string file name + * @return string file name as it was sent + */ + public static function dialog($filename) + { + $filename = basename($filename); + + header('Content-Disposition: attachment; filename="'.$filename.'"'); + + return $filename; + } + + /** + * Send the contents of a file or a data string with the proper MIME type and exit. + * + * @uses exit() + * @uses Kohana::close_buffers() * * @param string a file path or file name - * @param mixed data to be sent if the filename does not exist - * @param string suggested filename to display in the download + * @param string optional data to send * @return void */ - public static function force($filename = NULL, $data = NULL, $nicename = NULL) + public static function send($filename, $data = NULL) { - if (empty($filename)) - return FALSE; - - if (is_file($filename)) + if ($data === NULL) { - // Get the real path - $filepath = str_replace('\\', '/', realpath($filename)); + $filepath = realpath($filename); - // Set filesize + $filename = basename($filepath); $filesize = filesize($filepath); - - // Get filename - $filename = substr(strrchr('/'.$filepath, '/'), 1); - - // Get extension - $extension = strtolower(substr(strrchr($filepath, '.'), 1)); } else { - // Get filesize + $filename = basename($filename); $filesize = strlen($data); + } - // Make sure the filename does not have directory info - $filename = substr(strrchr('/'.$filename, '/'), 1); + // Retrieve MIME type by extension + $mime = Kohana::config('mimes.'.strtolower(substr(strrchr($filename, '.'), 1))); + $mime = empty($mime) ? 'application/octet-stream' : $mime[0]; - // Get extension - $extension = strtolower(substr(strrchr($filename, '.'), 1)); - } + // Close output buffers + Kohana::close_buffers(FALSE); + + // Clear any output + Event::add('system.display', create_function('', 'Kohana::$output = "";')); - // Get the mime type of the file - $mime = Kohana::config('mimes.'.$extension); + // Send headers + header("Content-Type: $mime"); + header('Content-Length: '.sprintf('%d', $filesize)); + header('Content-Transfer-Encoding: binary'); - if (empty($mime)) + // Send data + if ($data === NULL) { - // Set a default mime if none was found - $mime = array('application/octet-stream'); + $handle = fopen($filepath, 'rb'); + + fpassthru($handle); + fclose($handle); + } + else + { + echo $data; } - // Generate the server headers - header('Content-Type: '.$mime[0]); - header('Content-Disposition: attachment; filename="'.(empty($nicename) ? $filename : $nicename).'"'); - header('Content-Transfer-Encoding: binary'); - header('Content-Length: '.sprintf('%d', $filesize)); + exit; + } + + /** + * Force the download of a file by the user's browser by preventing any + * caching. Contains a workaround for Internet Explorer. + * + * @link http://support.microsoft.com/kb/316431 + * @link http://support.microsoft.com/kb/812935 + * + * @uses download::dialog() + * @uses download::send() + * + * @param string a file path or file name + * @param mixed data to be sent if the filename does not exist + * @param string suggested filename to display in the download + * @return void + */ + public static function force($filename = NULL, $data = NULL, $nicename = NULL) + { + download::dialog(empty($nicename) ? $filename : $nicename); - // More caching prevention - header('Expires: 0'); + // Prevent caching + header('Expires: Thu, 01 Jan 1970 00:00:00 GMT'); - if (Kohana::user_agent('browser') === 'Internet Explorer') + if (request::user_agent('browser') === 'Internet Explorer' AND request::user_agent('version') <= '6.0') { - // Send IE headers + // HTTP 1.0 + header('Pragma:'); + + // HTTP 1.1 with IE extensions header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); } else { - // Send normal headers + // HTTP 1.0 header('Pragma: no-cache'); - } - // Clear the output buffer - Kohana::close_buffers(FALSE); + // HTTP 1.1 + header('Cache-Control: no-cache, max-age=0'); + } - if (isset($filepath)) + if (is_file($filename)) { - // Open the file - $handle = fopen($filepath, 'rb'); - - // Send the file data - fpassthru($handle); - - // Close the file - fclose($handle); + download::send($filename); } else { - // Send the file data - echo $data; + download::send($filename, $data); } } -} // End download \ No newline at end of file +} // End download diff --git a/system/helpers/email.php b/system/helpers/email.php deleted file mode 100644 index fb222d0c..00000000 --- a/system/helpers/email.php +++ /dev/null @@ -1,181 +0,0 @@ -setUsername($config['options']['username']); - empty($config['options']['password']) or $connection->setPassword($config['options']['password']); - - if ( ! empty($config['options']['auth'])) - { - // Get the class name and params - list ($class, $params) = arr::callback_string($config['options']['auth']); - - if ($class === 'PopB4Smtp') - { - // Load the PopB4Smtp class manually, due to its odd filename - require Kohana::find_file('vendor', 'swift/Swift/Authenticator/$PopB4Smtp$'); - } - - // Prepare the class name for auto-loading - $class = 'Swift_Authenticator_'.$class; - - // Attach the authenticator - $connection->attachAuthenticator(($params === NULL) ? new $class : new $class($params[0])); - } - - // Set the timeout to 5 seconds - $connection->setTimeout(empty($config['options']['timeout']) ? 5 : (int) $config['options']['timeout']); - break; - case 'sendmail': - // Create a sendmail connection - $connection = new Swift_Connection_Sendmail - ( - empty($config['options']) ? Swift_Connection_Sendmail::AUTO_DETECT : $config['options'] - ); - - // Set the timeout to 5 seconds - $connection->setTimeout(5); - break; - default: - // Use the native connection - $connection = new Swift_Connection_NativeMail($config['options']); - break; - } - - // Create the SwiftMailer instance - return email::$mail = new Swift($connection); - } - - /** - * Send an email message. - * - * @param string|array recipient email (and name), or an array of To, Cc, Bcc names - * @param string|array sender email (and name) - * @param string message subject - * @param string message body - * @param boolean send email as HTML - * @return integer number of emails sent - */ - public static function send($to, $from, $subject, $message, $html = FALSE) - { - // Connect to SwiftMailer - (email::$mail === NULL) and email::connect(); - - // Determine the message type - $html = ($html === TRUE) ? 'text/html' : 'text/plain'; - - // Create the message - $message = new Swift_Message($subject, $message, $html, '8bit', 'utf-8'); - - if (is_string($to)) - { - // Single recipient - $recipients = new Swift_Address($to); - } - elseif (is_array($to)) - { - if (isset($to[0]) AND isset($to[1])) - { - // Create To: address set - $to = array('to' => $to); - } - - // Create a list of recipients - $recipients = new Swift_RecipientList; - - foreach ($to as $method => $set) - { - if ( ! in_array($method, array('to', 'cc', 'bcc'))) - { - // Use To: by default - $method = 'to'; - } - - // Create method name - $method = 'add'.ucfirst($method); - - if (is_array($set)) - { - // Add a recipient with name - $recipients->$method($set[0], $set[1]); - } - else - { - // Add a recipient without name - $recipients->$method($set); - } - } - } - - if (is_string($from)) - { - // From without a name - $from = new Swift_Address($from); - } - elseif (is_array($from)) - { - // From with a name - $from = new Swift_Address($from[0], $from[1]); - } - - return email::$mail->send($message, $recipients, $from); - } - -} // End email \ No newline at end of file diff --git a/system/helpers/expires.php b/system/helpers/expires.php index c43cc0cc..ce0482c8 100644 --- a/system/helpers/expires.php +++ b/system/helpers/expires.php @@ -2,54 +2,49 @@ /** * Controls headers that effect client caching of pages * - * $Id: expires.php 4272 2009-04-25 21:47:26Z zombor $ + * $Id: expires.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class expires_Core { /** - * Sets the amount of time before a page expires + * Sets the amount of time before content expires * - * @param integer Seconds before the page expires - * @return boolean + * @param integer Seconds before the content expires + * @return integer Timestamp when the content expires */ public static function set($seconds = 60) { - if (expires::check_headers()) - { - $now = $expires = time(); + $now = time(); + $expires = $now + $seconds; - // Set the expiration timestamp - $expires += $seconds; + header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $now)); - // Send headers - header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $now)); - header('Expires: '.gmdate('D, d M Y H:i:s T', $expires)); - header('Cache-Control: max-age='.$seconds); + // HTTP 1.0 + header('Expires: '.gmdate('D, d M Y H:i:s T', $expires)); - return $expires; - } + // HTTP 1.1 + header('Cache-Control: max-age='.$seconds); - return FALSE; + return $expires; } /** - * Checks to see if a page should be updated or send Not Modified status + * Parses the If-Modified-Since header * - * @param integer Seconds added to the modified time received to calculate what should be sent - * @return bool FALSE when the request needs to be updated + * @return integer|boolean Timestamp or FALSE when header is lacking or malformed */ - public static function check($seconds = 60) + public static function get() { - if ( ! empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) AND expires::check_headers()) + if ( ! empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { + // Some versions of IE6 append "; length=####" if (($strpos = strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], ';')) !== FALSE) { - // IE6 and perhaps other IE versions send length too, compensate here $mod_time = substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, $strpos); } else @@ -57,55 +52,69 @@ class expires_Core { $mod_time = $_SERVER['HTTP_IF_MODIFIED_SINCE']; } - $mod_time = strtotime($mod_time); - $mod_time_diff = $mod_time + $seconds - time(); + return strtotime($mod_time); + } + + return FALSE; + } - if ($mod_time_diff > 0) + /** + * Checks to see if content should be updated otherwise sends Not Modified status + * and exits. + * + * @uses exit() + * @uses expires::get() + * + * @param integer Maximum age of the content in seconds + * @return integer|boolean Timestamp of the If-Modified-Since header or FALSE when header is lacking or malformed + */ + public static function check($seconds = 60) + { + if ($last_modified = expires::get()) + { + $expires = $last_modified + $seconds; + $max_age = $expires - time(); + + if ($max_age > 0) { - // Re-send headers - header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $mod_time)); - header('Expires: '.gmdate('D, d M Y H:i:s T', time() + $mod_time_diff)); - header('Cache-Control: max-age='.$mod_time_diff); - header('Status: 304 Not Modified', TRUE, 304); + // Content has not expired + header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified'); + header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $last_modified)); + + // HTTP 1.0 + header('Expires: '.gmdate('D, d M Y H:i:s T', $expires)); - // Prevent any output - Event::add('system.display', array('expires', 'prevent_output')); + // HTTP 1.1 + header('Cache-Control: max-age='.$max_age); + + // Clear any output + Event::add('system.display', create_function('', 'Kohana::$output = "";')); - // Exit to prevent other output exit; } } - return FALSE; + return $last_modified; } /** - * Check headers already created to not step on download or Img_lib's feet + * Check if expiration headers are already set * * @return boolean */ - public static function check_headers() + public static function headers_set() { foreach (headers_list() as $header) { - if ((session_cache_limiter() == '' AND stripos($header, 'Last-Modified:') === 0) - OR stripos($header, 'Expires:') === 0) + if (strncasecmp($header, 'Expires:', 8) === 0 + OR strncasecmp($header, 'Cache-Control:', 14) === 0 + OR strncasecmp($header, 'Last-Modified:', 14) === 0) { - return FALSE; + return TRUE; } } - return TRUE; - } - - /** - * Prevent any output from being displayed. Executed during system.display. - * - * @return void - */ - public static function prevent_output() - { - Kohana::$output = ''; + return FALSE; } -} // End expires \ No newline at end of file +} // End expires diff --git a/system/helpers/feed.php b/system/helpers/feed.php index 74bb2f6b..4aab1dcd 100644 --- a/system/helpers/feed.php +++ b/system/helpers/feed.php @@ -2,12 +2,12 @@ /** * Feed helper class. * - * $Id: feed.php 4152 2009-04-03 23:26:23Z ixmatus $ + * $Id: feed.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class feed_Core { diff --git a/system/helpers/file.php b/system/helpers/file.php index b1b71740..0d4a7980 100644 --- a/system/helpers/file.php +++ b/system/helpers/file.php @@ -2,12 +2,12 @@ /** * File helper class. * - * $Id: file.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: file.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class file_Core { diff --git a/system/helpers/form.php b/system/helpers/form.php index 815eef84..901edc91 100644 --- a/system/helpers/form.php +++ b/system/helpers/form.php @@ -2,12 +2,12 @@ /** * Form helper class. * - * $Id: form.php 4291 2009-04-29 22:51:58Z kiall $ + * $Id: form.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class form_Core { @@ -17,9 +17,10 @@ class form_Core { * @param string form action attribute * @param array extra attributes * @param array hidden fields to be created immediately after the form tag + * @param string non-default protocol, eg: https * @return string */ - public static function open($action = NULL, $attr = array(), $hidden = NULL) + public static function open($action = NULL, $attr = array(), $hidden = NULL, $protocol = NULL) { // Make sure that the method is always set empty($attr['method']) and $attr['method'] = 'post'; @@ -33,12 +34,12 @@ class form_Core { if ($action === NULL) { // Use the current URL as the default action - $action = url::site(Router::$complete_uri); + $action = url::site(Router::$complete_uri, $protocol); } elseif (strpos($action, '://') === FALSE) { // Make the action URI into a URL - $action = url::site($action); + $action = url::site($action, $protocol); } // Set action @@ -70,72 +71,23 @@ class form_Core { } /** - * Generates a fieldset opening tag. + * Creates a HTML form hidden input tag. * - * @param array html attributes - * @param string a string to be attached to the end of the attributes - * @return string - */ - public static function open_fieldset($data = NULL, $extra = '') - { - return ''."\n"; - } - - /** - * Generates a fieldset closing tag. - * - * @return string - */ - public static function close_fieldset() - { - return ''."\n"; - } - - /** - * Generates a legend tag for use with a fieldset. - * - * @param string legend text - * @param array HTML attributes - * @param string a string to be attached to the end of the attributes - * @return string - */ - public static function legend($text = '', $data = NULL, $extra = '') - { - return ''.$text.''."\n"; - } - - /** - * Generates hidden form fields. - * You can pass a simple key/value string or an associative array with multiple values. - * - * @param string|array input name (string) or key/value pairs (array) - * @param string input value, if using an input name + * @param string|array input name or an array of HTML attributes + * @param string input value, when using a name + * @param string a string to be attached to the end of the attributes * @return string */ - public static function hidden($data, $value = '') + public static function hidden($data, $value = '', $extra = '') { if ( ! is_array($data)) { - $data = array - ( - $data => $value - ); + $data = array('name' => $data); } - $input = ''; - foreach ($data as $name => $value) - { - $attr = array - ( - 'type' => 'hidden', - 'name' => $name, - 'value' => $value - ); - - $input .= form::input($attr)."\n"; - } + $data['type'] = 'hidden'; - return $input; + return form::input($data, $value, $extra); } /** @@ -219,13 +171,23 @@ class form_Core { $data = array('name' => $data); } + if ( ! isset($data['rows'])) + { + $data['rows'] = ''; + } + + if ( ! isset($data['cols'])) + { + $data['cols'] = ''; + } + // Use the value from $data if possible, or use $value $value = isset($data['value']) ? $data['value'] : $value; // Value is not part of the attributes unset($data['value']); - return ''.html::specialchars($value, $double_encode).''; + return ''.htmlspecialchars($value, ENT_QUOTES, Kohana::CHARSET, $double_encode).''; } /** @@ -283,21 +245,15 @@ class form_Core { // Inner key should always be a string $inner_key = (string) $inner_key; - $attr = array('value' => $inner_key); - if (in_array($inner_key, $selected)) { - $attr['selected'] = 'selected'; - } - $input .= ''."\n"; + $sel = in_array($inner_key, $selected) ? ' selected="selected"' : ''; + $input .= ''."\n"; } $input .= ''."\n"; } else { - $attr = array('value' => $key); - if (in_array($key, $selected)) { - $attr['selected'] = 'selected'; - } - $input .= ''."\n"; + $sel = in_array($key, $selected) ? ' selected="selected"' : ''; + $input .= ''."\n"; } } $input .= ''; @@ -416,20 +372,8 @@ class form_Core { { $value = arr::remove('value', $data); } - // $value must be ::purify - - return ''.html::purify($value).''; - } - /** - * Closes an open form tag. - * - * @param string string to be attached after the closing tag - * @return string - */ - public static function close($extra = '') - { - return ''."\n".$extra; + return ''.$value.''; } /** @@ -462,7 +406,7 @@ class form_Core { $text = ucwords(inflector::humanize($data['for'])); } - return ''.html::purify($text).''; + return ''.$text.''; } /** @@ -496,6 +440,7 @@ class form_Core { case 'image': case 'button': case 'submit': + case 'hidden': // Only specific types of inputs use name to id matching $attr['id'] = $attr['name']; break; @@ -546,4 +491,4 @@ class form_Core { return html::attributes(array_merge($sorted, $attr)); } -} // End form \ No newline at end of file +} // End form diff --git a/system/helpers/format.php b/system/helpers/format.php index fb8a0294..9351afda 100644 --- a/system/helpers/format.php +++ b/system/helpers/format.php @@ -2,15 +2,32 @@ /** * Format helper class. * - * $Id: format.php 4070 2009-03-11 20:37:38Z Geert $ + * $Id: format.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class format_Core { + /** + * Formats a number according to the current locale. + * + * @param float + * @param int|boolean number of fractional digits or TRUE to use the locale default + * @return string + */ + public static function number($number, $decimals = 0) + { + $locale = localeconv(); + + if ($decimals === TRUE) + return number_format($number, $locale['frac_digits'], $locale['decimal_point'], $locale['thousands_sep']); + + return number_format($number, $decimals, $locale['decimal_point'], $locale['thousands_sep']); + } + /** * Formats a phone number according to the specified format. * @@ -63,4 +80,35 @@ class format_Core { return $str; } + /** + * Normalizes a hexadecimal HTML color value. All values will be converted + * to lowercase, have a "#" prepended and contain six characters. + * + * @param string hexadecimal HTML color value + * @return string + */ + public static function color($str = '') + { + // Reject invalid values + if ( ! valid::color($str)) + return ''; + + // Convert to lowercase + $str = strtolower($str); + + // Prepend "#" + if ($str[0] !== '#') + { + $str = '#'.$str; + } + + // Expand short notation + if (strlen($str) === 4) + { + $str = '#'.$str[1].$str[1].$str[2].$str[2].$str[3].$str[3]; + } + + return $str; + } + } // End format \ No newline at end of file diff --git a/system/helpers/html.php b/system/helpers/html.php index 2c609567..2d759ac0 100644 --- a/system/helpers/html.php +++ b/system/helpers/html.php @@ -2,12 +2,12 @@ /** * HTML helper class. * - * $Id: html.php 4376 2009-06-01 11:40:39Z samsoir $ + * $Id: html.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class html_Core { @@ -21,46 +21,12 @@ class html_Core { * @param boolean encode existing entities * @return string */ - public static function specialchars($str, $double_encode = TRUE) + public static function chars($str, $double_encode = TRUE) { - // Force the string to be a string - $str = (string) $str; - - // Do encode existing HTML entities (default) - if ($double_encode === TRUE) - { - $str = htmlspecialchars($str, ENT_QUOTES, 'UTF-8'); - } - else - { - // Do not encode existing HTML entities - // From PHP 5.2.3 this functionality is built-in, otherwise use a regex - if (version_compare(PHP_VERSION, '5.2.3', '>=')) - { - $str = htmlspecialchars($str, ENT_QUOTES, 'UTF-8', FALSE); - } - else - { - $str = preg_replace('/&(?!(?:#\d++|[a-z]++);)/ui', '&', $str); - $str = str_replace(array('<', '>', '\'', '"'), array('<', '>', ''', '"'), $str); - } - } - - return $str; + // Return HTML entities using the Kohana charset + return htmlspecialchars($str, ENT_QUOTES, Kohana::CHARSET, $double_encode); } - /** - * Perform a html::specialchars() with additional URL specific encoding. - * - * @param string string to convert - * @param boolean encode existing entities - * @return string - */ - public static function specialurlencode($str, $double_encode = TRUE) - { - return str_replace(' ', '%20', html::specialchars($str, $double_encode)); - } - /** * Create HTML link anchors. * @@ -98,11 +64,11 @@ class html_Core { return // Parsed URL - '' // Title empty? Use the parsed URL - .($escape_title ? html::specialchars((($title === NULL) ? $site_url : $title), FALSE) : (($title === NULL) ? $site_url : $title)).''; + .($escape_title ? htmlspecialchars((($title === NULL) ? $site_url : $title), ENT_QUOTES, Kohana::CHARSET, FALSE) : (($title === NULL) ? $site_url : $title)).''; } /** @@ -118,44 +84,13 @@ class html_Core { { return // Base URL + URI = full URL - '' // Title empty? Use the filename part of the URI .(($title === NULL) ? end(explode('/', $file)) : $title) .''; } - /** - * Similar to anchor, but with the protocol parameter first. - * - * @param string link protocol - * @param string URI or URL to link to - * @param string link text - * @param array HTML anchor attributes - * @return string - */ - public static function panchor($protocol, $uri, $title = NULL, $attributes = FALSE) - { - return html::anchor($uri, $title, $attributes, $protocol); - } - - /** - * Create an array of anchors from an array of link/title pairs. - * - * @param array link/title pairs - * @return array - */ - public static function anchor_array(array $array) - { - $anchors = array(); - foreach ($array as $link => $title) - { - // Create list of anchors - $anchors[] = html::anchor($link, $title); - } - return $anchors; - } - /** * Generates an obfuscated version of an email address. * @@ -286,7 +221,7 @@ class html_Core { */ public static function stylesheet($style, $media = FALSE, $index = FALSE) { - return html::link($style, 'stylesheet', 'text/css', '.css', $media, $index); + return html::link($style, 'stylesheet', 'text/css', $media, $index); } /** @@ -295,12 +230,11 @@ class html_Core { * @param string|array filename * @param string|array relationship * @param string|array mimetype - * @param string specifies suffix of the file * @param string|array specifies on what device the document will be displayed * @param boolean include the index_page in the link * @return string */ - public static function link($href, $rel, $type, $suffix = FALSE, $media = FALSE, $index = FALSE) + public static function link($href, $rel, $type, $media = FALSE, $index = FALSE) { $compiled = ''; @@ -312,7 +246,7 @@ class html_Core { $_type = is_array($type) ? array_shift($type) : $type; $_media = is_array($media) ? array_shift($media) : $media; - $compiled .= html::link($_href, $_rel, $_type, $suffix, $_media, $index); + $compiled .= html::link($_href, $_rel, $_type, $_media, $index); } } else @@ -323,14 +257,6 @@ class html_Core { $href = url::base($index).$href; } - $length = strlen($suffix); - - if ( $length > 0 AND substr_compare($href, $suffix, -$length, $length, FALSE) !== 0) - { - // Add the defined suffix - $href .= $suffix; - } - $attr = array ( 'rel' => $rel, @@ -376,12 +302,6 @@ class html_Core { $script = url::base((bool) $index).$script; } - if (substr_compare($script, '.js', -3, 3, FALSE) !== 0) - { - // Add the javascript suffix - $script .= '.js'; - } - $compiled = ''; } @@ -437,7 +357,7 @@ class html_Core { $compiled = ''; foreach ($attrs as $key => $val) { - $compiled .= ' '.$key.'="'.html::specialchars($val).'"'; + $compiled .= ' '.$key.'="'.htmlspecialchars($val, ENT_QUOTES, Kohana::CHARSET).'"'; } return $compiled; diff --git a/system/helpers/inflector.php b/system/helpers/inflector.php index 1e4fee23..9bd281db 100644 --- a/system/helpers/inflector.php +++ b/system/helpers/inflector.php @@ -2,12 +2,12 @@ /** * Inflector helper class. * - * $Id: inflector.php 4072 2009-03-13 17:20:38Z jheathco $ + * $Id: inflector.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class inflector_Core { @@ -45,7 +45,27 @@ class inflector_Core { * @param integer number of things * @return string */ - public static function singular($str, $count = NULL) + public static function singular($str, $count = NULL) { + $parts = explode('_', $str); + + $last = inflector::_singular(array_pop($parts), $count); + + $pre = implode('_', $parts); + if (strlen($pre)) + $pre .= '_'; + + return $pre.$last; + } + + + /** + * Makes a plural word singular. + * + * @param string word to singularize + * @param integer number of things + * @return string + */ + public static function _singular($str, $count = NULL) { // Remove garbage $str = strtolower(trim($str)); @@ -103,6 +123,29 @@ class inflector_Core { * @return string */ public static function plural($str, $count = NULL) + { + if ( ! $str) + return $str; + + $parts = explode('_', $str); + + $last = inflector::_plural(array_pop($parts), $count); + + $pre = implode('_', $parts); + if (strlen($pre)) + $pre .= '_'; + + return $pre.$last; + } + + + /** + * Makes a singular word plural. + * + * @param string word to pluralize + * @return string + */ + public static function _plural($str, $count = NULL) { // Remove garbage $str = strtolower(trim($str)); @@ -154,6 +197,24 @@ class inflector_Core { return inflector::$cache[$key] = $str; } + /** + * Makes a word possessive. + * + * @param string word to to make possessive + * @return string + */ + public static function possessive($string) + { + $length = strlen($string); + + if (substr($string, $length - 1, $length) == 's') + { + return $string.'\''; + } + + return $string.'\'s'; + } + /** * Makes a phrase camel case. * @@ -176,7 +237,7 @@ class inflector_Core { */ public static function underscore($str) { - return preg_replace('/\s+/', '_', trim($str)); + return trim(preg_replace('/[\s_]+/', '_', $str), '_'); } /** @@ -187,7 +248,7 @@ class inflector_Core { */ public static function humanize($str) { - return preg_replace('/[_-]+/', ' ', trim($str)); + return trim(preg_replace('/[_-\s]+/', ' ', $str)); } } // End inflector \ No newline at end of file diff --git a/system/helpers/num.php b/system/helpers/num.php index 3eb5d5ac..42f13bec 100644 --- a/system/helpers/num.php +++ b/system/helpers/num.php @@ -2,12 +2,12 @@ /** * Number helper class. * - * $Id: num.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: num.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class num_Core { diff --git a/system/helpers/remote.php b/system/helpers/remote.php index f9e0267f..37995cdb 100644 --- a/system/helpers/remote.php +++ b/system/helpers/remote.php @@ -2,12 +2,12 @@ /** * Remote url/file helper. * - * $Id: remote.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: remote.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class remote_Core { @@ -35,7 +35,7 @@ class remote_Core { $CRLF = "\r\n"; // Send request - fwrite($remote, 'HEAD '.$url['path'].' HTTP/1.0'.$CRLF); + fwrite($remote, 'HEAD '.$url['path'].(isset($url['query']) ? '?'.$url['query'] : '').' HTTP/1.0'.$CRLF); fwrite($remote, 'Host: '.$url['host'].$CRLF); fwrite($remote, 'Connection: close'.$CRLF); fwrite($remote, 'User-Agent: Kohana Framework (+http://kohanaphp.com/)'.$CRLF); @@ -63,4 +63,4 @@ class remote_Core { return isset($response) ? $response : FALSE; } -} // End remote \ No newline at end of file +} // End remote diff --git a/system/helpers/request.php b/system/helpers/request.php index 4203d0e5..4770d64b 100644 --- a/system/helpers/request.php +++ b/system/helpers/request.php @@ -2,35 +2,48 @@ /** * Request helper class. * - * $Id: request.php 4355 2009-05-15 17:18:28Z kiall $ + * $Id: request.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class request_Core { // Possible HTTP methods protected static $http_methods = array('get', 'head', 'options', 'post', 'put', 'delete'); - // Content types from client's HTTP Accept request header (array) + // Character sets from client's HTTP Accept-Charset request header + protected static $accept_charsets; + + // Content codings from client's HTTP Accept-Encoding request header + protected static $accept_encodings; + + // Language tags from client's HTTP Accept-Language request header + protected static $accept_languages; + + // Content types from client's HTTP Accept request header protected static $accept_types; + // The current user agent and its parsed attributes + protected static $user_agent; + /** * Returns the HTTP referrer, or the default if the referrer is not set. * * @param mixed default to return + * @param bool Remove base URL * @return string */ - public static function referrer($default = FALSE) + public static function referrer($default = FALSE, $remove_base = FALSE) { if ( ! empty($_SERVER['HTTP_REFERER'])) { // Set referrer $ref = $_SERVER['HTTP_REFERER']; - if (strpos($ref, url::base(FALSE)) === 0) + if ($remove_base === TRUE AND (strpos($ref, url::base(FALSE)) === 0)) { // Remove the base URL from the referrer $ref = substr($ref, strlen(url::base(FALSE))); @@ -84,10 +97,59 @@ class request_Core { $method = strtolower($_SERVER['REQUEST_METHOD']); if ( ! in_array($method, request::$http_methods)) - throw new Kohana_Exception('request.unknown_method', $method); + throw new Kohana_Exception('Invalid request method :method:', array(':method:' => $method)); return $method; - } + } + + /** + * Retrieves current user agent information + * keys: browser, version, platform, mobile, robot + * + * @param string key + * @return mixed NULL or the parsed value + */ + public static function user_agent($key = 'agent') + { + // Retrieve raw user agent without parsing + if ($key === 'agent') + { + if (request::$user_agent === NULL) + return request::$user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? trim($_SERVER['HTTP_USER_AGENT']) : ''; + + if (is_array(request::$user_agent)) + return request::$user_agent['agent']; + + return request::$user_agent; + } + + if ( ! is_array(request::$user_agent)) + { + request::$user_agent['agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? trim($_SERVER['HTTP_USER_AGENT']) : ''; + + // Parse the user agent and extract basic information + foreach (Kohana::config('user_agents') as $type => $data) + { + foreach ($data as $fragment => $name) + { + if (stripos(request::$user_agent['agent'], $fragment) !== FALSE) + { + if ($type === 'browser' AND preg_match('|'.preg_quote($fragment).'[^0-9.]*+([0-9.][0-9.a-z]*)|i', request::$user_agent['agent'], $match)) + { + // Set the browser version + request::$user_agent['version'] = $match[1]; + } + + // Set the agent name + request::$user_agent[$type] = $name; + break; + } + } + } + } + + return isset(request::$user_agent[$key]) ? request::$user_agent[$key] : NULL; + } /** * Returns boolean of whether client accepts content type. @@ -98,7 +160,7 @@ class request_Core { */ public static function accepts($type = NULL, $explicit_check = FALSE) { - request::parse_accept_header(); + request::parse_accept_content_header(); if ($type === NULL) return request::$accept_types; @@ -106,6 +168,56 @@ class request_Core { return (request::accepts_at_quality($type, $explicit_check) > 0); } + /** + * Returns boolean indicating if the client accepts a charset + * + * @param string + * @return boolean + */ + public static function accepts_charset($charset = NULL) + { + request::parse_accept_charset_header(); + + if ($charset === NULL) + return request::$accept_charsets; + + return (request::accepts_charset_at_quality($charset) > 0); + } + + /** + * Returns boolean indicating if the client accepts an encoding + * + * @param string + * @param boolean set to TRUE to disable wildcard checking + * @return boolean + */ + public static function accepts_encoding($encoding = NULL, $explicit_check = FALSE) + { + request::parse_accept_encoding_header(); + + if ($encoding === NULL) + return request::$accept_encodings; + + return (request::accepts_encoding_at_quality($encoding, $explicit_check) > 0); + } + + /** + * Returns boolean indicating if the client accepts a language tag + * + * @param string language tag + * @param boolean set to TRUE to disable prefix and wildcard checking + * @return boolean + */ + public static function accepts_language($tag = NULL, $explicit_check = FALSE) + { + request::parse_accept_language_header(); + + if ($tag === NULL) + return request::$accept_languages; + + return (request::accepts_language_at_quality($tag, $explicit_check) > 0); + } + /** * Compare the q values for given array of content types and return the one with the highest value. * If items are found to have the same q value, the first one encountered in the given array wins. @@ -117,24 +229,103 @@ class request_Core { */ public static function preferred_accept($types, $explicit_check = FALSE) { - // Initialize - $mime_types = array(); $max_q = 0; $preferred = FALSE; - // Load q values for all given content types - foreach (array_unique($types) as $type) + foreach ($types as $type) + { + $q = request::accepts_at_quality($type, $explicit_check); + + if ($q > $max_q) + { + $max_q = $q; + $preferred = $type; + } + } + + return $preferred; + } + + /** + * Compare the q values for a given array of character sets and return the + * one with the highest value. If items are found to have the same q value, + * the first one encountered takes precedence. If all items in the given + * array have a q value of 0, FALSE is returned. + * + * @param array character sets + * @return mixed + */ + public static function preferred_charset($charsets) + { + $max_q = 0; + $preferred = FALSE; + + foreach ($charsets as $charset) + { + $q = request::accepts_charset_at_quality($charset); + + if ($q > $max_q) + { + $max_q = $q; + $preferred = $charset; + } + } + + return $preferred; + } + + /** + * Compare the q values for a given array of encodings and return the one with + * the highest value. If items are found to have the same q value, the first + * one encountered takes precedence. If all items in the given array have + * a q value of 0, FALSE is returned. + * + * @param array encodings + * @param boolean set to TRUE to disable wildcard checking + * @return mixed + */ + public static function preferred_encoding($encodings, $explicit_check = FALSE) + { + $max_q = 0; + $preferred = FALSE; + + foreach ($encodings as $encoding) { - $mime_types[$type] = request::accepts_at_quality($type, $explicit_check); + $q = request::accepts_encoding_at_quality($encoding, $explicit_check); + + if ($q > $max_q) + { + $max_q = $q; + $preferred = $encoding; + } } - // Look for the highest q value - foreach ($mime_types as $type => $q) + return $preferred; + } + + /** + * Compare the q values for a given array of language tags and return the + * one with the highest value. If items are found to have the same q value, + * the first one encountered takes precedence. If all items in the given + * array have a q value of 0, FALSE is returned. + * + * @param array language tags + * @param boolean set to TRUE to disable prefix and wildcard checking + * @return mixed + */ + public static function preferred_language($tags, $explicit_check = FALSE) + { + $max_q = 0; + $preferred = FALSE; + + foreach ($tags as $tag) { + $q = request::accepts_language_at_quality($tag, $explicit_check); + if ($q > $max_q) { $max_q = $q; - $preferred = $type; + $preferred = $tag; } } @@ -142,18 +333,18 @@ class request_Core { } /** - * Returns quality factor at which the client accepts content type. + * Returns quality factor at which the client accepts content type * * @param string content type (e.g. "image/jpg", "jpg") * @param boolean set to TRUE to disable wildcard checking * @return integer|float */ - public static function accepts_at_quality($type = NULL, $explicit_check = FALSE) + public static function accepts_at_quality($type, $explicit_check = FALSE) { - request::parse_accept_header(); + request::parse_accept_content_header(); // Normalize type - $type = strtolower((string) $type); + $type = strtolower($type); // General content type (e.g. "jpg") if (strpos($type, '/') === FALSE) @@ -178,62 +369,251 @@ class request_Core { if (isset(request::$accept_types[$type[0]][$type[1]])) return request::$accept_types[$type[0]][$type[1]]; - // Wildcard match (if not checking explicitly) - if ($explicit_check === FALSE AND isset(request::$accept_types[$type[0]]['*'])) - return request::$accept_types[$type[0]]['*']; + if ($explicit_check === FALSE) + { + // Wildcard match + if (isset(request::$accept_types[$type[0]]['*'])) + return request::$accept_types[$type[0]]['*']; - // Catch-all wildcard match (if not checking explicitly) - if ($explicit_check === FALSE AND isset(request::$accept_types['*']['*'])) - return request::$accept_types['*']['*']; + // Catch-all wildcard match + if (isset(request::$accept_types['*']['*'])) + return request::$accept_types['*']['*']; + } // Content type not accepted return 0; } /** - * Parses client's HTTP Accept request header, and builds array structure representing it. + * Returns quality factor at which the client accepts a charset + * + * @param string charset (e.g., "ISO-8859-1", "utf-8") + * @return integer|float + */ + public static function accepts_charset_at_quality($charset) + { + request::parse_accept_charset_header(); + + // Normalize charset + $charset = strtolower($charset); + + // Exact match + if (isset(request::$accept_charsets[$charset])) + return request::$accept_charsets[$charset]; + + if (isset(request::$accept_charsets['*'])) + return request::$accept_charsets['*']; + + if ($charset === 'iso-8859-1') + return 1; + + return 0; + } + + /** + * Returns quality factor at which the client accepts an encoding + * + * @param string encoding (e.g., "gzip", "deflate") + * @param boolean set to TRUE to disable wildcard checking + * @return integer|float + */ + public static function accepts_encoding_at_quality($encoding, $explicit_check = FALSE) + { + request::parse_accept_encoding_header(); + + // Normalize encoding + $encoding = strtolower($encoding); + + // Exact match + if (isset(request::$accept_encodings[$encoding])) + return request::$accept_encodings[$encoding]; + + if ($explicit_check === FALSE) + { + if (isset(request::$accept_encodings['*'])) + return request::$accept_encodings['*']; + + if ($encoding === 'identity') + return 1; + } + + return 0; + } + + /** + * Returns quality factor at which the client accepts a language + * + * @param string tag (e.g., "en", "en-us", "fr-ca") + * @param boolean set to TRUE to disable prefix and wildcard checking + * @return integer|float + */ + public static function accepts_language_at_quality($tag, $explicit_check = FALSE) + { + request::parse_accept_language_header(); + + $tag = explode('-', strtolower($tag), 2); + + if (isset(request::$accept_languages[$tag[0]])) + { + if (isset($tag[1])) + { + // Exact match + if (isset(request::$accept_languages[$tag[0]][$tag[1]])) + return request::$accept_languages[$tag[0]][$tag[1]]; + + // A prefix matches + if ($explicit_check === FALSE AND isset(request::$accept_languages[$tag[0]]['*'])) + return request::$accept_languages[$tag[0]]['*']; + } + else + { + // No subtags + if (isset(request::$accept_languages[$tag[0]]['*'])) + return request::$accept_languages[$tag[0]]['*']; + } + } + + if ($explicit_check === FALSE AND isset(request::$accept_languages['*'])) + return request::$accept_languages['*']; + + return 0; + } + + /** + * Parses a HTTP Accept or Accept-* header for q values * - * @return void + * @param string header data + * @return array + */ + protected static function parse_accept_header($header) + { + $result = array(); + + // Remove linebreaks and parse the HTTP Accept header + foreach (explode(',', str_replace(array("\r", "\n"), '', strtolower($header))) as $entry) + { + // Explode each entry in content type and possible quality factor + $entry = explode(';', trim($entry), 2); + + $q = (isset($entry[1]) AND preg_match('~\bq\s*+=\s*+([.0-9]+)~', $entry[1], $match)) ? (float) $match[1] : 1; + + // Overwrite entries with a smaller q value + if ( ! isset($result[$entry[0]]) OR $q > $result[$entry[0]]) + { + $result[$entry[0]] = $q; + } + } + + return $result; + } + + /** + * Parses a client's HTTP Accept-Charset header */ - protected static function parse_accept_header() + protected static function parse_accept_charset_header() { // Run this function just once - if (request::$accept_types !== NULL) + if (request::$accept_charsets !== NULL) return; - // Initialize accept_types array - request::$accept_types = array(); + // No HTTP Accept-Charset header found + if (empty($_SERVER['HTTP_ACCEPT_CHARSET'])) + { + // Accept everything + request::$accept_charsets['*'] = 1; + } + else + { + request::$accept_charsets = request::parse_accept_header($_SERVER['HTTP_ACCEPT_CHARSET']); + } + } + + /** + * Parses a client's HTTP Accept header + */ + protected static function parse_accept_content_header() + { + // Run this function just once + if (request::$accept_types !== NULL) + return; // No HTTP Accept header found if (empty($_SERVER['HTTP_ACCEPT'])) { // Accept everything request::$accept_types['*']['*'] = 1; - return; } - - // Remove linebreaks and parse the HTTP Accept header - foreach (explode(',', str_replace(array("\r", "\n"), '', $_SERVER['HTTP_ACCEPT'])) as $accept_entry) + else { - // Explode each entry in content type and possible quality factor - $accept_entry = explode(';', trim($accept_entry), 2); + request::$accept_types = array(); + + foreach (request::parse_accept_header($_SERVER['HTTP_ACCEPT']) as $type => $q) + { + // Explode each content type (e.g. "text/html") + $type = explode('/', $type, 2); + + // Skip invalid content types + if ( ! isset($type[1])) + continue; + + request::$accept_types[$type[0]][$type[1]] = $q; + } + } + } + + /** + * Parses a client's HTTP Accept-Encoding header + */ + protected static function parse_accept_encoding_header() + { + // Run this function just once + if (request::$accept_encodings !== NULL) + return; - // Explode each content type (e.g. "text/html") - $type = explode('/', $accept_entry[0], 2); + // No HTTP Accept-Encoding header found + if ( ! isset($_SERVER['HTTP_ACCEPT_ENCODING'])) + { + // Accept everything + request::$accept_encodings['*'] = 1; + } + elseif ($_SERVER['HTTP_ACCEPT_ENCODING'] === '') + { + // Accept only identity + request::$accept_encodings['identity'] = 1; + } + else + { + request::$accept_encodings = request::parse_accept_header($_SERVER['HTTP_ACCEPT_ENCODING']); + } + } - // Skip invalid content types - if ( ! isset($type[1])) - continue; + /** + * Parses a client's HTTP Accept-Language header + */ + protected static function parse_accept_language_header() + { + // Run this function just once + if (request::$accept_languages !== NULL) + return; - // Assume a default quality factor of 1 if no custom q value found - $q = (isset($accept_entry[1]) AND preg_match('~\bq\s*+=\s*+([.0-9]+)~', $accept_entry[1], $match)) ? (float) $match[1] : 1; + // No HTTP Accept-Language header found + if (empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) + { + // Accept everything + request::$accept_languages['*'] = 1; + } + else + { + request::$accept_languages = array(); - // Populate accept_types array - if ( ! isset(request::$accept_types[$type[0]][$type[1]]) OR $q > request::$accept_types[$type[0]][$type[1]]) + foreach (request::parse_accept_header($_SERVER['HTTP_ACCEPT_LANGUAGE']) as $tag => $q) { - request::$accept_types[$type[0]][$type[1]] = $q; + // Explode each language (e.g. "en-us") + $tag = explode('-', $tag, 2); + + request::$accept_languages[$tag[0]][isset($tag[1]) ? $tag[1] : '*'] = $q; } } } -} // End request \ No newline at end of file +} // End request diff --git a/system/helpers/security.php b/system/helpers/security.php index cd48d2e0..9eb82a58 100644 --- a/system/helpers/security.php +++ b/system/helpers/security.php @@ -2,12 +2,12 @@ /** * Security helper class. * - * $Id: security.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: security.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class security_Core { @@ -15,11 +15,12 @@ class security_Core { * Sanitize a string with the xss_clean method. * * @param string string to sanitize + * @param string xss_clean method to use ('htmlpurifier' or defaults to built-in method) * @return string */ - public static function xss_clean($str) + public static function xss_clean($str, $tool = NULL) { - return Input::instance()->xss_clean($str); + return Input::instance()->xss_clean($str, $tool); } /** diff --git a/system/helpers/text.php b/system/helpers/text.php index d0e573ec..66bcd243 100644 --- a/system/helpers/text.php +++ b/system/helpers/text.php @@ -2,12 +2,12 @@ /** * Text helper class. * - * $Id: text.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: text.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class text_Core { @@ -52,7 +52,7 @@ class text_Core { $limit = (int) $limit; - if (trim($str) === '' OR utf8::strlen($str) <= $limit) + if (trim($str) === '' OR mb_strlen($str) <= $limit) return $str; if ($limit <= 0) @@ -60,7 +60,7 @@ class text_Core { if ($preserve_words == FALSE) { - return rtrim(utf8::substr($str, 0, $limit)).$end_char; + return rtrim(mb_substr($str, 0, $limit)).$end_char; } preg_match('/^.{'.($limit - 1).'}\S*/us', $str, $matches); @@ -128,7 +128,7 @@ class text_Core { break; default: $pool = (string) $type; - $utf8 = ! utf8::is_ascii($pool); + $utf8 = ! text::is_ascii($pool); break; } @@ -183,7 +183,7 @@ class text_Core { * @param boolean replace words across word boundries (space, period, etc) * @return string */ - public static function censor($str, $badwords, $replacement = '#', $replace_partial_words = FALSE) + public static function censor($str, $badwords, $replacement = '#', $replace_partial_words = TRUE) { foreach ((array) $badwords as $key => $badword) { @@ -192,7 +192,7 @@ class text_Core { $regex = '('.implode('|', $badwords).')'; - if ($replace_partial_words == TRUE) + if ($replace_partial_words === FALSE) { // Just using \b isn't sufficient when we need to replace a badword that already contains word boundaries itself $regex = '(?<=\b|\s|^)'.$regex.'(?=\b|\s|$)'; @@ -200,10 +200,10 @@ class text_Core { $regex = '!'.$regex.'!ui'; - if (utf8::strlen($replacement) == 1) + if (mb_strlen($replacement) == 1) { $regex .= 'e'; - return preg_replace($regex, 'str_repeat($replacement, utf8::strlen(\'$1\'))', $str); + return preg_replace($regex, 'str_repeat($replacement, mb_strlen(\'$1\'))', $str); } return preg_replace($regex, $replacement, $str); @@ -235,15 +235,59 @@ class text_Core { } /** - * Converts text email addresses and anchors into links. + * An alternative to the php levenshtein() function that work out the + * distance between 2 words using the Damerau–Levenshtein algorithm. + * Credit: http://forums.devnetwork.net/viewtopic.php?f=50&t=89094 * - * @param string text to auto link - * @return string + * @see http://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance + * @param string first word + * @param string second word + * @return int distance between words */ - public static function auto_link($text) + public static function distance($string1, $string2) { - // Auto link emails first to prevent problems with "www.domain.com@example.com" - return text::auto_link_urls(text::auto_link_emails($text)); + $string1_length = strlen($string1); + $string2_length = strlen($string2); + + // Here we start building the table of values + $matrix = array(); + + // String1 length + 1 = rows. + for ($i = 0; $i <= $string1_length; ++$i) + { + $matrix[$i][0] = $i; + } + + // String2 length + 1 columns. + for ($j = 0; $j <= $string2_length; ++$j) + { + $matrix[0][$j] = $j; + } + + for ($i = 1; $i <= $string1_length; ++$i) + { + for ($j = 1; $j <= $string2_length; ++$j) + { + $cost = substr($string1, $i - 1, 1) == substr($string2, $j - 1, 1) ? 0 : 1; + + $matrix[$i][$j] = min( + $matrix[$i - 1][$j] + 1, // deletion + $matrix[$i][$j - 1] + 1, // insertion + $matrix[$i - 1][$j - 1] + $cost // substitution + ); + + if ($i > 1 && $j > 1 && (substr($string1, $i - 1, 1) == substr($string2, $j - 2, 1)) + && (substr($string1, $i - 2, 1) == substr($string2, $j - 1, 1))) + { + $matrix[$i][$j] = min( + $matrix[$i][$j], + $matrix[$i - 2][$j - 2] + $cost // transposition + ); + } + } + } + + return $matrix[$string1_length][$string2_length]; } /** @@ -304,9 +348,10 @@ class text_Core { * Automatically applies

    and
    markup to text. Basically nl2br() on steroids. * * @param string subject + * @param boolean convert single linebreaks to
    * @return string */ - public static function auto_p($str) + public static function auto_p($str, $br = TRUE) { // Trim whitespace if (($str = trim($str)) === '') @@ -343,7 +388,10 @@ class text_Core { } // Convert single linebreaks to
    - $str = preg_replace('~(?\n", $str); + if ($br === TRUE) + { + $str = preg_replace('~(?\n", $str); + } return $str; } @@ -368,13 +416,13 @@ class text_Core { // IEC prefixes (binary) if ($si == FALSE OR strpos($force_unit, 'i') !== FALSE) { - $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'); + $units = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB')); $mod = 1024; } // SI prefixes (decimal) else { - $units = array('B', 'kB', 'MB', 'GB', 'TB', 'PB'); + $units = array(__('B'), __('kB'), __('MB'), __('GB'), __('TB'), __('PB')); $mod = 1000; } @@ -407,4 +455,134 @@ class text_Core { return $str; } + /** + * Tests whether a string contains only 7bit ASCII bytes. This is used to + * determine when to use native functions or UTF-8 functions. + * + * @see http://sourceforge.net/projects/phputf8/ + * @copyright (c) 2007-2009 Kohana Team + * @copyright (c) 2005 Harry Fuecks + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + * + * @param string string to check + * @return bool + */ + public static function is_ascii($str) + { + return is_string($str) AND ! preg_match('/[^\x00-\x7F]/S', $str); + } + + /** + * Strips out device control codes in the ASCII range. + * + * @see http://sourceforge.net/projects/phputf8/ + * @copyright (c) 2007-2009 Kohana Team + * @copyright (c) 2005 Harry Fuecks + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + * + * @param string string to clean + * @return string + */ + public static function strip_ascii_ctrl($str) + { + return preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S', '', $str); + } + + /** + * Strips out all non-7bit ASCII bytes. + * + * @see http://sourceforge.net/projects/phputf8/ + * @copyright (c) 2007-2009 Kohana Team + * @copyright (c) 2005 Harry Fuecks + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + * + * @param string string to clean + * @return string + */ + public static function strip_non_ascii($str) + { + return preg_replace('/[^\x00-\x7F]+/S', '', $str); + } + + /** + * Replaces special/accented UTF-8 characters by ASCII-7 'equivalents'. + * + * @author Andreas Gohr + * @see http://sourceforge.net/projects/phputf8/ + * @copyright (c) 2007-2009 Kohana Team + * @copyright (c) 2005 Harry Fuecks + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + * + * @param string string to transliterate + * @param integer -1 lowercase only, +1 uppercase only, 0 both cases + * @return string + */ + public static function transliterate_to_ascii($str, $case = 0) + { + static $UTF8_LOWER_ACCENTS = NULL; + static $UTF8_UPPER_ACCENTS = NULL; + + if ($case <= 0) + { + if ($UTF8_LOWER_ACCENTS === NULL) + { + $UTF8_LOWER_ACCENTS = array( + 'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o', + 'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k', + 'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o', + 'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o', + 'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c', + 'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't', + 'ū' => 'u', 'č' => 'c', 'ö' => 'o', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l', + 'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z', + 'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't', + 'ŗ' => 'r', 'ä' => 'a', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'u', 'ò' => 'o', + 'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j', + 'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o', + 'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g', + 'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a', + 'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e', 'ı' => 'i', + ); + } + + $str = str_replace( + array_keys($UTF8_LOWER_ACCENTS), + array_values($UTF8_LOWER_ACCENTS), + $str + ); + } + + if ($case >= 0) + { + if ($UTF8_UPPER_ACCENTS === NULL) + { + $UTF8_UPPER_ACCENTS = array( + 'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O', + 'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K', 'Ĕ' => 'E', + 'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O', + 'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O', + 'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C', + 'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T', + 'Ū' => 'U', 'Č' => 'C', 'Ö' => 'O', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L', + 'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z', + 'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T', + 'Ŗ' => 'R', 'Ä' => 'A', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'U', 'Ò' => 'O', + 'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J', + 'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O', + 'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G', + 'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A', + 'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'İ' => 'I', + ); + } + + $str = str_replace( + array_keys($UTF8_UPPER_ACCENTS), + array_values($UTF8_UPPER_ACCENTS), + $str + ); + } + + return $str; + } + } // End text \ No newline at end of file diff --git a/system/helpers/upload.php b/system/helpers/upload.php index 422e9e8d..3aec2ac4 100644 --- a/system/helpers/upload.php +++ b/system/helpers/upload.php @@ -3,12 +3,12 @@ * Upload helper class for working with the global $_FILES * array and Validation library. * - * $Id: upload.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: upload.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class upload_Core { @@ -54,7 +54,7 @@ class upload_Core { } if ( ! is_writable($directory)) - throw new Kohana_Exception('upload.not_writable', $directory); + throw new Kohana_Exception('The upload destination folder, :dir:, does not appear to be writable.', array(':dir:' => $directory)); if (is_uploaded_file($file['tmp_name']) AND move_uploaded_file($file['tmp_name'], $filename = $directory.$filename)) { @@ -118,11 +118,8 @@ class upload_Core { // Get the default extension of the file $extension = strtolower(substr(strrchr($file['name'], '.'), 1)); - // Get the mime types for the extension - $mime_types = Kohana::config('mimes.'.$extension); - - // Make sure there is an extension, that the extension is allowed, and that mime types exist - return ( ! empty($extension) AND in_array($extension, $allowed_types) AND is_array($mime_types)); + // Make sure there is an extension and that the extension is allowed + return ( ! empty($extension) AND in_array($extension, $allowed_types)); } /** diff --git a/system/helpers/url.php b/system/helpers/url.php index 56f6db4b..6c2a6c66 100644 --- a/system/helpers/url.php +++ b/system/helpers/url.php @@ -2,12 +2,12 @@ /** * URL helper class. * - * $Id: url.php 4479 2009-07-23 04:51:22Z ixmatus $ + * $Id: url.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class url_Core { @@ -15,7 +15,7 @@ class url_Core { * Fetches the current URI. * * @param boolean include the query string - * @param boolean include the suffix + * @param boolean include the suffix * @return string */ public static function current($qs = FALSE, $suffix = FALSE) @@ -167,7 +167,7 @@ class url_Core { $separator = ($separator === '-') ? '-' : '_'; // Replace accented characters by their unaccented equivalents - $title = utf8::transliterate_to_ascii($title); + $title = text::transliterate_to_ascii($title); // Remove all characters that are not the separator, a-z, 0-9, or whitespace $title = preg_replace('/[^'.$separator.'a-z0-9\s]+/', '', strtolower($title)); diff --git a/system/helpers/utf8.php b/system/helpers/utf8.php new file mode 100644 index 00000000..20c6878c --- /dev/null +++ b/system/helpers/utf8.php @@ -0,0 +1,746 @@ + + * + * @param string input string + * @param string replacement string + * @param integer offset + * @return string + */ + public static function substr_replace($str, $replacement, $offset, $length = NULL) + { + if (text::is_ascii($str)) + return ($length === NULL) ? substr_replace($str, $replacement, $offset) : substr_replace($str, $replacement, $offset, $length); + + $length = ($length === NULL) ? mb_strlen($str) : (int) $length; + preg_match_all('/./us', $str, $str_array); + preg_match_all('/./us', $replacement, $replacement_array); + + array_splice($str_array[0], $offset, $length, $replacement_array[0]); + return implode('', $str_array[0]); + } + + /** + * Makes a UTF-8 string's first character uppercase. + * @see http://php.net/ucfirst + * + * @author Harry Fuecks + * + * @param string mixed case string + * @return string + */ + public static function ucfirst($str) + { + if (text::is_ascii($str)) + return ucfirst($str); + + preg_match('/^(.?)(.*)$/us', $str, $matches); + return mb_strtoupper($matches[1]).$matches[2]; + } + + /** + * Case-insensitive UTF-8 string comparison. + * @see http://php.net/strcasecmp + * + * @author Harry Fuecks + * + * @param string string to compare + * @param string string to compare + * @return integer less than 0 if str1 is less than str2 + * @return integer greater than 0 if str1 is greater than str2 + * @return integer 0 if they are equal + */ + public static function strcasecmp($str1, $str2) + { + if (text::is_ascii($str1) AND text::is_ascii($str2)) + return strcasecmp($str1, $str2); + + $str1 = mb_strtolower($str1); + $str2 = mb_strtolower($str2); + return strcmp($str1, $str2); + } + + /** + * Returns a string or an array with all occurrences of search in subject (ignoring case). + * replaced with the given replace value. + * @see http://php.net/str_ireplace + * + * @note It's not fast and gets slower if $search and/or $replace are arrays. + * @author Harry Fuecks $val) + { + $str[$key] = utf8::str_ireplace($search, $replace, $val, $count); + } + return $str; + } + + if (is_array($search)) + { + $keys = array_keys($search); + + foreach ($keys as $k) + { + if (is_array($replace)) + { + if (array_key_exists($k, $replace)) + { + $str = utf8::str_ireplace($search[$k], $replace[$k], $str, $count); + } + else + { + $str = utf8::str_ireplace($search[$k], '', $str, $count); + } + } + else + { + $str = utf8::str_ireplace($search[$k], $replace, $str, $count); + } + } + return $str; + } + + $search = mb_strtolower($search); + $str_lower = mb_strtolower($str); + + $total_matched_strlen = 0; + $i = 0; + + while (preg_match('/(.*?)'.preg_quote($search, '/').'/s', $str_lower, $matches)) + { + $matched_strlen = strlen($matches[0]); + $str_lower = substr($str_lower, $matched_strlen); + + $offset = $total_matched_strlen + strlen($matches[1]) + ($i * (strlen($replace) - 1)); + $str = substr_replace($str, $replace, $offset, strlen($search)); + + $total_matched_strlen += $matched_strlen; + $i++; + } + + $count += $i; + return $str; + } + + /** + * Case-insenstive UTF-8 version of strstr. Returns all of input string + * from the first occurrence of needle to the end. + * @see http://php.net/stristr + * + * @author Harry Fuecks + * + * @param string input string + * @param string needle + * @return string matched substring if found + * @return boolean FALSE if the substring was not found + */ + public static function stristr($str, $search) + { + if (text::is_ascii($str) AND text::is_ascii($search)) + return stristr($str, $search); + + if ($search == '') + return $str; + + $str_lower = mb_strtolower($str); + $search_lower = mb_strtolower($search); + + preg_match('/^(.*?)'.preg_quote($search, '/').'/s', $str_lower, $matches); + + if (isset($matches[1])) + return substr($str, strlen($matches[1])); + + return FALSE; + } + + /** + * Finds the length of the initial segment matching mask. + * @see http://php.net/strspn + * + * @author Harry Fuecks + * + * @param string input string + * @param string mask for search + * @param integer start position of the string to examine + * @param integer length of the string to examine + * @return integer length of the initial segment that contains characters in the mask + */ + public static function strspn($str, $mask, $offset = NULL, $length = NULL) + { + if ($str == '' OR $mask == '') + return 0; + + if (text::is_ascii($str) AND text::is_ascii($mask)) + return ($offset === NULL) ? strspn($str, $mask) : (($length === NULL) ? strspn($str, $mask, $offset) : strspn($str, $mask, $offset, $length)); + + if ($offset !== NULL OR $length !== NULL) + { + $str = mb_substr($str, $offset, $length); + } + + // Escape these characters: - [ ] . : \ ^ / + // The . and : are escaped to prevent possible warnings about POSIX regex elements + $mask = preg_replace('#[-[\].:\\\\^/]#', '\\\\$0', $mask); + preg_match('/^[^'.$mask.']+/u', $str, $matches); + + return isset($matches[0]) ? mb_strlen($matches[0]) : 0; + } + + /** + * Finds the length of the initial segment not matching mask. + * @see http://php.net/strcspn + * + * @author Harry Fuecks + * + * @param string input string + * @param string mask for search + * @param integer start position of the string to examine + * @param integer length of the string to examine + * @return integer length of the initial segment that contains characters not in the mask + */ + public static function strcspn($str, $mask, $offset = NULL, $length = NULL) + { + if ($str == '' OR $mask == '') + return 0; + + if (text::is_ascii($str) AND text::is_ascii($mask)) + return ($offset === NULL) ? strcspn($str, $mask) : (($length === NULL) ? strcspn($str, $mask, $offset) : strcspn($str, $mask, $offset, $length)); + + if ($str !== NULL OR $length !== NULL) + { + $str = mb_substr($str, $offset, $length); + } + + // Escape these characters: - [ ] . : \ ^ / + // The . and : are escaped to prevent possible warnings about POSIX regex elements + $mask = preg_replace('#[-[\].:\\\\^/]#', '\\\\$0', $mask); + preg_match('/^[^'.$mask.']+/u', $str, $matches); + + return isset($matches[0]) ? mb_strlen($matches[0]) : 0; + } + + /** + * Pads a UTF-8 string to a certain length with another string. + * @see http://php.net/str_pad + * + * @author Harry Fuecks + * + * @param string input string + * @param integer desired string length after padding + * @param string string to use as padding + * @param string padding type: STR_PAD_RIGHT, STR_PAD_LEFT, or STR_PAD_BOTH + * @return string + */ + public static function str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_RIGHT) + { + if (text::is_ascii($str) AND text::is_ascii($pad_str)) + { + return str_pad($str, $final_str_length, $pad_str, $pad_type); + } + + $str_length = mb_strlen($str); + + if ($final_str_length <= 0 OR $final_str_length <= $str_length) + { + return $str; + } + + $pad_str_length = mb_strlen($pad_str); + $pad_length = $final_str_length - $str_length; + + if ($pad_type == STR_PAD_RIGHT) + { + $repeat = ceil($pad_length / $pad_str_length); + return mb_substr($str.str_repeat($pad_str, $repeat), 0, $final_str_length); + } + + if ($pad_type == STR_PAD_LEFT) + { + $repeat = ceil($pad_length / $pad_str_length); + return mb_substr(str_repeat($pad_str, $repeat), 0, floor($pad_length)).$str; + } + + if ($pad_type == STR_PAD_BOTH) + { + $pad_length /= 2; + $pad_length_left = floor($pad_length); + $pad_length_right = ceil($pad_length); + $repeat_left = ceil($pad_length_left / $pad_str_length); + $repeat_right = ceil($pad_length_right / $pad_str_length); + + $pad_left = mb_substr(str_repeat($pad_str, $repeat_left), 0, $pad_length_left); + $pad_right = mb_substr(str_repeat($pad_str, $repeat_right), 0, $pad_length_left); + return $pad_left.$str.$pad_right; + } + + trigger_error('utf8::str_pad: Unknown padding type (' . $pad_type . ')', E_USER_ERROR); + } + + /** + * Converts a UTF-8 string to an array. + * @see http://php.net/str_split + * + * @author Harry Fuecks + * + * @param string input string + * @param integer maximum length of each chunk + * @return array + */ + public static function str_split($str, $split_length = 1) + { + $split_length = (int) $split_length; + + if (text::is_ascii($str)) + { + return str_split($str, $split_length); + } + + if ($split_length < 1) + { + return FALSE; + } + + if (mb_strlen($str) <= $split_length) + { + return array($str); + } + + preg_match_all('/.{'.$split_length.'}|[^\x00]{1,'.$split_length.'}$/us', $str, $matches); + + return $matches[0]; + } + + /** + * Reverses a UTF-8 string. + * @see http://php.net/strrev + * + * @author Harry Fuecks + * + * @param string string to be reversed + * @return string + */ + public static function strrev($str) + { + if (text::is_ascii($str)) + return strrev($str); + + preg_match_all('/./us', $str, $matches); + return implode('', array_reverse($matches[0])); + } + + /** + * Strips whitespace (or other UTF-8 characters) from the beginning and + * end of a string. + * @see http://php.net/trim + * + * @author Andreas Gohr + * + * @param string input string + * @param string string of characters to remove + * @return string + */ + public static function trim($str, $charlist = NULL) + { + if ($charlist === NULL) + return trim($str); + + return utf8::ltrim(utf8::rtrim($str, $charlist), $charlist); + } + + /** + * Strips whitespace (or other UTF-8 characters) from the beginning of a string. + * @see http://php.net/ltrim + * + * @author Andreas Gohr + * + * @param string input string + * @param string string of characters to remove + * @return string + */ + public static function ltrim($str, $charlist = NULL) + { + if ($charlist === NULL) + return ltrim($str); + + if (text::is_ascii($charlist)) + return ltrim($str, $charlist); + + $charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist); + + return preg_replace('/^['.$charlist.']+/u', '', $str); + } + + /** + * Strips whitespace (or other UTF-8 characters) from the end of a string. + * @see http://php.net/rtrim + * + * @author Andreas Gohr + * + * @param string input string + * @param string string of characters to remove + * @return string + */ + public static function rtrim($str, $charlist = NULL) + { + if ($charlist === NULL) + return rtrim($str); + + if (text::is_ascii($charlist)) + return rtrim($str, $charlist); + + $charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist); + + return preg_replace('/['.$charlist.']++$/uD', '', $str); + } + + /** + * Returns the unicode ordinal for a character. + * @see http://php.net/ord + * + * @author Harry Fuecks + * + * @param string UTF-8 encoded character + * @return integer + */ + public static function ord($chr) + { + $ord0 = ord($chr); + + if ($ord0 >= 0 AND $ord0 <= 127) + { + return $ord0; + } + + if ( ! isset($chr[1])) + { + trigger_error('Short sequence - at least 2 bytes expected, only 1 seen', E_USER_WARNING); + return FALSE; + } + + $ord1 = ord($chr[1]); + + if ($ord0 >= 192 AND $ord0 <= 223) + { + return ($ord0 - 192) * 64 + ($ord1 - 128); + } + + if ( ! isset($chr[2])) + { + trigger_error('Short sequence - at least 3 bytes expected, only 2 seen', E_USER_WARNING); + return FALSE; + } + + $ord2 = ord($chr[2]); + + if ($ord0 >= 224 AND $ord0 <= 239) + { + return ($ord0 - 224) * 4096 + ($ord1 - 128) * 64 + ($ord2 - 128); + } + + if ( ! isset($chr[3])) + { + trigger_error('Short sequence - at least 4 bytes expected, only 3 seen', E_USER_WARNING); + return FALSE; + } + + $ord3 = ord($chr[3]); + + if ($ord0 >= 240 AND $ord0 <= 247) + { + return ($ord0 - 240) * 262144 + ($ord1 - 128) * 4096 + ($ord2-128) * 64 + ($ord3 - 128); + } + + if ( ! isset($chr[4])) + { + trigger_error('Short sequence - at least 5 bytes expected, only 4 seen', E_USER_WARNING); + return FALSE; + } + + $ord4 = ord($chr[4]); + + if ($ord0 >= 248 AND $ord0 <= 251) + { + return ($ord0 - 248) * 16777216 + ($ord1-128) * 262144 + ($ord2 - 128) * 4096 + ($ord3 - 128) * 64 + ($ord4 - 128); + } + + if ( ! isset($chr[5])) + { + trigger_error('Short sequence - at least 6 bytes expected, only 5 seen', E_USER_WARNING); + return FALSE; + } + + if ($ord0 >= 252 AND $ord0 <= 253) + { + return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (ord($chr[5]) - 128); + } + + if ($ord0 >= 254 AND $ord0 <= 255) + { + trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0, E_USER_WARNING); + return FALSE; + } + } + + /** + * Takes an UTF-8 string and returns an array of ints representing the Unicode characters. + * Astral planes are supported i.e. the ints in the output can be > 0xFFFF. + * Occurrances of the BOM are ignored. Surrogates are not allowed. + * + * The Original Code is Mozilla Communicator client code. + * The Initial Developer of the Original Code is Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer. + * Ported to PHP by Henri Sivonen , see http://hsivonen.iki.fi/php-utf8/. + * Slight modifications to fit with phputf8 library by Harry Fuecks . + * + * @param string UTF-8 encoded string + * @return array unicode code points + * @return boolean FALSE if the string is invalid + */ + public static function to_unicode($str) + { + $mState = 0; // cached expected number of octets after the current octet until the beginning of the next UTF8 character sequence + $mUcs4 = 0; // cached Unicode character + $mBytes = 1; // cached expected number of octets in the current sequence + + $out = array(); + + $len = strlen($str); + + for ($i = 0; $i < $len; $i++) + { + $in = ord($str[$i]); + + if ($mState == 0) + { + // When mState is zero we expect either a US-ASCII character or a + // multi-octet sequence. + if (0 == (0x80 & $in)) + { + // US-ASCII, pass straight through. + $out[] = $in; + $mBytes = 1; + } + elseif (0xC0 == (0xE0 & $in)) + { + // First octet of 2 octet sequence + $mUcs4 = $in; + $mUcs4 = ($mUcs4 & 0x1F) << 6; + $mState = 1; + $mBytes = 2; + } + elseif (0xE0 == (0xF0 & $in)) + { + // First octet of 3 octet sequence + $mUcs4 = $in; + $mUcs4 = ($mUcs4 & 0x0F) << 12; + $mState = 2; + $mBytes = 3; + } + elseif (0xF0 == (0xF8 & $in)) + { + // First octet of 4 octet sequence + $mUcs4 = $in; + $mUcs4 = ($mUcs4 & 0x07) << 18; + $mState = 3; + $mBytes = 4; + } + elseif (0xF8 == (0xFC & $in)) + { + // First octet of 5 octet sequence. + // + // This is illegal because the encoded codepoint must be either + // (a) not the shortest form or + // (b) outside the Unicode range of 0-0x10FFFF. + // Rather than trying to resynchronize, we will carry on until the end + // of the sequence and let the later error handling code catch it. + $mUcs4 = $in; + $mUcs4 = ($mUcs4 & 0x03) << 24; + $mState = 4; + $mBytes = 5; + } + elseif (0xFC == (0xFE & $in)) + { + // First octet of 6 octet sequence, see comments for 5 octet sequence. + $mUcs4 = $in; + $mUcs4 = ($mUcs4 & 1) << 30; + $mState = 5; + $mBytes = 6; + } + else + { + // Current octet is neither in the US-ASCII range nor a legal first octet of a multi-octet sequence. + trigger_error('utf8::to_unicode: Illegal sequence identifier in UTF-8 at byte '.$i, E_USER_WARNING); + return FALSE; + } + } + else + { + // When mState is non-zero, we expect a continuation of the multi-octet sequence + if (0x80 == (0xC0 & $in)) + { + // Legal continuation + $shift = ($mState - 1) * 6; + $tmp = $in; + $tmp = ($tmp & 0x0000003F) << $shift; + $mUcs4 |= $tmp; + + // End of the multi-octet sequence. mUcs4 now contains the final Unicode codepoint to be output + if (0 == --$mState) + { + // Check for illegal sequences and codepoints + + // From Unicode 3.1, non-shortest form is illegal + if (((2 == $mBytes) AND ($mUcs4 < 0x0080)) OR + ((3 == $mBytes) AND ($mUcs4 < 0x0800)) OR + ((4 == $mBytes) AND ($mUcs4 < 0x10000)) OR + (4 < $mBytes) OR + // From Unicode 3.2, surrogate characters are illegal + (($mUcs4 & 0xFFFFF800) == 0xD800) OR + // Codepoints outside the Unicode range are illegal + ($mUcs4 > 0x10FFFF)) + { + trigger_error('utf8::to_unicode: Illegal sequence or codepoint in UTF-8 at byte '.$i, E_USER_WARNING); + return FALSE; + } + + if (0xFEFF != $mUcs4) + { + // BOM is legal but we don't want to output it + $out[] = $mUcs4; + } + + // Initialize UTF-8 cache + $mState = 0; + $mUcs4 = 0; + $mBytes = 1; + } + } + else + { + // ((0xC0 & (*in) != 0x80) AND (mState != 0)) + // Incomplete multi-octet sequence + trigger_error('utf8::to_unicode: Incomplete multi-octet sequence in UTF-8 at byte '.$i, E_USER_WARNING); + return FALSE; + } + } + } + + return $out; + } + + /** + * Takes an array of ints representing the Unicode characters and returns a UTF-8 string. + * Astral planes are supported i.e. the ints in the input can be > 0xFFFF. + * Occurrances of the BOM are ignored. Surrogates are not allowed. + * + * The Original Code is Mozilla Communicator client code. + * The Initial Developer of the Original Code is Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer. + * Ported to PHP by Henri Sivonen , see http://hsivonen.iki.fi/php-utf8/. + * Slight modifications to fit with phputf8 library by Harry Fuecks . + * + * @param array unicode code points representing a string + * @return string utf8 string of characters + * @return boolean FALSE if a code point cannot be found + */ + public static function from_unicode($arr) + { + ob_start(); + + $keys = array_keys($arr); + + foreach ($keys as $k) + { + // ASCII range (including control chars) + if (($arr[$k] >= 0) AND ($arr[$k] <= 0x007f)) + { + echo chr($arr[$k]); + } + // 2 byte sequence + elseif ($arr[$k] <= 0x07ff) + { + echo chr(0xc0 | ($arr[$k] >> 6)); + echo chr(0x80 | ($arr[$k] & 0x003f)); + } + // Byte order mark (skip) + elseif ($arr[$k] == 0xFEFF) + { + // nop -- zap the BOM + } + // Test for illegal surrogates + elseif ($arr[$k] >= 0xD800 AND $arr[$k] <= 0xDFFF) + { + // Found a surrogate + trigger_error('utf8::from_unicode: Illegal surrogate at index: '.$k.', value: '.$arr[$k], E_USER_WARNING); + return FALSE; + } + // 3 byte sequence + elseif ($arr[$k] <= 0xffff) + { + echo chr(0xe0 | ($arr[$k] >> 12)); + echo chr(0x80 | (($arr[$k] >> 6) & 0x003f)); + echo chr(0x80 | ($arr[$k] & 0x003f)); + } + // 4 byte sequence + elseif ($arr[$k] <= 0x10ffff) + { + echo chr(0xf0 | ($arr[$k] >> 18)); + echo chr(0x80 | (($arr[$k] >> 12) & 0x3f)); + echo chr(0x80 | (($arr[$k] >> 6) & 0x3f)); + echo chr(0x80 | ($arr[$k] & 0x3f)); + } + // Out of range + else + { + trigger_error('utf8::from_unicode: Codepoint out of Unicode range at index: '.$k.', value: '.$arr[$k], E_USER_WARNING); + return FALSE; + } + } + + $result = ob_get_contents(); + ob_end_clean(); + return $result; + } + +} // End utf8 \ No newline at end of file diff --git a/system/helpers/valid.php b/system/helpers/valid.php index 8a3583b2..cffcd7c0 100644 --- a/system/helpers/valid.php +++ b/system/helpers/valid.php @@ -2,12 +2,12 @@ /** * Validation helper class. * - * $Id: valid.php 4367 2009-05-27 21:23:57Z samsoir $ + * $Id: valid.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class valid_Core { @@ -161,13 +161,13 @@ class valid_Core { for ($i = $length - 1; $i >= 0; $i -= 2) { // Add up every 2nd digit, starting from the right - $checksum += $number[$i]; + $checksum += substr($number, $i, 1); } for ($i = $length - 2; $i >= 0; $i -= 2) { // Add up every 2nd digit doubled, starting from the right - $double = $number[$i] * 2; + $double = substr($number, $i, 1) * 2; // Subtract 9 from the double where value is greater than 10 $checksum += ($double >= 10) ? $double - 9 : $double; @@ -199,7 +199,7 @@ class valid_Core { /** * Tests if a string is a valid date string. - * + * * @param string date to check * @return boolean */ @@ -269,7 +269,7 @@ class valid_Core { * * @see Uses locale conversion to allow decimal point to be locale specific. * @see http://www.php.net/manual/en/function.localeconv.php - * + * * @param string input string * @return boolean */ @@ -281,21 +281,35 @@ class valid_Core { } /** - * Checks whether a string is a valid text. Letters, numbers, whitespace, - * dashes, periods, and underscores are allowed. + * Tests if an integer is within a range. * - * @param string text to check + * @param integer number to check + * @param array valid range of input * @return boolean */ - public static function standard_text($str) + public static function range($number, array $range) { - // pL matches letters - // pN matches numbers - // pZ matches whitespace - // pPc matches underscores - // pPd matches dashes - // pPo matches normal puncuation - return (bool) preg_match('/^[\pL\pN\pZ\p{Pc}\p{Pd}\p{Po}]++$/uD', (string) $str); + // Invalid by default + $status = FALSE; + + if (is_int($number) OR ctype_digit($number)) + { + if (count($range) > 1) + { + if ($number >= $range[0] AND $number <= $range[1]) + { + // Number is within the required range + $status = TRUE; + } + } + elseif ($number >= $range[0]) + { + // Number is greater than the minimum + $status = TRUE; + } + } + + return $status; } /** @@ -335,4 +349,18 @@ class valid_Core { return (bool) preg_match($pattern, (string) $str); } + /** + * Checks if a string is a proper hexadecimal HTML color value. The validation + * is quite flexible as it does not require an initial "#" and also allows for + * the short notation using only three instead of six hexadecimal characters. + * You may want to normalize these values with format::color(). + * + * @param string input string + * @return boolean + */ + public static function color($str) + { + return (bool) preg_match('/^#?+[0-9a-f]{3}(?:[0-9a-f]{3})?$/iD', $str); + } + } // End valid \ No newline at end of file diff --git a/system/i18n/en_US/cache.php b/system/i18n/en_US/cache.php deleted file mode 100644 index bef02793..00000000 --- a/system/i18n/en_US/cache.php +++ /dev/null @@ -1,10 +0,0 @@ - 'The %s group is not defined in your configuration.', - 'extension_not_loaded' => 'The %s PHP extension must be loaded to use this driver.', - 'unwritable' => 'The configured storage location, %s, is not writable.', - 'resources' => 'Caching of resources is impossible, because resources cannot be serialized.', - 'driver_error' => '%s', -); \ No newline at end of file diff --git a/system/i18n/en_US/calendar.php b/system/i18n/en_US/calendar.php deleted file mode 100644 index 21dad220..00000000 --- a/system/i18n/en_US/calendar.php +++ /dev/null @@ -1,59 +0,0 @@ - 'Su', - 'mo' => 'Mo', - 'tu' => 'Tu', - 'we' => 'We', - 'th' => 'Th', - 'fr' => 'Fr', - 'sa' => 'Sa', - - // Short day names - 'sun' => 'Sun', - 'mon' => 'Mon', - 'tue' => 'Tue', - 'wed' => 'Wed', - 'thu' => 'Thu', - 'fri' => 'Fri', - 'sat' => 'Sat', - - // Long day names - 'sunday' => 'Sunday', - 'monday' => 'Monday', - 'tuesday' => 'Tuesday', - 'wednesday' => 'Wednesday', - 'thursday' => 'Thursday', - 'friday' => 'Friday', - 'saturday' => 'Saturday', - - // Short month names - 'jan' => 'Jan', - 'feb' => 'Feb', - 'mar' => 'Mar', - 'apr' => 'Apr', - 'may' => 'May', - 'jun' => 'Jun', - 'jul' => 'Jul', - 'aug' => 'Aug', - 'sep' => 'Sep', - 'oct' => 'Oct', - 'nov' => 'Nov', - 'dec' => 'Dec', - - // Long month names - 'january' => 'January', - 'february' => 'February', - 'march' => 'March', - 'april' => 'April', - 'mayl' => 'May', - 'june' => 'June', - 'july' => 'July', - 'august' => 'August', - 'september' => 'September', - 'october' => 'October', - 'november' => 'November', - 'december' => 'December' -); \ No newline at end of file diff --git a/system/i18n/en_US/core.php b/system/i18n/en_US/core.php deleted file mode 100644 index 9711b7cd..00000000 --- a/system/i18n/en_US/core.php +++ /dev/null @@ -1,34 +0,0 @@ - 'There can be only one instance of Kohana per page request', - 'uncaught_exception' => 'Uncaught %s: %s in file %s on line %s', - 'invalid_method' => 'Invalid method %s called in %s', - 'invalid_property' => 'The %s property does not exist in the %s class.', - 'log_dir_unwritable' => 'The log directory is not writable: %s', - 'resource_not_found' => 'The requested %s, %s, could not be found', - 'invalid_filetype' => 'The requested filetype, .%s, is not allowed in your view configuration file', - 'view_set_filename' => 'You must set the the view filename before calling render', - 'no_default_route' => 'Please set a default route in config/routes.php', - 'no_controller' => 'Kohana was not able to determine a controller to process this request: %s', - 'page_not_found' => 'The page you requested, %s, could not be found.', - 'stats_footer' => 'Loaded in {execution_time} seconds, using {memory_usage} of memory. Generated by Kohana v{kohana_version}.', - 'error_file_line' => '%s [%s]:', - 'stack_trace' => 'Stack Trace', - 'generic_error' => 'Unable to Complete Request', - 'errors_disabled' => 'You can go to the home page or try again.', - - // Drivers - 'driver_implements' => 'The %s driver for the %s library must implement the %s interface', - 'driver_not_found' => 'The %s driver for the %s library could not be found', - - // Resource names - 'config' => 'config file', - 'controller' => 'controller', - 'helper' => 'helper', - 'library' => 'library', - 'driver' => 'driver', - 'model' => 'model', - 'view' => 'view', -); diff --git a/system/i18n/en_US/database.php b/system/i18n/en_US/database.php deleted file mode 100644 index 172e5c90..00000000 --- a/system/i18n/en_US/database.php +++ /dev/null @@ -1,15 +0,0 @@ - 'The %s group is not defined in your configuration.', - 'error' => 'There was an SQL error: %s', - 'connection' => 'There was an error connecting to the database: %s', - 'invalid_dsn' => 'The DSN you supplied is not valid: %s', - 'must_use_set' => 'You must set a SET clause for your query.', - 'must_use_where' => 'You must set a WHERE clause for your query.', - 'must_use_table' => 'You must set a database table for your query.', - 'table_not_found' => 'Table %s does not exist in your database.', - 'not_implemented' => 'The method you called, %s, is not supported by this driver.', - 'result_read_only' => 'Query results are read only.' -); \ No newline at end of file diff --git a/system/i18n/en_US/encrypt.php b/system/i18n/en_US/encrypt.php deleted file mode 100644 index 9afd6208..00000000 --- a/system/i18n/en_US/encrypt.php +++ /dev/null @@ -1,8 +0,0 @@ - 'The %s group is not defined in your configuration.', - 'requires_mcrypt' => 'To use the Encrypt library, mcrypt must be enabled in your PHP installation', - 'no_encryption_key' => 'To use the Encrypt library, you must set an encryption key in your config file' -); diff --git a/system/i18n/en_US/errors.php b/system/i18n/en_US/errors.php deleted file mode 100644 index 83341a2c..00000000 --- a/system/i18n/en_US/errors.php +++ /dev/null @@ -1,16 +0,0 @@ - array( 1, 'Framework Error', 'Please check the Kohana documentation for information about the following error.'), - E_PAGE_NOT_FOUND => array( 1, 'Page Not Found', 'The requested page was not found. It may have moved, been deleted, or archived.'), - E_DATABASE_ERROR => array( 1, 'Database Error', 'A database error occurred while performing the requested procedure. Please review the database error below for more information.'), - E_RECOVERABLE_ERROR => array( 1, 'Recoverable Error', 'An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'), - E_ERROR => array( 1, 'Fatal Error', ''), - E_USER_ERROR => array( 1, 'Fatal Error', ''), - E_PARSE => array( 1, 'Syntax Error', ''), - E_WARNING => array( 1, 'Warning Message', ''), - E_USER_WARNING => array( 1, 'Warning Message', ''), - E_STRICT => array( 2, 'Strict Mode Error', ''), - E_NOTICE => array( 2, 'Runtime Message', ''), -); \ No newline at end of file diff --git a/system/i18n/en_US/event.php b/system/i18n/en_US/event.php deleted file mode 100644 index 282a0a25..00000000 --- a/system/i18n/en_US/event.php +++ /dev/null @@ -1,7 +0,0 @@ - 'Attempt to attach invalid subject %s to %s failed: Subjects must extend the Event_Subject class', - 'invalid_observer' => 'Attempt to attach invalid observer %s to %s failed: Observers must extend the Event_Observer class', -); diff --git a/system/i18n/en_US/image.php b/system/i18n/en_US/image.php deleted file mode 100644 index 9f184930..00000000 --- a/system/i18n/en_US/image.php +++ /dev/null @@ -1,33 +0,0 @@ - 'The Image library requires the getimagesize() PHP function, which is not available in your installation.', - 'unsupported_method' => 'Your configured driver does not support the %s image transformation.', - 'file_not_found' => 'The specified image, %s, was not found. Please verify that images exist by using file_exists() before manipulating them.', - 'type_not_allowed' => 'The specified image, %s, is not an allowed image type.', - 'invalid_width' => 'The width you specified, %s, is not valid.', - 'invalid_height' => 'The height you specified, %s, is not valid.', - 'invalid_dimensions' => 'The dimensions specified for %s are not valid.', - 'invalid_master' => 'The master dimension specified is not valid.', - 'invalid_flip' => 'The flip direction specified is not valid.', - 'directory_unwritable' => 'The specified directory, %s, is not writable.', - - // ImageMagick specific messages - 'imagemagick' => array - ( - 'not_found' => 'The ImageMagick directory specified does not contain a required program, %s.', - ), - - // GraphicsMagick specific messages - 'graphicsmagick' => array - ( - 'not_found' => 'The GraphicsMagick directory specified does not contain a required program, %s.', - ), - - // GD specific messages - 'gd' => array - ( - 'requires_v2' => 'The Image library requires GD2. Please see http://php.net/gd_info for more information.', - ), -); diff --git a/system/i18n/en_US/orm.php b/system/i18n/en_US/orm.php deleted file mode 100644 index 3c5720bc..00000000 --- a/system/i18n/en_US/orm.php +++ /dev/null @@ -1,3 +0,0 @@ - 'Benchmarks', - 'post_data' => 'Post Data', - 'no_post' => 'No post data', - 'session_data' => 'Session Data', - 'no_session' => 'No session data', - 'queries' => 'Database Queries', - 'no_queries' => 'No queries', - 'no_database' => 'Database not loaded', - 'cookie_data' => 'Cookie Data', - 'no_cookie' => 'No cookie data', -); diff --git a/system/i18n/en_US/session.php b/system/i18n/en_US/session.php deleted file mode 100644 index ee781c65..00000000 --- a/system/i18n/en_US/session.php +++ /dev/null @@ -1,6 +0,0 @@ - 'The session_name, %s, is invalid. It must contain only alphanumeric characters and underscores. Also at least one letter must be present.', -); \ No newline at end of file diff --git a/system/i18n/en_US/upload.php b/system/i18n/en_US/upload.php deleted file mode 100644 index 7f6e216d..00000000 --- a/system/i18n/en_US/upload.php +++ /dev/null @@ -1,6 +0,0 @@ - 'The upload destination folder, %s, does not appear to be writable.', -); \ No newline at end of file diff --git a/system/i18n/en_US/validation.php b/system/i18n/en_US/validation.php deleted file mode 100644 index d98e548f..00000000 --- a/system/i18n/en_US/validation.php +++ /dev/null @@ -1,41 +0,0 @@ - 'Invalid validation rule used: %s', - 'i18n_array' => 'The %s i18n key must be an array to be used with the in_lang rule', - 'not_callable' => 'Callback %s used for Validation is not callable', - - // General errors - 'unknown_error' => 'Unknown validation error while validating the %s field.', - 'required' => 'The %s field is required.', - 'min_length' => 'The %s field must be at least %d characters long.', - 'max_length' => 'The %s field must be %d characters or fewer.', - 'exact_length' => 'The %s field must be exactly %d characters.', - 'in_array' => 'The %s field must be selected from the options listed.', - 'matches' => 'The %s field must match the %s field.', - 'valid_url' => 'The %s field must contain a valid URL.', - 'valid_email' => 'The %s field must contain a valid email address.', - 'valid_ip' => 'The %s field must contain a valid IP address.', - 'valid_type' => 'The %s field must only contain %s characters.', - 'range' => 'The %s field must be between specified ranges.', - 'regex' => 'The %s field does not match accepted input.', - 'depends_on' => 'The %s field depends on the %s field.', - - // Upload errors - 'user_aborted' => 'The %s file was aborted during upload.', - 'invalid_type' => 'The %s file is not an allowed file type.', - 'max_size' => 'The %s file you uploaded was too large. The maximum size allowed is %s.', - 'max_width' => 'The %s file you uploaded was too big. The maximum allowed width is %spx.', - 'max_height' => 'The %s file you uploaded was too big. The maximum allowed height is %spx.', - 'min_width' => 'The %s file you uploaded was too small. The minimum allowed width is %spx.', - 'min_height' => 'The %s file you uploaded was too small. The minimum allowed height is %spx.', - - // Field types - 'alpha' => 'alphabetical', - 'alpha_numeric' => 'alphabetical and numeric', - 'alpha_dash' => 'alphabetical, dash, and underscore', - 'digit' => 'digit', - 'numeric' => 'numeric', -); diff --git a/system/libraries/Cache.php b/system/libraries/Cache.php index 8a02a905..2ed344fa 100644 --- a/system/libraries/Cache.php +++ b/system/libraries/Cache.php @@ -4,20 +4,17 @@ * resources. Caches are identified by a unique string. Tagging of caches is * also supported, and caches can be found and deleted by id or tag. * - * $Id: Cache.php 4321 2009-05-04 01:39:44Z kiall $ + * $Id: Cache.php 4605 2009-09-14 17:22:21Z kiall $ * * @package Cache * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Cache_Core { protected static $instances = array(); - // For garbage collection - protected static $loaded; - // Configuration protected $config; @@ -55,7 +52,7 @@ class Cache_Core { // Test the config group name if (($config = Kohana::config('cache.'.$config)) === NULL) - throw new Kohana_Exception('cache.undefined_group', $name); + throw new Kohana_Exception('The :group: group is not defined in your configuration.', array(':group:' => $name)); } if (is_array($config)) @@ -77,132 +74,98 @@ class Cache_Core { // Load the driver if ( ! Kohana::auto_load($driver)) - throw new Kohana_Exception('core.driver_not_found', $this->config['driver'], get_class($this)); + throw new Kohana_Exception('The :driver: driver for the :class: library could not be found', + array(':driver:' => $this->config['driver'], ':class:' => get_class($this))); // Initialize the driver $this->driver = new $driver($this->config['params']); // Validate the driver if ( ! ($this->driver instanceof Cache_Driver)) - throw new Kohana_Exception('core.driver_implements', $this->config['driver'], get_class($this), 'Cache_Driver'); - - Kohana::log('debug', 'Cache Library initialized'); - - if (Cache::$loaded !== TRUE) - { - $this->config['requests'] = (int) $this->config['requests']; - - if ($this->config['requests'] > 0 AND mt_rand(1, $this->config['requests']) === 1) - { - // Do garbage collection - $this->driver->delete_expired(); + throw new Kohana_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('debug', 'Cache: Expired caches deleted.'); - } - - // Cache has been loaded once - Cache::$loaded = TRUE; - } + Kohana_Log::add('debug', 'Cache Library initialized'); } /** - * Fetches a cache by id. NULL is returned when a cache item is not found. - * - * @param string cache id - * @return mixed cached data or NULL + * Set cache items */ - public function get($id) + public function set($key, $value = NULL, $tags = NULL, $lifetime = NULL) { - // Sanitize the ID - $id = $this->sanitize_id($id); + if ($lifetime === NULL) + { + $lifetime = $this->config['lifetime']; + } - return $this->driver->get($id); - } + if ( ! is_array($key)) + { + $key = array($key => $value); + } - /** - * Fetches all of the caches for a given tag. An empty array will be - * returned when no matching caches are found. - * - * @param string cache tag - * @return array all cache items matching the tag - */ - public function find($tag) - { - return $this->driver->find($tag); + return $this->driver->set($key, $tags, $lifetime); } /** - * Set a cache item by id. Tags may also be added and a custom lifetime - * can be set. Non-string data is automatically serialized. - * - * @param string unique cache id - * @param mixed data to cache - * @param array|string tags for this item - * @param integer number of seconds until the cache expires - * @return boolean + * Get a cache items by key */ - function set($id, $data, $tags = NULL, $lifetime = NULL) + public function get($keys) { - if (is_resource($data)) - throw new Kohana_Exception('cache.resources'); - - // Sanitize the ID - $id = $this->sanitize_id($id); + $single = FALSE; - if ($lifetime === NULL) + if ( ! is_array($keys)) { - // Get the default lifetime - $lifetime = $this->config['lifetime']; + $keys = array($keys); + $single = TRUE; } - return $this->driver->set($id, $data, (array) $tags, $lifetime); + return $this->driver->get($keys, $single); } /** - * Delete a cache item by id. - * - * @param string cache id - * @return boolean + * Get cache items by tags */ - public function delete($id) + public function get_tag($tags) { - // Sanitize the ID - $id = $this->sanitize_id($id); + if ( ! is_array($tags)) + { + $tags = array($tags); + } - return $this->driver->delete($id); + return $this->driver->get_tag($tags); } /** - * Delete all cache items with a given tag. - * - * @param string cache tag name - * @return boolean + * Delete cache item by key */ - public function delete_tag($tag) + public function delete($keys) { - return $this->driver->delete($tag, TRUE); + if ( ! is_array($keys)) + { + $keys = array($keys); + } + + return $this->driver->delete($keys); } /** - * Delete ALL cache items items. - * - * @return boolean + * Delete cache items by tag */ - public function delete_all() + public function delete_tag($tags) { - return $this->driver->delete(TRUE); + if ( ! is_array($tags)) + { + $tags = array($tags); + } + + return $this->driver->delete_tag($tags); } /** - * Replaces troublesome characters with underscores. - * - * @param string cache id - * @return string + * Empty the cache */ - protected function sanitize_id($id) + public function delete_all() { - // Change slashes and spaces to underscores - return str_replace(array('/', '\\', ' '), '_', $id); + return $this->driver->delete_all(); } - -} // End Cache +} // End Cache Library \ No newline at end of file diff --git a/system/libraries/Cache_Exception.php b/system/libraries/Cache_Exception.php new file mode 100644 index 00000000..040d086d --- /dev/null +++ b/system/libraries/Cache_Exception.php @@ -0,0 +1,12 @@ + TRUE, - 'persistent' => FALSE, - 'connection' => '', - 'character_set' => 'utf8', - 'table_prefix' => '', - 'object' => TRUE, - 'cache' => FALSE, - 'escape' => TRUE, - ); - - // Database driver object - protected $driver; - protected $link; - - // Un-compiled parts of the SQL query - protected $select = array(); - protected $set = array(); - protected $from = array(); - protected $join = array(); - protected $where = array(); - protected $orderby = array(); - protected $order = array(); - protected $groupby = array(); - protected $having = array(); - protected $distinct = FALSE; - protected $limit = FALSE; - protected $offset = FALSE; - protected $last_query = ''; - - // Stack of queries for push/pop - protected $query_history = array(); + // Last execute query + protected $last_query; + + // Configuration array + protected $config; + + // Required configuration keys + protected $config_required = array(); + + // Raw server connection + protected $connection; + + // Cache (Cache object for cross-request, array for per-request) + protected $cache; + + // Quote character to use for identifiers (tables/columns/aliases) + protected $quote = '"'; /** * Returns a singleton instance of Database. * - * @param mixed configuration array or DSN + * @param string Database name * @return Database_Core */ - public static function & instance($name = 'default', $config = NULL) + public static function instance($name = 'default') { if ( ! isset(Database::$instances[$name])) { - // Create a new instance - Database::$instances[$name] = new Database($config === NULL ? $name : $config); + // Load the configuration for this database group + $config = Kohana::config('database.'.$name); + + if (is_string($config['connection'])) + { + // Parse the DSN into connection array + $config['connection'] = Database::parse_dsn($config['connection']); + } + + // Set the driver class name + $driver = 'Database_'.ucfirst($config['connection']['type']); + + // Create the database connection instance + Database::$instances[$name] = new $driver($config); } return Database::$instances[$name]; } /** - * Returns the name of a given database instance. + * Constructs a new Database object * - * @param Database instance of Database - * @return string + * @param array Database config array + * @return Database_Core */ - public static function instance_name(Database $db) + protected function __construct(array $config) + { + // Store the config locally + $this->config = $config; + + if ($this->config['cache'] !== FALSE) + { + if (is_string($this->config['cache'])) + { + // Use Cache library + $this->cache = new Cache($this->config['cache']); + } + elseif ($this->config['cache'] === TRUE) + { + // Use array + $this->cache = array(); + } + } + } + + public function __destruct() { - return array_search($db, Database::$instances, TRUE); + $this->disconnect(); } /** - * Sets up the database configuration, loads the Database_Driver. + * Connects to the database + * + * @return void + */ + abstract public function connect(); + + /** + * Disconnects from the database + * + * @return void + */ + abstract public function disconnect(); + + /** + * Sets the character set + * + * @return void + */ + abstract public function set_charset($charset); + + /** + * Executes the query + * + * @param string SQL + * @return Database_Result + */ + abstract public function query_execute($sql); + + /** + * Escapes the given value + * + * @param mixed Value + * @return mixed Escaped value + */ + abstract public function escape($value); + + /** + * List constraints for the given table + * + * @param string Table name + * @return array + */ + abstract public function list_constraints($table); + + /** + * List fields for the given table + * + * @param string Table name + * @return array + */ + abstract public function list_fields($table); + + /** + * List tables for the given connection (checks for prefix) + * + * @return array + */ + abstract public function list_tables(); + + /** + * Converts the given DSN string to an array of database connection components * - * @throws Kohana_Database_Exception + * @param string DSN string + * @return array */ - public function __construct($config = array()) + public static function parse_dsn($dsn) { - if (empty($config)) + $db = array + ( + 'type' => FALSE, + 'user' => FALSE, + 'pass' => FALSE, + 'host' => FALSE, + 'port' => FALSE, + 'socket' => FALSE, + 'database' => FALSE + ); + + // Get the protocol and arguments + list ($db['type'], $connection) = explode('://', $dsn, 2); + + if ($connection[0] === '/') { - // Load the default group - $config = Kohana::config('database.default'); + // Strip leading slash + $db['database'] = substr($connection, 1); } - elseif (is_array($config) AND count($config) > 0) + else { - if ( ! array_key_exists('connection', $config)) + $connection = parse_url('http://'.$connection); + + if (isset($connection['user'])) { - $config = array('connection' => $config); + $db['user'] = $connection['user']; } - } - elseif (is_string($config)) - { - // The config is a DSN string - if (strpos($config, '://') !== FALSE) + + if (isset($connection['pass'])) { - $config = array('connection' => $config); + $db['pass'] = $connection['pass']; } - // The config is a group name - else - { - $name = $config; - // Test the config group name - if (($config = Kohana::config('database.'.$config)) === NULL) - throw new Kohana_Database_Exception('database.undefined_group', $name); + if (isset($connection['port'])) + { + $db['port'] = $connection['port']; } - } - // Merge the default config with the passed config - $this->config = array_merge($this->config, $config); - - if (is_string($this->config['connection'])) - { - // Make sure the connection is valid - if (strpos($this->config['connection'], '://') === FALSE) - throw new Kohana_Database_Exception('database.invalid_dsn', $this->config['connection']); - - // Parse the DSN, creating an array to hold the connection parameters - $db = array - ( - 'type' => FALSE, - 'user' => FALSE, - 'pass' => FALSE, - 'host' => FALSE, - 'port' => FALSE, - 'socket' => FALSE, - 'database' => FALSE - ); - - // Get the protocol and arguments - list ($db['type'], $connection) = explode('://', $this->config['connection'], 2); - - if (strpos($connection, '@') !== FALSE) + if (isset($connection['host'])) { - // Get the username and password - list ($db['pass'], $connection) = explode('@', $connection, 2); - // Check if a password is supplied - $logindata = explode(':', $db['pass'], 2); - $db['pass'] = (count($logindata) > 1) ? $logindata[1] : ''; - $db['user'] = $logindata[0]; - - // Prepare for finding the database - $connection = explode('/', $connection); - - // Find the database name - $db['database'] = array_pop($connection); - - // Reset connection string - $connection = implode('/', $connection); - - // Find the socket - if (preg_match('/^unix\([^)]++\)/', $connection)) + if ($connection['host'] === 'unix(') { - // This one is a little hairy: we explode based on the end of - // the socket, removing the 'unix(' from the connection string - list ($db['socket'], $connection) = explode(')', substr($connection, 5), 2); - } - elseif (strpos($connection, ':') !== FALSE) - { - // Fetch the host and port name - list ($db['host'], $db['port']) = explode(':', $connection, 2); + list($db['socket'], $connection['path']) = explode(')', $connection['path'], 2); } else { - $db['host'] = $connection; + $db['host'] = $connection['host']; } } - else - { - // File connection - $connection = explode('/', $connection); - // Find database file name - $db['database'] = array_pop($connection); - - // Find database directory name - $db['socket'] = implode('/', $connection).'/'; + if (isset($connection['path']) AND $connection['path']) + { + // Strip leading slash + $db['database'] = substr($connection['path'], 1); } - - // Reset the connection array to the database config - $this->config['connection'] = $db; } - // Set driver name - $driver = 'Database_'.ucfirst($this->config['connection']['type']).'_Driver'; - - // Load the driver - if ( ! Kohana::auto_load($driver)) - throw new Kohana_Database_Exception('core.driver_not_found', $this->config['connection']['type'], get_class($this)); - // Initialize the driver - $this->driver = new $driver($this->config); - - // Validate the driver - if ( ! ($this->driver instanceof Database_Driver)) - throw new Kohana_Database_Exception('core.driver_implements', $this->config['connection']['type'], get_class($this), 'Database_Driver'); - - Kohana::log('debug', 'Database Library initialized'); + return $db; } /** - * Simple connect method to get the database queries up and running. + * Returns the last executed query for this database * - * @return void + * @return string */ - public function connect() + public function last_query() { - // A link can be a resource or an object - if ( ! is_resource($this->link) AND ! is_object($this->link)) - { - $this->link = $this->driver->connect(); - if ( ! is_resource($this->link) AND ! is_object($this->link)) - throw new Kohana_Database_Exception('database.connection', $this->driver->show_error()); - - // Clear password after successful connect - $this->config['connection']['pass'] = NULL; - } + return $this->last_query; } /** - * Runs a query into the driver and returns the result. + * Executes the given query, returning the cached version if enabled * - * @param string SQL query to execute - * @return Database_Result + * @param string SQL query + * @return Database_Result */ - public function query($sql = '') + public function query($sql) { - if ($sql == '') return FALSE; - - // No link? Connect! - $this->link or $this->connect(); - // Start the benchmark $start = microtime(TRUE); - if (func_num_args() > 1) //if we have more than one argument ($sql) + if (is_array($this->cache)) { - $argv = func_get_args(); - $binds = (is_array(next($argv))) ? current($argv) : array_slice($argv, 1); - } + $hash = $this->query_hash($sql); + + if (isset($this->cache[$hash])) + { + // Use cached result + $result = $this->cache[$hash]; - // Compile binds if needed - if (isset($binds)) + // It's from cache + $sql .= ' [CACHE]'; + } + else + { + // No cache, execute query and store in cache + $result = $this->cache[$hash] = $this->query_execute($sql); + } + } + else { - $sql = $this->compile_binds($sql, $binds); + // Execute the query, cache is off + $result = $this->query_execute($sql); } - // Fetch the result - $result = $this->driver->query($this->last_query = $sql); - // Stop the benchmark $stop = microtime(TRUE); - if ($this->config['benchmark'] == TRUE) + if ($this->config['benchmark'] === TRUE) { // Benchmark the query Database::$benchmarks[] = array('query' => $sql, 'time' => $stop - $start, 'rows' => count($result)); @@ -271,1187 +285,358 @@ class Database_Core { } /** - * Selects the column names for a database query. + * Performs the query on the cache (and caches it if it's not found) * - * @param string string or array of column names to select - * @return Database_Core This Database object. + * @param string query + * @param int time-to-live (NULL for Cache default) + * @return Database_Cache_Result */ - public function select($sql = '*') + public function query_cache($sql, $ttl) { - if (func_num_args() > 1) + if ( ! $this->cache instanceof Cache) { - $sql = func_get_args(); + throw new Database_Exception('Database :name has not been configured to use the Cache library.'); } - elseif (is_string($sql)) + + // Start the benchmark + $start = microtime(TRUE); + + $hash = $this->query_hash($sql); + + if (($data = $this->cache->get($hash)) !== NULL) { - $sql = explode(',', $sql); + // Found in cache, create result + $result = new Database_Cache_Result($data, $sql, $this->config['object']); + + // It's from the cache + $sql .= ' [CACHE]'; } else { - $sql = (array) $sql; - } - - foreach ($sql as $val) - { - if (($val = trim($val)) === '') continue; + // Run the query and return the full array of rows + $data = $this->query_execute($sql)->as_array(TRUE); - if (strpos($val, '(') === FALSE AND $val !== '*') - { - if (preg_match('/^DISTINCT\s++(.+)$/i', $val, $matches)) - { - // Only prepend with table prefix if table name is specified - $val = (strpos($matches[1], '.') !== FALSE) ? $this->config['table_prefix'].$matches[1] : $matches[1]; + // Set the Cache + $this->cache->set($hash, $data, NULL, $ttl); - $this->distinct = TRUE; - } - else - { - $val = (strpos($val, '.') !== FALSE) ? $this->config['table_prefix'].$val : $val; - } + // Create result + $result = new Database_Cache_Result($data, $sql, $this->config['object']); + } - $val = $this->driver->escape_column($val); - } + // Stop the benchmark + $stop = microtime(TRUE); - $this->select[] = $val; + if ($this->config['benchmark'] === TRUE) + { + // Benchmark the query + Database::$benchmarks[] = array('query' => $sql, 'time' => $stop - $start, 'rows' => count($result)); } - return $this; + return $result; } /** - * Selects the from table(s) for a database query. + * Generates a hash for the given query * - * @param string string or array of tables to select - * @return Database_Core This Database object. + * @param string SQL query string + * @return string */ - public function from($sql) + protected function query_hash($sql) { - if (func_num_args() > 1) - { - $sql = func_get_args(); - } - elseif (is_string($sql)) - { - $sql = explode(',', $sql); - } - else - { - $sql = array($sql); - } - - foreach ($sql as $val) - { - if (is_string($val)) - { - if (($val = trim($val)) === '') continue; - - // TODO: Temporary solution, this should be moved to database driver (AS is checked for twice) - if (stripos($val, ' AS ') !== FALSE) - { - $val = str_ireplace(' AS ', ' AS ', $val); - - list($table, $alias) = explode(' AS ', $val); - - // Attach prefix to both sides of the AS - $val = $this->config['table_prefix'].$table.' AS '.$this->config['table_prefix'].$alias; - } - else - { - $val = $this->config['table_prefix'].$val; - } - } - - $this->from[] = $val; - } - - return $this; + return sha1(str_replace("\n", ' ', trim($sql))); } /** - * Generates the JOIN portion of the query. + * Clears the internal query cache. * - * @param string table name - * @param string|array where key or array of key => value pairs - * @param string where value - * @param string type of join - * @return Database_Core This Database object. + * @param mixed clear cache by SQL statement, NULL for all, or TRUE for last query + * @return Database */ - public function join($table, $key, $value = NULL, $type = '') + public function clear_cache($sql = NULL) { - $join = array(); - - if ( ! empty($type)) + if ($this->cache instanceof Cache) { - $type = strtoupper(trim($type)); - - if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE)) + // Using cross-request Cache library + if ($sql === TRUE) + { + $this->cache->delete($this->query_hash($this->last_query)); + } + elseif (is_string($sql)) { - $type = ''; + $this->cache->delete($this->query_hash($sql)); } else { - $type .= ' '; + $this->cache->delete_all(); } } - - $cond = array(); - $keys = is_array($key) ? $key : array($key => $value); - foreach ($keys as $key => $value) + elseif (is_array($this->cache)) { - $key = (strpos($key, '.') !== FALSE) ? $this->config['table_prefix'].$key : $key; - - if (is_string($value)) + // Using per-request memory cache + if ($sql === TRUE) { - // Only escape if it's a string - $value = $this->driver->escape_column($this->config['table_prefix'].$value); + unset($this->cache[$this->query_hash($this->last_query)]); } - - $cond[] = $this->driver->where($key, $value, 'AND ', count($cond), FALSE); - } - - if ( ! is_array($this->join)) - { - $this->join = array(); - } - - if ( ! is_array($table)) - { - $table = array($table); - } - - foreach ($table as $t) - { - if (is_string($t)) + elseif (is_string($sql)) { - // TODO: Temporary solution, this should be moved to database driver (AS is checked for twice) - if (stripos($t, ' AS ') !== FALSE) - { - $t = str_ireplace(' AS ', ' AS ', $t); - - list($table, $alias) = explode(' AS ', $t); - - // Attach prefix to both sides of the AS - $t = $this->config['table_prefix'].$table.' AS '.$this->config['table_prefix'].$alias; - } - else - { - $t = $this->config['table_prefix'].$t; - } + unset($this->cache[$this->query_hash($sql)]); + } + else + { + $this->cache = array(); } - - $join['tables'][] = $this->driver->escape_column($t); } - - $join['conditions'] = '('.trim(implode(' ', $cond)).')'; - $join['type'] = $type; - - $this->join[] = $join; - - return $this; } - /** - * Selects the where(s) for a database query. + * Quotes the given value * - * @param string|array key name or array of key => value pairs - * @param string value to match with key - * @param boolean disable quoting of WHERE clause - * @return Database_Core This Database object. + * @param mixed value + * @return mixed */ - public function where($key, $value = NULL, $quote = TRUE) + public function quote($value) { - $quote = (func_num_args() < 2 AND ! is_array($key)) ? -1 : $quote; - if (is_object($key)) + if ( ! $this->config['escape']) + return $value; + + if ($value === NULL) { - $keys = array((string) $key => ''); + return 'NULL'; } - elseif ( ! is_array($key)) + elseif ($value === TRUE) { - $keys = array($key => $value); + return 'TRUE'; } - else + elseif ($value === FALSE) { - $keys = $key; + return 'FALSE'; } - - foreach ($keys as $key => $value) + elseif (is_int($value)) + { + return (int) $value; + } + elseif ($value instanceof Database_Expression) { - $key = (strpos($key, '.') !== FALSE) ? $this->config['table_prefix'].$key : $key; - $this->where[] = $this->driver->where($key, $value, 'AND ', count($this->where), $quote); + return (string) $value; } - return $this; + return '\''.$this->escape($value).'\''; } /** - * Selects the or where(s) for a database query. + * Quotes a table, adding the table prefix + * Reserved characters not allowed in table names for the builder are [ .*] (space, dot, asterisk) * - * @param string|array key name or array of key => value pairs - * @param string value to match with key - * @param boolean disable quoting of WHERE clause - * @return Database_Core This Database object. + * @param string|array table name or array - 'users u' or array('u' => 'users') both valid + * @param string table alias + * @return string */ - public function orwhere($key, $value = NULL, $quote = TRUE) + public function quote_table($table, $alias = NULL) { - $quote = (func_num_args() < 2 AND ! is_array($key)) ? -1 : $quote; - if (is_object($key)) + if (is_array($table)) { - $keys = array((string) $key => ''); + // Using array('u' => 'user') + list($alias, $table) = each($table); } - elseif ( ! is_array($key)) + elseif (strpos(' ', $table) !== FALSE) { - $keys = array($key => $value); + // Using format 'user u' + list($table, $alias) = explode(' ', $table); } - else + + if ($table instanceof Database_Expression) { - $keys = $key; + if ($alias) + { + if ($this->config['escape']) + { + $alias = $this->quote.$alias.$this->quote; + } + + return $table.' AS '.$alias; + } + + return (string) $table; } - foreach ($keys as $key => $value) + if ($this->config['table_prefix']) { - $key = (strpos($key, '.') !== FALSE) ? $this->config['table_prefix'].$key : $key; - $this->where[] = $this->driver->where($key, $value, 'OR ', count($this->where), $quote); + $table = $this->config['table_prefix'].$table; } - return $this; - } + if ($alias) + { + if ($this->config['escape']) + { + $table = $this->quote.$table.$this->quote; + $alias = $this->quote.$alias.$this->quote; + } - /** - * Selects the like(s) for a database query. - * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @param boolean automatically add starting and ending wildcards - * @return Database_Core This Database object. - */ - public function like($field, $match = '', $auto = TRUE) - { - $fields = is_array($field) ? $field : array($field => $match); + return $table.' AS '.$alias; + } - foreach ($fields as $field => $match) + if ($this->config['escape']) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->like($field, $match, $auto, 'AND ', count($this->where)); + $table = $this->quote.$table.$this->quote; } - return $this; + return $table; } /** - * Selects the or like(s) for a database query. + * Quotes column or table.column, adding the table prefix if necessary + * Reserved characters not allowed in table names for the builder are [ .*] (space, dot, asterisk) + * Complex column names must have table/columns in double quotes, e.g. array('mycount' => 'COUNT("users.id")') * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @param boolean automatically add starting and ending wildcards - * @return Database_Core This Database object. + * @param string|array column name or array('u' => 'COUNT("*")') + * @param string column alias + * @return string */ - public function orlike($field, $match = '', $auto = TRUE) + public function quote_column($column, $alias = NULL) { - $fields = is_array($field) ? $field : array($field => $match); + if ($column === '*') + return $column; - foreach ($fields as $field => $match) + if (is_array($column)) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->like($field, $match, $auto, 'OR ', count($this->where)); + list($alias, $column) = each($column); } - return $this; - } + if ($column instanceof Database_Expression) + { + if ($alias) + { + if ($this->config['escape']) + { + $alias = $this->quote.$alias.$this->quote; + } - /** - * Selects the not like(s) for a database query. - * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @param boolean automatically add starting and ending wildcards - * @return Database_Core This Database object. - */ - public function notlike($field, $match = '', $auto = TRUE) - { - $fields = is_array($field) ? $field : array($field => $match); + return $column.' AS '.$alias; + } + + return (string) $column; + } - foreach ($fields as $field => $match) + if ($this->config['table_prefix'] AND strpos($column, '.') !== FALSE) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->notlike($field, $match, $auto, 'AND ', count($this->where)); + if (strpos($column, '"') !== FALSE) + { + // Find "table.column" and replace them with "[prefix]table.column" + $column = preg_replace('/"([^.]++)\.([^"]++)"/', '"'.$this->config['table_prefix'].'$1.$2"', $column); + } + else + { + // Attach table prefix if table.column format + $column = $this->config['table_prefix'].$column; + } } - return $this; - } + if ($this->config['escape']) + { + if (strpos($column, '"') === FALSE) + { + // Quote the column + $column = $this->quote.$column.$this->quote; + } + elseif ($this->quote !== '"') + { + // Replace double quotes + $column = str_replace('"', $this->quote, $column); + } - /** - * Selects the or not like(s) for a database query. - * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @return Database_Core This Database object. - */ - public function ornotlike($field, $match = '', $auto = TRUE) - { - $fields = is_array($field) ? $field : array($field => $match); + // Replace . with "." + $column = str_replace('.', $this->quote.'.'.$this->quote, $column); - foreach ($fields as $field => $match) - { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->notlike($field, $match, $auto, 'OR ', count($this->where)); + // Unescape any asterisks + $column = str_replace($this->quote.'*'.$this->quote, '*', $column); + + if ($alias) + { + // Quote the alias + return $column.' AS '.$this->quote.$alias.$this->quote; + } + + return $column; } - return $this; + // Strip double quotes + $column = str_replace('"', '', $column); + + if ($alias) + return $column.' AS '.$alias; + + return $column; } /** - * Selects the like(s) for a database query. + * Get the table prefix * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @return Database_Core This Database object. + * @param string Optional new table prefix to set + * @return string */ - public function regex($field, $match = '') + public function table_prefix($new_prefix = NULL) { - $fields = is_array($field) ? $field : array($field => $match); + $prefix = $this->config['table_prefix']; - foreach ($fields as $field => $match) + if ($new_prefix !== NULL) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->regex($field, $match, 'AND ', count($this->where)); + // Set a new prefix + $this->config['table_prefix'] = $new_prefix; } - return $this; + return $prefix; } /** - * Selects the or like(s) for a database query. + * Fetches SQL type information about a field, in a generic format. * - * @param string|array field name or array of field => match pairs - * @param string like value to match with field - * @return Database_Core This Database object. + * @param string field datatype + * @return array */ - public function orregex($field, $match = '') + protected function sql_type($str) { - $fields = is_array($field) ? $field : array($field => $match); + static $sql_types; - foreach ($fields as $field => $match) + if ($sql_types === NULL) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->regex($field, $match, 'OR ', count($this->where)); + // Load SQL data types + $sql_types = Kohana::config('sql_types'); } - return $this; - } + $str = trim($str); - /** - * Selects the not regex(s) for a database query. - * - * @param string|array field name or array of field => match pairs - * @param string regex value to match with field - * @return Database_Core This Database object. - */ - public function notregex($field, $match = '') - { - $fields = is_array($field) ? $field : array($field => $match); + if (($open = strpos($str, '(')) !== FALSE) + { + // Closing bracket + $close = strpos($str, ')', $open); + + // Length without brackets + $length = substr($str, $open + 1, $close - 1 - $open); - foreach ($fields as $field => $match) + // Type without the length + $type = substr($str, 0, $open).substr($str, $close + 1); + } + else { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->notregex($field, $match, 'AND ', count($this->where)); + // No length + $type = $str; } - return $this; - } + if (empty($sql_types[$type])) + throw new Database_Exception('Undefined field type :type', array(':type' => $str)); - /** - * Selects the or not regex(s) for a database query. - * - * @param string|array field name or array of field => match pairs - * @param string regex value to match with field - * @return Database_Core This Database object. - */ - public function ornotregex($field, $match = '') - { - $fields = is_array($field) ? $field : array($field => $match); + // Fetch the field definition + $field = $sql_types[$type]; + + $field['sql_type'] = $type; - foreach ($fields as $field => $match) + if (isset($length)) { - $field = (strpos($field, '.') !== FALSE) ? $this->config['table_prefix'].$field : $field; - $this->where[] = $this->driver->notregex($field, $match, 'OR ', count($this->where)); + // Add the length to the field info + $field['length'] = $length; } - return $this; + return $field; } - /** - * Chooses the column to group by in a select query. - * - * @param string column name to group by - * @return Database_Core This Database object. - */ - public function groupby($by) - { - if ( ! is_array($by)) - { - $by = explode(',', (string) $by); - } - - foreach ($by as $val) - { - $val = trim($val); - - if ($val != '') - { - // Add the table prefix if we are using table.column names - if(strpos($val, '.')) - { - $val = $this->config['table_prefix'].$val; - } - - $this->groupby[] = $this->driver->escape_column($val); - } - } - - return $this; - } - - /** - * Selects the having(s) for a database query. - * - * @param string|array key name or array of key => value pairs - * @param string value to match with key - * @param boolean disable quoting of WHERE clause - * @return Database_Core This Database object. - */ - public function having($key, $value = '', $quote = TRUE) - { - $this->having[] = $this->driver->where($key, $value, 'AND', count($this->having), TRUE); - return $this; - } - - /** - * Selects the or having(s) for a database query. - * - * @param string|array key name or array of key => value pairs - * @param string value to match with key - * @param boolean disable quoting of WHERE clause - * @return Database_Core This Database object. - */ - public function orhaving($key, $value = '', $quote = TRUE) - { - $this->having[] = $this->driver->where($key, $value, 'OR', count($this->having), TRUE); - return $this; - } - - /** - * Chooses which column(s) to order the select query by. - * - * @param string|array column(s) to order on, can be an array, single column, or comma seperated list of columns - * @param string direction of the order - * @return Database_Core This Database object. - */ - public function orderby($orderby, $direction = NULL) - { - if ( ! is_array($orderby)) - { - $orderby = array($orderby => $direction); - } - - foreach ($orderby as $column => $direction) - { - $direction = strtoupper(trim($direction)); - - // Add a direction if the provided one isn't valid - if ( ! in_array($direction, array('ASC', 'DESC', 'RAND()', 'RANDOM()', 'NULL'))) - { - $direction = 'ASC'; - } - - // Add the table prefix if a table.column was passed - if (strpos($column, '.')) - { - $column = $this->config['table_prefix'].$column; - } - - $this->orderby[] = $this->driver->escape_column($column).' '.$direction; - } - - return $this; - } - - /** - * Selects the limit section of a query. - * - * @param integer number of rows to limit result to - * @param integer offset in result to start returning rows from - * @return Database_Core This Database object. - */ - public function limit($limit, $offset = NULL) - { - $this->limit = (int) $limit; - - if ($offset !== NULL OR ! is_int($this->offset)) - { - $this->offset($offset); - } - - return $this; - } - - /** - * Sets the offset portion of a query. - * - * @param integer offset value - * @return Database_Core This Database object. - */ - public function offset($value) - { - $this->offset = (int) $value; - - return $this; - } - - /** - * Allows key/value pairs to be set for inserting or updating. - * - * @param string|array key name or array of key => value pairs - * @param string value to match with key - * @return Database_Core This Database object. - */ - public function set($key, $value = '') - { - if ( ! is_array($key)) - { - $key = array($key => $value); - } - - foreach ($key as $k => $v) - { - // Add a table prefix if the column includes the table. - if (strpos($k, '.')) - $k = $this->config['table_prefix'].$k; - - $this->set[$k] = $this->driver->escape($v); - } - - return $this; - } - - /** - * Compiles the select statement based on the other functions called and runs the query. - * - * @param string table name - * @param string limit clause - * @param string offset clause - * @return Database_Result - */ - public function get($table = '', $limit = NULL, $offset = NULL) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->driver->compile_select(get_object_vars($this)); - - $this->reset_select(); - - $result = $this->query($sql); - - $this->last_query = $sql; - - return $result; - } - - /** - * Compiles the select statement based on the other functions called and runs the query. - * - * @param string table name - * @param array where clause - * @param string limit clause - * @param string offset clause - * @return Database_Core This Database object. - */ - public function getwhere($table = '', $where = NULL, $limit = NULL, $offset = NULL) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($where)) - { - $this->where($where); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->driver->compile_select(get_object_vars($this)); - - $this->reset_select(); - - $result = $this->query($sql); - - return $result; - } - - /** - * Compiles the select statement based on the other functions called and returns the query string. - * - * @param string table name - * @param string limit clause - * @param string offset clause - * @return string sql string - */ - public function compile($table = '', $limit = NULL, $offset = NULL) - { - if ($table != '') - { - $this->from($table); - } - - if ( ! is_null($limit)) - { - $this->limit($limit, $offset); - } - - $sql = $this->driver->compile_select(get_object_vars($this)); - - $this->reset_select(); - - return $sql; - } - - /** - * Compiles an insert string and runs the query. - * - * @param string table name - * @param array array of key/value pairs to insert - * @return Database_Result Query result - */ - public function insert($table = '', $set = NULL) - { - if ( ! is_null($set)) - { - $this->set($set); - } - - if ($this->set == NULL) - throw new Kohana_Database_Exception('database.must_use_set'); - - if ($table == '') - { - if ( ! isset($this->from[0])) - throw new Kohana_Database_Exception('database.must_use_table'); - - $table = $this->from[0]; - } - - // If caching is enabled, clear the cache before inserting - ($this->config['cache'] === TRUE) and $this->clear_cache(); - - $sql = $this->driver->insert($this->config['table_prefix'].$table, array_keys($this->set), array_values($this->set)); - - $this->reset_write(); - - return $this->query($sql); - } - - /** - * Adds an "IN" condition to the where clause - * - * @param string Name of the column being examined - * @param mixed An array or string to match against - * @param bool Generate a NOT IN clause instead - * @return Database_Core This Database object. - */ - public function in($field, $values, $not = FALSE) - { - if (is_array($values)) - { - $escaped_values = array(); - foreach ($values as $v) - { - if (is_numeric($v)) - { - $escaped_values[] = $v; - } - else - { - $escaped_values[] = "'".$this->driver->escape_str($v)."'"; - } - } - $values = implode(",", $escaped_values); - } - - $where = $this->driver->escape_column(((strpos($field,'.') !== FALSE) ? $this->config['table_prefix'] : ''). $field).' '.($not === TRUE ? 'NOT ' : '').'IN ('.$values.')'; - $this->where[] = $this->driver->where($where, '', 'AND ', count($this->where), -1); - - return $this; - } - - /** - * Adds a "NOT IN" condition to the where clause - * - * @param string Name of the column being examined - * @param mixed An array or string to match against - * @return Database_Core This Database object. - */ - public function notin($field, $values) - { - return $this->in($field, $values, TRUE); - } - - /** - * Compiles a merge string and runs the query. - * - * @param string table name - * @param array array of key/value pairs to merge - * @return Database_Result Query result - */ - public function merge($table = '', $set = NULL) - { - if ( ! is_null($set)) - { - $this->set($set); - } - - if ($this->set == NULL) - throw new Kohana_Database_Exception('database.must_use_set'); - - if ($table == '') - { - if ( ! isset($this->from[0])) - throw new Kohana_Database_Exception('database.must_use_table'); - - $table = $this->from[0]; - } - else - { - $table = $this->config['table_prefix'].$table; - } - - $sql = $this->driver->merge($table, array_keys($this->set), array_values($this->set)); - - $this->reset_write(); - return $this->query($sql); - } - - /** - * Compiles an update string and runs the query. - * - * @param string table name - * @param array associative array of update values - * @param array where clause - * @return Database_Result Query result - */ - public function update($table = '', $set = NULL, $where = NULL) - { - if ( is_array($set)) - { - $this->set($set); - } - - if ( ! is_null($where)) - { - $this->where($where); - } - - if ($this->set == FALSE) - throw new Kohana_Database_Exception('database.must_use_set'); - - if ($table == '') - { - if ( ! isset($this->from[0])) - throw new Kohana_Database_Exception('database.must_use_table'); - - $table = $this->from[0]; - } - else - { - $table = $this->config['table_prefix'].$table; - } - - $sql = $this->driver->update($table, $this->set, $this->where); - - $this->reset_write(); - return $this->query($sql); - } - - /** - * Compiles a delete string and runs the query. - * - * @param string table name - * @param array where clause - * @return Database_Result Query result - */ - public function delete($table = '', $where = NULL) - { - if ($table == '') - { - if ( ! isset($this->from[0])) - throw new Kohana_Database_Exception('database.must_use_table'); - - $table = $this->from[0]; - } - else - { - $table = $this->config['table_prefix'].$table; - } - - if (! is_null($where)) - { - $this->where($where); - } - - if (count($this->where) < 1) - throw new Kohana_Database_Exception('database.must_use_where'); - - $sql = $this->driver->delete($table, $this->where); - - $this->reset_write(); - return $this->query($sql); - } - - /** - * Returns the last query run. - * - * @return string SQL - */ - public function last_query() - { - return $this->last_query; - } - - /** - * Count query records. - * - * @param string table name - * @param array where clause - * @return integer - */ - public function count_records($table = FALSE, $where = NULL) - { - if (count($this->from) < 1) - { - if ($table == FALSE) - throw new Kohana_Database_Exception('database.must_use_table'); - - $this->from($table); - } - - if ($where !== NULL) - { - $this->where($where); - } - - $query = $this->select('COUNT(*) AS '.$this->escape_column('records_found'))->get()->result(TRUE); - - $query = $query->current(); - - if ( ! $query) - return 0; - else - return (int) $query->records_found; - } - - /** - * Resets all private select variables. - * - * @return void - */ - protected function reset_select() - { - $this->select = array(); - $this->from = array(); - $this->join = array(); - $this->where = array(); - $this->orderby = array(); - $this->groupby = array(); - $this->having = array(); - $this->distinct = FALSE; - $this->limit = FALSE; - $this->offset = FALSE; - } - - /** - * Resets all private insert and update variables. - * - * @return void - */ - protected function reset_write() - { - $this->set = array(); - $this->from = array(); - $this->where = array(); - } - - /** - * Lists all the tables in the current database. - * - * @return array - */ - public function list_tables() - { - $this->link or $this->connect(); - - return $this->driver->list_tables(); - } - - /** - * See if a table exists in the database. - * - * @param string table name - * @param boolean True to attach table prefix - * @return boolean - */ - public function table_exists($table_name, $prefix = TRUE) - { - if ($prefix) - return in_array($this->config['table_prefix'].$table_name, $this->list_tables()); - else - return in_array($table_name, $this->list_tables()); - } - - /** - * Combine a SQL statement with the bind values. Used for safe queries. - * - * @param string query to bind to the values - * @param array array of values to bind to the query - * @return string - */ - public function compile_binds($sql, $binds) - { - foreach ((array) $binds as $val) - { - // If the SQL contains no more bind marks ("?"), we're done. - if (($next_bind_pos = strpos($sql, '?')) === FALSE) - break; - - // Properly escape the bind value. - $val = $this->driver->escape($val); - - // Temporarily replace possible bind marks ("?"), in the bind value itself, with a placeholder. - $val = str_replace('?', '{%B%}', $val); - - // Replace the first bind mark ("?") with its corresponding value. - $sql = substr($sql, 0, $next_bind_pos).$val.substr($sql, $next_bind_pos + 1); - } - - // Restore placeholders. - return str_replace('{%B%}', '?', $sql); - } - - /** - * Get the field data for a database table, along with the field's attributes. - * - * @param string table name - * @return array - */ - public function field_data($table = '') - { - $this->link or $this->connect(); - - return $this->driver->field_data($this->config['table_prefix'].$table); - } - - /** - * Get the field data for a database table, along with the field's attributes. - * - * @param string table name - * @return array - */ - public function list_fields($table = '') - { - $this->link or $this->connect(); - - return $this->driver->list_fields($this->config['table_prefix'].$table); - } - - /** - * Escapes a value for a query. - * - * @param mixed value to escape - * @return string - */ - public function escape($value) - { - return $this->driver->escape($value); - } - - /** - * Escapes a string for a query. - * - * @param string string to escape - * @return string - */ - public function escape_str($str) - { - return $this->driver->escape_str($str); - } - - /** - * Escapes a table name for a query. - * - * @param string string to escape - * @return string - */ - public function escape_table($table) - { - return $this->driver->escape_table($table); - } - - /** - * Escapes a column name for a query. - * - * @param string string to escape - * @return string - */ - public function escape_column($table) - { - return $this->driver->escape_column($table); - } - - /** - * Returns table prefix of current configuration. - * - * @return string - */ - public function table_prefix() - { - return $this->config['table_prefix']; - } - - /** - * Clears the query cache. - * - * @param string|TRUE clear cache by SQL statement or TRUE for last query - * @return Database_Core This Database object. - */ - public function clear_cache($sql = NULL) - { - if ($sql === TRUE) - { - $this->driver->clear_cache($this->last_query); - } - elseif (is_string($sql)) - { - $this->driver->clear_cache($sql); - } - else - { - $this->driver->clear_cache(); - } - - return $this; - } - - /** - * Pushes existing query space onto the query stack. Use push - * and pop to prevent queries from clashing before they are - * executed - * - * @return Database_Core This Databaes object - */ - public function push() - { - array_push($this->query_history, array( - $this->select, - $this->from, - $this->join, - $this->where, - $this->orderby, - $this->order, - $this->groupby, - $this->having, - $this->distinct, - $this->limit, - $this->offset - )); - - $this->reset_select(); - - return $this; - } - - /** - * Pops from query stack into the current query space. - * - * @return Database_Core This Databaes object - */ - public function pop() - { - if (count($this->query_history) == 0) - { - // No history - return $this; - } - - list( - $this->select, - $this->from, - $this->join, - $this->where, - $this->orderby, - $this->order, - $this->groupby, - $this->having, - $this->distinct, - $this->limit, - $this->offset - ) = array_pop($this->query_history); - - return $this; - } - - /** - * Count the number of records in the last query, without LIMIT or OFFSET applied. - * - * @return integer - */ - public function count_last_query() - { - if ($sql = $this->last_query()) - { - if (stripos($sql, 'LIMIT') !== FALSE) - { - // Remove LIMIT from the SQL - $sql = preg_replace('/\sLIMIT\s+[^a-z]+/i', ' ', $sql); - } - - if (stripos($sql, 'OFFSET') !== FALSE) - { - // Remove OFFSET from the SQL - $sql = preg_replace('/\sOFFSET\s+\d+/i', '', $sql); - } - - // Get the total rows from the last query executed - $result = $this->query - ( - 'SELECT COUNT(*) AS '.$this->escape_column('total_rows').' '. - 'FROM ('.trim($sql).') AS '.$this->escape_table('counted_results') - ); - - // Return the total number of rows from the query - return (int) $result->current()->total_rows; - } - - return FALSE; - } - -} // End Database Class - - -/** - * Sets the code for a Database exception. - */ -class Kohana_Database_Exception extends Kohana_Exception { - - protected $code = E_DATABASE_ERROR; - -} // End Kohana Database Exception +} // End Database diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php new file mode 100644 index 00000000..5a5a058c --- /dev/null +++ b/system/libraries/Database_Builder.php @@ -0,0 +1,938 @@ +db = $db; + } + + /** + * Resets all query components + */ + public function reset() + { + $this->select = array(); + $this->from = array(); + $this->join = array(); + $this->where = array(); + $this->group_by = array(); + $this->having = array(); + $this->order_by = array(); + $this->limit = NULL; + $this->offset = NULL; + $this->set = array(); + $this->values = array(); + } + + public function __toString() + { + return $this->compile(); + } + + /** + * Compiles the builder object into a SQL query + * + * @return string Compiled query + */ + protected function compile() + { + if ( ! is_object($this->db)) + { + // Use default database for compiling to string if none is given + $this->db = Database::instance($this->db); + } + + if ($this->type === Database::SELECT) + { + // SELECT columns FROM table + $sql = 'SELECT '.$this->compile_select(); + + if ( ! empty($this->from)) + { + $sql .= "\nFROM ".$this->compile_from(); + } + } + elseif ($this->type === Database::UPDATE) + { + $sql = 'UPDATE '.$this->compile_from()."\n".'SET '.$this->compile_set(); + } + elseif ($this->type === Database::INSERT) + { + $sql = 'INSERT INTO '.$this->compile_from()."\n".$this->compile_columns()."\nVALUES ".$this->compile_values(); + } + elseif ($this->type === Database::DELETE) + { + $sql = 'DELETE FROM '.$this->compile_from(); + } + + if ( ! empty($this->join)) + { + $sql .= $this->compile_join(); + } + + if ( ! empty($this->where)) + { + $sql .= "\n".'WHERE '.$this->compile_conditions($this->where); + } + + if ( ! empty($this->having)) + { + $sql .= "\n".'HAVING '.$this->compile_conditions($this->having); + } + + if ( ! empty($this->group_by)) + { + $sql .= "\n".'GROUP BY '.$this->compile_group_by(); + } + + if ( ! empty($this->order_by)) + { + $sql .= "\nORDER BY ".$this->compile_order_by(); + } + + if (is_int($this->limit)) + { + $sql .= "\nLIMIT ".$this->limit; + } + + if (is_int($this->offset)) + { + $sql .= "\nOFFSET ".$this->offset; + } + + return $sql; + } + + /** + * Compiles the SELECT portion of the query + * + * @return string + */ + protected function compile_select() + { + $vals = array(); + + foreach ($this->select as $alias => $name) + { + if (is_string($alias)) + { + $vals[] = $this->db->quote_column($name, $alias); + } + else + { + $vals[] = $this->db->quote_column($name); + } + } + + return implode(', ', $vals); + } + + /** + * Compiles the FROM portion of the query + * + * @return string + */ + protected function compile_from() + { + $vals = array(); + + foreach ($this->from as $alias => $name) + { + if (is_string($alias)) + { + // Using AS format so escape both + $vals[] = $this->db->quote_table($name, $alias); + } + else + { + // Just using the table name itself + $vals[] = $this->db->quote_table($name); + } + } + + return implode(', ', $vals); + } + + /** + * Compiles the JOIN portion of the query + * + * @return string + */ + protected function compile_join() + { + $sql = ''; + foreach ($this->join as $join) + { + list($table, $keys, $type) = $join; + + if ($type !== NULL) + { + // Join type + $sql .= ' '.$type; + } + + $sql .= ' JOIN '.$this->db->quote_table($table); + + $condition = ''; + if ($keys instanceof Database_Expression) + { + $condition = (string) $keys; + } + elseif (is_array($keys)) + { + // ON condition is an array of matches + foreach ($keys as $key => $value) + { + if ( ! empty($condition)) + { + $condition .= ' AND '; + } + + $condition .= $this->db->quote_column($key).' = '.$this->db->quote_column($value); + } + } + + if ( ! empty($condition)) + { + // Add ON condition + $sql .= ' ON ('.$condition.')'; + } + } + + return $sql; + } + + /** + * Compiles the GROUP BY portion of the query + * + * @return string + */ + protected function compile_group_by() + { + $vals = array(); + + foreach ($this->group_by as $column) + { + // Escape the column + $vals[] = $this->db->quote_column($column); + } + + return implode(', ', $vals); + } + + /** + * Compiles the ORDER BY portion of the query + * + * @return string + */ + public function compile_order_by() + { + $ordering = array(); + + foreach ($this->order_by as $column => $order_by) + { + list($column, $direction) = each($order_by); + + $column = $this->db->quote_column($column); + + if ($direction !== NULL) + { + $direction = ' '.$direction; + } + + $ordering[] = $column.$direction; + } + + return implode(', ', $ordering); + } + + /** + * Compiles the SET portion of the query for UPDATE + * + * @return string + */ + public function compile_set() + { + $vals = array(); + + foreach ($this->set as $key => $value) + { + // Using an UPDATE so Key = Val + $vals[] = $this->db->quote_column($key).' = '.$this->db->quote($value); + } + + return implode(', ', $vals); + } + + /** + * Join tables to the builder + * + * @param mixed Table name + * @param mixed Key, or an array of key => value pair, for join condition (can be a Database_Expression) + * @param mixed Value if $keys is not an array or Database_Expression + * @param string Join type (LEFT, RIGHT, INNER, etc.) + * @return Database_Builder + */ + public function join($table, $keys, $value = NULL, $type = NULL) + { + if (is_string($keys)) + { + $keys = array($keys => $value); + } + + if ($type !== NULL) + { + $type = strtoupper($type); + } + + $this->join[] = array($table, $keys, $type); + + return $this; + } + + /** + * Add tables to the FROM portion of the builder + * + * @param string|array table name or array(alias => table) + * @return Database_Builder + */ + public function from($tables) + { + if ( ! is_array($tables)) + { + $tables = func_get_args(); + } + + $this->from = array_merge($this->from, $tables); + + return $this; + } + + /** + * Add fields to the GROUP BY portion + * + * @param mixed Field names or an array of fields + * @return Database_Builder + */ + public function group_by($columns) + { + if ( ! is_array($columns)) + { + $columns = func_get_args(); + } + + $this->group_by = array_merge($this->group_by, $columns); + + return $this; + } + + /** + * Add conditions to the HAVING clause (AND) + * + * @param mixed Column name or array of columns => vals + * @param string Operation to perform + * @param mixed Value + * @return Database_Builder + */ + public function having($columns, $op = '=', $value = NULL) + { + return $this->and_having($columns, $op, $value); + } + + /** + * Add conditions to the HAVING clause (AND) + * + * @param mixed Column name or array of columns => vals + * @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)); + return $this; + } + + /** + * Add conditions to the HAVING clause (OR) + * + * @param mixed Column name or array of columns => vals + * @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)); + return $this; + } + + /** + * Add fields to the ORDER BY portion + * + * @param mixed Field names or an array of fields (field => direction) + * @param string Direction or NULL for ascending + * @return Database_Builder + */ + public function order_by($columns, $direction = NULL) + { + if (is_string($columns)) + { + $columns = array($columns => $direction); + } + + $this->order_by[] = $columns; + + return $this; + } + + /** + * Limit rows returned + * + * @param int Number of rows + * @return Database_Builder + */ + public function limit($number) + { + $this->limit = (int) $number; + + return $this; + } + + /** + * Offset into result set + * + * @param int Offset + * @return Database_Builder + */ + public function offset($number) + { + $this->offset = (int) $number; + + return $this; + } + + public function left_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'LEFT'); + } + + public function right_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'RIGHT'); + } + + public function inner_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'INNER'); + } + + public function outer_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'OUTER'); + } + + public function full_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'FULL'); + } + + public function left_inner_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'LEFT INNER'); + } + + public function right_inner_join($table, $keys, $value = NULL) + { + return $this->join($table, $keys, $value, 'RIGHT INNER'); + } + + public function open($clause = 'WHERE') + { + return $this->and_open($clause); + } + + public function and_open($clause = 'WHERE') + { + if ($clause === 'WHERE') + { + $this->where[] = array('AND' => '('); + } + else + { + $this->having[] = array('AND' => '('); + } + + return $this; + } + + public function or_open($clause = 'WHERE') + { + if ($clause === 'WHERE') + { + $this->where[] = array('OR' => '('); + } + else + { + $this->having[] = array('OR' => '('); + } + + return $this; + } + + public function close($clause = 'WHERE') + { + if ($clause === 'WHERE') + { + $this->where[] = array(')'); + } + else + { + $this->having[] = array(')'); + } + + return $this; + } + + /** + * Add conditions to the WHERE clause (AND) + * + * @param mixed Column name or array of columns => vals + * @param string Operation to perform + * @param mixed Value + * @return Database_Builder + */ + public function where($columns, $op = '=', $value = NULL) + { + return $this->and_where($columns, $op, $value); + } + + /** + * Add conditions to the WHERE clause (AND) + * + * @param mixed Column name or array of columns => vals + * @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)); + return $this; + } + + /** + * Add conditions to the WHERE clause (OR) + * + * @param mixed Column name or array of columns => vals + * @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)); + return $this; + } + + /** + * Compiles the given clause's conditions + * + * @param array Clause conditions + * @return string + */ + protected function compile_conditions($groups) + { + $last_condition = NULL; + + $sql = ''; + foreach ($groups as $group) + { + // Process groups of conditions + foreach ($group as $logic => $condition) + { + if ($condition === '(') + { + if ( ! empty($sql) AND $last_condition !== '(') + { + // Include logic operator + $sql .= ' '.$logic.' '; + } + + $sql .= '('; + } + elseif ($condition === ')') + { + $sql .= ')'; + } + else + { + list($columns, $op, $value) = $condition; + + // Stores each individual condition + $vals = array(); + + if ($columns instanceof Database_Expression) + { + // Add directly to condition list + $vals[] = (string) $columns; + } + else + { + $op = strtoupper($op); + + if ( ! is_array($columns)) + { + $columns = array($columns => $value); + } + + foreach ($columns as $column => $value) + { + if ($value instanceof Database_Builder) + { + // Using a subquery + $value->db = $this->db; + $value = '('.(string) $value.')'; + } + elseif (is_array($value)) + { + if ($op === 'BETWEEN' OR $op === 'NOT BETWEEN') + { + // Falls between two values + $value = $this->db->quote($value[0]).' AND '.$this->db->quote($value[1]); + } + else + { + // Return as list + $value = array_map(array($this->db, 'quote'), $value); + $value = '('.implode(', ', $value).')'; + } + } + else + { + $value = $this->db->quote($value); + } + + if ( ! empty($column)) + { + // Ignore blank columns + $column = $this->db->quote_column($column); + } + + // Add to condition list + $vals[] = $column.' '.$op.' '.$value; + } + } + + if ( ! empty($sql) AND $last_condition !== '(') + { + // Add the logic operator + $sql .= ' '.$logic.' '; + } + + // Join the condition list items together by the given logic operator + $sql .= implode(' '.$logic.' ', $vals); + } + + $last_condition = $condition; + } + } + + return $sql; + } + + /** + * Set values for UPDATE + * + * @param mixed Column name or array of columns => vals + * @param mixed Value (can be a Database_Expression) + * @return Database_Builder + */ + public function set($keys, $value = NULL) + { + if (is_string($keys)) + { + $keys = array($keys => $value); + } + + $this->set = array_merge($keys, $this->set); + + return $this; + } + + /** + * Columns used for INSERT queries + * + * @param array Columns + * @return Database_Builder + */ + public function columns($columns) + { + if ( ! is_array($columns)) + { + $columns = func_get_args(); + } + + $this->columns = $columns; + + return $this; + } + + /** + * Compiles the columns portion of the query for INSERT + * + * @return string + */ + protected function compile_columns() + { + return '('.implode(', ', array_map(array($this->db, 'quote_column'), $this->columns)).')'; + } + + /** + * Values used for INSERT queries + * + * @param array Values + * @return Database_Builder + */ + public function values($values) + { + if ( ! is_array($values)) + { + $values = func_get_args(); + } + + $this->values[] = $values; + + return $this; + } + + /** + * Compiles the VALUES portion of the query for INSERT + * + * @return string + */ + protected function compile_values() + { + $values = array(); + foreach ($this->values as $group) + { + // Each set of values to be inserted + $values[] = '('.implode(', ', array_map(array($this->db, 'quote'), $group)).')'; + } + + return implode(', ', $values); + } + + /** + * Create a SELECT query and specify selected columns + * + * @param string|array column name or array(alias => column) + * @return Database_Builder + */ + public function select($columns = NULL) + { + $this->type = Database::SELECT; + + if ($columns === NULL) + { + $columns = array('*'); + } + elseif ( ! is_array($columns)) + { + $columns = func_get_args(); + } + + $this->select = array_merge($this->select, $columns); + + return $this; + } + + /** + * Create an UPDATE query + * + * @param string Table name + * @param array Array of Keys => Values + * @param array WHERE conditions + * @return Database_Builder + */ + public function update($table = NULL, $set = NULL, $where = NULL) + { + $this->type = Database::UPDATE; + + if (is_array($set)) + { + $this->set($set); + } + + if ($where !== NULL) + { + $this->where($where); + } + + if ($table !== NULL) + { + $this->from($table); + } + + return $this; + } + + /** + * Create an INSERT query. Use 'columns' and 'values' methods for multi-row inserts + * + * @param string Table name + * @param array Array of Keys => Values + * @return Database_Builder + */ + public function insert($table = NULL, $set = NULL) + { + $this->type = Database::INSERT; + + if (is_array($set)) + { + $this->columns(array_keys($set)); + $this->values(array_values($set)); + } + + if ($table !== NULL) + { + $this->from($table); + } + + return $this; + } + + /** + * Create a DELETE query + * + * @param string Table name + * @param array WHERE conditions + * @return Database_Builder + */ + public function delete($table, $where = NULL) + { + $this->type = Database::DELETE; + + if ($where !== NULL) + { + $this->where($where); + } + + if ($table !== NULL) + { + $this->from($table); + } + + return $this; + } + + /** + * Count records for a given table + * + * @param string Table name + * @param array WHERE conditions + * @return int + */ + public function count_records($table = FALSE, $where = NULL) + { + if (count($this->from) < 1) + { + if ($table === FALSE) + throw new Database_Exception('Database count_records requires a table'); + + $this->from($table); + } + + if ($where !== NULL) + { + $this->where($where); + } + + // Grab the count AS records_found + $result = $this->select(array('records_found' => 'COUNT("*")'))->execute(); + + return $result->get('records_found'); + } + + /** + * Executes the built query + * + * @param mixed Database name or object + * @return Database_Result + */ + public function execute($db = NULL) + { + if ($db !== NULL) + { + $this->db = $db; + } + + if ( ! is_object($this->db)) + { + // Get the database instance + $this->db = Database::instance($this->db); + } + + $query = $this->compile(); + + // Reset the query after executing + $this->reset(); + + if ($this->ttl !== FALSE AND $this->type === Database::SELECT) + { + // Return result from cache (only allowed with SELECT) + return $this->db->query_cache($query, $this->ttl); + } + else + { + // Load the result (no caching) + return $this->db->query($query); + } + } + + /** + * Set caching for the query + * + * @param mixed Time-to-live (FALSE to disable, NULL for Cache default, seconds otherwise) + * @return Database_Builder + */ + public function cache($ttl = NULL) + { + $this->ttl = $ttl; + + return $this; + } + +} // End Database_Builder diff --git a/system/libraries/Database_Cache_Result.php b/system/libraries/Database_Cache_Result.php new file mode 100644 index 00000000..12ad48ea --- /dev/null +++ b/system/libraries/Database_Cache_Result.php @@ -0,0 +1,83 @@ +data = $data; + $this->sql = $sql; + $this->total_rows = count($data); + $this->return_objects = $return_objects; + } + + public function __destruct() + { + // Not used + } + + public function as_array($return = FALSE) + { + // Return arrays rather than objects + $this->return_objects = FALSE; + + if ( ! $return ) + { + // Return this result object + return $this; + } + + // Return the entire array of rows + return $this->data; + } + + public function as_object($class = NULL, $return = FALSE) + { + if ($class !== NULL) + throw new Database_Exception('Database cache results do not support object casting'); + + // Return objects of type $class (or stdClass if none given) + $this->return_objects = TRUE; + + return $this; + } + + public function seek($offset) + { + if ( ! $this->offsetExists($offset)) + return FALSE; + + $this->current_row = $offset; + + return TRUE; + } + + public function current() + { + if ($this->return_objects) + { + // Return a new object with the current row of data + return (object) $this->data[$this->current_row]; + } + else + { + // Return an array of the row + return $this->data[$this->current_row]; + } + } + +} // End Database_Cache_Result \ No newline at end of file diff --git a/system/libraries/Database_Exception.php b/system/libraries/Database_Exception.php new file mode 100644 index 00000000..4a9cd83e --- /dev/null +++ b/system/libraries/Database_Exception.php @@ -0,0 +1,17 @@ +expression; + return $this->expression; } - -} // End Database Expr Class \ No newline at end of file +} diff --git a/system/libraries/Database_Mysql.php b/system/libraries/Database_Mysql.php new file mode 100644 index 00000000..cb531194 --- /dev/null +++ b/system/libraries/Database_Mysql.php @@ -0,0 +1,229 @@ +connection) + return; + + if (Database_Mysql::$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'); + } + + 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); + } + catch (Kohana_PHP_Exception $e) + { + // No connection exists + $this->connection = NULL; + + // Unable to connect to the database + throw new Database_Exception('#:errno: :error', + array(':error' => mysql_error(), + ':errno' => mysql_errno())); + } + + if ( ! mysql_select_db($database, $this->connection)) + { + // Unable to select database + throw new Database_Exception('#:errno: :error', + array(':error' => mysql_error($this->connection), + ':errno' => mysql_errno($this->connection))); + } + + if (isset($this->config['character_set'])) + { + // Set the character set + $this->set_charset($this->config['character_set']); + } + } + + public function disconnect() + { + try + { + // Database is assumed disconnected + $status = TRUE; + + if (is_resource($this->connection)) + { + $status = mysql_close($this->connection); + } + } + catch (Exception $e) + { + // Database is probably not disconnected + $status = is_resource($this->connection); + } + + return $status; + } + + public function set_charset($charset) + { + // Make sure the database is connected + $this->connection or $this->connect(); + + if (Database_Mysql::$set_names === TRUE) + { + // PHP is compiled against MySQL 4.x + $status = (bool) mysql_query('SET NAMES '.$this->quote($charset), $this->connection); + } + else + { + // PHP is compiled against MySQL 5.x + $status = mysql_set_charset($charset, $this->connection); + } + + if ($status === FALSE) + { + // Unable to set charset + throw new Database_Exception('#:errno: :error', + array(':error' => mysql_error($this->connection), + ':errno' => mysql_errno($this->connection))); + } + } + + public function query_execute($sql) + { + // Make sure the database is connected + $this->connection or $this->connect(); + + $result = mysql_query($sql, $this->connection); + + // Set the last query + $this->last_query = $sql; + + return new Database_Mysql_Result($result, $sql, $this->connection, $this->config['object']); + } + + public function escape($value) + { + // Make sure the database is connected + $this->connection or $this->connect(); + + if (($value = mysql_real_escape_string($value, $this->connection)) === FALSE) + { + throw new Database_Exception('#:errno: :error', + array(':error' => mysql_error($this->connection), + ':errno' => mysql_errno($this->connection))); + } + + return $value; + } + + public function list_constraints($table) + { + $prefix = strlen($this->table_prefix()); + $result = array(); + + $constraints = $this->query(' + SELECT c.constraint_name, c.constraint_type, k.column_name, k.referenced_table_name, k.referenced_column_name + FROM information_schema.table_constraints c + JOIN information_schema.key_column_usage k ON (k.table_schema = c.table_schema AND k.table_name = c.table_name AND k.constraint_name = c.constraint_name) + WHERE c.table_schema = '.$this->quote($this->config['connection']['database']).' + AND c.table_name = '.$this->quote($this->table_prefix().$table).' + AND (k.referenced_table_schema IS NULL OR k.referenced_table_schema ='.$this->quote($this->config['connection']['database']).') + ORDER BY k.ordinal_position + '); + + foreach ($constraints->as_array() as $row) + { + switch ($row['constraint_type']) + { + case 'FOREIGN KEY': + if (isset($result[$row['constraint_name']])) + { + $result[$row['constraint_name']][1][] = $row['column_name']; + $result[$row['constraint_name']][3][] = $row['referenced_column_name']; + } + else + { + $result[$row['constraint_name']] = array($row['constraint_type'], array($row['column_name']), substr($row['referenced_table_name'], $prefix), array($row['referenced_column_name'])); + } + break; + case 'PRIMARY KEY': + case 'UNIQUE': + if (isset($result[$row['constraint_name']])) + { + $result[$row['constraint_name']][1][] = $row['column_name']; + } + else + { + $result[$row['constraint_name']] = array($row['constraint_type'], array($row['column_name'])); + } + break; + } + } + + return $result; + } + + public function list_fields($table) + { + $result = array(); + + foreach ($this->query('SHOW COLUMNS FROM '.$this->quote_table($table))->as_array() as $row) + { + $column = $this->sql_type($row['Type']); + + $column['default'] = $row['Default']; + $column['nullable'] = $row['Null'] === 'YES'; + $column['sequenced'] = $row['Extra'] === 'auto_increment'; + + if (isset($column['length']) AND $column['type'] === 'float') + { + list($column['precision'], $column['scale']) = explode(',', $column['length']); + } + + $result[$row['Field']] = $column; + } + + return $result; + } + + public function list_tables() + { + $prefix = strlen($this->table_prefix()); + $tables = array(); + + foreach ($this->query('SHOW TABLES FROM '.$this->escape($this->config['connection']['database']).' LIKE '.$this->quote($this->table_prefix().'%'))->as_array() as $row) + { + // The value is the table name + $tables[] = substr(current($row), $prefix); + } + + return $tables; + } + +} // End Database_MySQL diff --git a/system/libraries/Database_Mysql_Result.php b/system/libraries/Database_Mysql_Result.php new file mode 100644 index 00000000..020360d1 --- /dev/null +++ b/system/libraries/Database_Mysql_Result.php @@ -0,0 +1,176 @@ +return_objects = $return_objects; + + $this->total_rows = mysql_num_rows($result); + } + elseif (is_bool($result)) + { + if ($result == FALSE) + { + throw new Database_Exception('#:errno: :error [ :query ]', + array(':error' => mysql_error($link), + ':query' => $sql, + ':errno' => mysql_errno($link))); + + } + else + { + // It's a DELETE, INSERT, REPLACE, or UPDATE query + $this->insert_id = mysql_insert_id($link); + $this->total_rows = mysql_affected_rows($link); + } + } + + // Store the result locally + $this->result = $result; + + $this->sql = $sql; + } + + public function __destruct() + { + if (is_resource($this->result)) + { + mysql_free_result($this->result); + } + } + + public function as_array($return = FALSE) + { + // Return arrays rather than objects + $this->return_objects = FALSE; + + if ( ! $return ) + { + // Return this result object + return $this; + } + + // Return a nested array of all results + $array = array(); + + if ($this->total_rows > 0) + { + // Seek to the beginning of the result + mysql_data_seek($this->result, 0); + + while ($row = mysql_fetch_assoc($this->result)) + { + // Add each row to the array + $array[] = $row; + } + + $this->internal_row = $this->total_rows; + } + + return $array; + } + + public function as_object($class = NULL, $return = FALSE) + { + // Return objects of type $class (or stdClass if none given) + $this->return_objects = ($class !== NULL) ? $class : TRUE; + + if ( ! $return ) + { + // Return this result object + return $this; + } + + // Return a nested array of all results + $array = array(); + + if ($this->total_rows > 0) + { + // Seek to the beginning of the result + mysql_data_seek($this->result, 0); + + if (is_string($this->return_objects)) + { + while ($row = mysql_fetch_object($this->result, $this->return_objects)) + { + // Add each row to the array + $array[] = $row; + } + } + else + { + while ($row = mysql_fetch_object($this->result)) + { + // Add each row to the array + $array[] = $row; + } + } + + $this->internal_row = $this->total_rows; + } + + return $array; + } + + /** + * SeekableIterator: seek + */ + public function seek($offset) + { + if ($this->offsetExists($offset) AND mysql_data_seek($this->result, $offset)) + { + // Set the current row to the offset + $this->current_row = $this->internal_row = $offset; + + return TRUE; + } + else + { + return FALSE; + } + } + + /** + * Iterator: current + */ + public function current() + { + if ($this->current_row !== $this->internal_row AND ! $this->seek($this->current_row)) + return NULL; + + ++$this->internal_row; + + if ($this->return_objects) + { + if (is_string($this->return_objects)) + { + return mysql_fetch_object($this->result, $this->return_objects); + } + else + { + return mysql_fetch_object($this->result); + } + } + else + { + // Return an array of the row + return mysql_fetch_assoc($this->result); + } + } + +} // End Database_MySQL_Result \ No newline at end of file diff --git a/system/libraries/Database_Mysqli.php b/system/libraries/Database_Mysqli.php new file mode 100644 index 00000000..523fcb19 --- /dev/null +++ b/system/libraries/Database_Mysqli.php @@ -0,0 +1,92 @@ +connection)) + return; + + extract($this->config['connection']); + + // Persistent connections are supported as of PHP 5.3 + if (RUNS_MYSQLND AND $this->config['persistent'] === TRUE) + { + $host = 'p:'.$host; + } + + $host = isset($host) ? $host : $socket; + + if($this->connection = new mysqli($host, $user, $pass, $database, $port)) { + + if (isset($this->config['character_set'])) + { + // Set the character set + $this->set_charset($this->config['character_set']); + } + + // Clear password after successful connect + $this->db_config['connection']['pass'] = NULL; + + return $this->connection; + } + + // 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(); + } + + public function set_charset($charset) + { + // Make sure the database is connected + is_object($this->connection) or $this->connect(); + + if ( ! $this->connection->set_charset($charset)) + { + // Unable to set charset + throw new Database_Exception('#:errno: :error', + array(':error' => $this->connection->connect_error, + ':errno' => $this->connection->connect_errno)); + } + } + + public function query_execute($sql) + { + // Make sure the database is connected + is_object($this->connection) or $this->connect(); + + $result = $this->connection->query($sql); + + // Set the last query + $this->last_query = $sql; + + return new Database_Mysqli_Result($result, $sql, $this->connection, $this->config['object']); + } + + public function escape($value) + { + // Make sure the database is connected + is_object($this->connection) or $this->connect(); + + return $this->connection->real_escape_string($value); + } + +} // End Database_MySQLi diff --git a/system/libraries/Database_Mysqli_Result.php b/system/libraries/Database_Mysqli_Result.php new file mode 100644 index 00000000..3601aeac --- /dev/null +++ b/system/libraries/Database_Mysqli_Result.php @@ -0,0 +1,177 @@ +return_objects = $return_objects; + + $this->total_rows = $result->num_rows; + } + elseif (is_bool($result)) + { + if ($result == FALSE) + { + throw new Database_Exception('#:errno: :error [ :query ]', + array(':error' => $link->error, + ':query' => $sql, + ':errno' => $link->errno)); + } + else + { + // It's a DELETE, INSERT, REPLACE, or UPDATE query + $this->insert_id = $link->insert_id; + $this->total_rows = $link->affected_rows; + } + } + + // Store the result locally + $this->result = $result; + + $this->sql = $sql; + } + + public function __destruct() + { + if (is_object($this->result)) + { + $this->result->free(); + } + } + + public function as_array($return = FALSE) + { + // Return arrays rather than objects + $this->return_objects = FALSE; + + if ( ! $return ) + { + // Return this result object + return $this; + } + + // Return a nested array of all results + if (RUNS_MYSQLND) + return $this->result->fetch_all(MYSQLI_ASSOC); + + $array = array(); + + if ($this->total_rows > 0) + { + // Seek to the beginning of the result + $this->result->data_seek(0); + + while ($row = $this->result->fetch_assoc()) + { + // Add each row to the array + $array[] = $row; + } + $this->internal_row = $this->total_rows; + } + + return $array; + } + + public function as_object($class = NULL, $return = FALSE) + { + // Return objects of type $class (or stdClass if none given) + $this->return_objects = ($class !== NULL) ? $class : TRUE; + + if ( ! $return ) + { + // Return this result object + return $this; + } + + // Return a nested array of all results + $array = array(); + + if ($this->total_rows > 0) + { + // Seek to the beginning of the result + $this->result->data_seek(0); + + if (is_string($this->return_objects)) + { + while ($row = $this->result->fetch_object($this->return_objects)) + { + // Add each row to the array + $array[] = $row; + } + } + else + { + while ($row = $this->result->fetch_object()) + { + // Add each row to the array + $array[] = $row; + } + } + + $this->internal_row = $this->total_rows; + } + + return $array; + } + + /** + * SeekableIterator: seek + */ + public function seek($offset) + { + if ($this->offsetExists($offset) AND $this->result->data_seek($offset)) + { + // Set the current row to the offset + $this->current_row = $offset; + + return TRUE; + } + else + { + return FALSE; + } + } + + /** + * Iterator: current + */ + public function current() + { + if ($this->current_row !== $this->internal_row AND ! $this->seek($this->current_row)) + return NULL; + + ++$this->internal_row; + + if ($this->return_objects) + { + if (is_string($this->return_objects)) + { + return $this->result->fetch_object($this->return_objects); + } + else + { + return $this->result->fetch_object(); + } + } + else + { + // Return an array of the row + return $this->result->fetch_assoc(); + } + } + +} // End Database_MySQLi_Result \ No newline at end of file diff --git a/system/libraries/Database_Query.php b/system/libraries/Database_Query.php new file mode 100644 index 00000000..d9399d66 --- /dev/null +++ b/system/libraries/Database_Query.php @@ -0,0 +1,95 @@ +sql = $sql; + } + + public function __toString() + { + // Return the SQL of this query + return $this->sql; + } + + public function sql($sql) + { + $this->sql = $sql; + + return $this; + } + + public function value($key, $value) + { + $this->params[$key] = $value; + + return $this; + } + + public function bind($key, & $value) + { + $this->params[$key] =& $value; + + return $this; + } + + public function execute($db = 'default') + { + if ( ! is_object($db)) + { + // Get the database instance + $db = Database::instance($db); + } + + // Import the SQL locally + $sql = $this->sql; + + if ( ! empty($this->params)) + { + // Quote all of the values + $params = array_map(array($db, 'quote'), $this->params); + + // Replace the values in the SQL + $sql = strtr($sql, $params); + } + + if ($this->ttl !== FALSE) + { + // Load the result from the cache + return $db->query_cache($sql, $this->ttl); + } + else + { + // Load the result (no caching) + return $db->query($sql); + } + } + + /** + * Set caching for the query + * + * @param mixed Time-to-live (FALSE to disable, NULL for Cache default, seconds otherwise) + * @return Database_Query + */ + public function cache($ttl = NULL) + { + $this->ttl = $ttl; + + return $this; + } + +} // End Database_Query \ No newline at end of file diff --git a/system/libraries/Database_Result.php b/system/libraries/Database_Result.php new file mode 100644 index 00000000..cf2056f3 --- /dev/null +++ b/system/libraries/Database_Result.php @@ -0,0 +1,170 @@ +insert_id; + } + + /** + * Return the named column from the current row. + * + * @param string Column name + * @return mixed + */ + public function get($name) + { + // Get the current row + $row = $this->current(); + + if ( ! $this->return_objects) + return $row[$name]; + + return $row->$name; + } + + /** + * Countable: count + */ + public function count() + { + return $this->total_rows; + } + + /** + * ArrayAccess: offsetExists + */ + public function offsetExists($offset) + { + return ($offset >= 0 AND $offset < $this->total_rows); + } + + /** + * ArrayAccess: offsetGet + */ + public function offsetGet($offset) + { + if ( ! $this->seek($offset)) + return NULL; + + return $this->current(); + } + + /** + * ArrayAccess: offsetSet + * + * @throws Kohana_Database_Exception + */ + final public function offsetSet($offset, $value) + { + throw new Kohana_Exception('Database results are read-only'); + } + + /** + * ArrayAccess: offsetUnset + * + * @throws Kohana_Database_Exception + */ + final public function offsetUnset($offset) + { + throw new Kohana_Exception('Database results are read-only'); + } + + /** + * Iterator: key + */ + public function key() + { + return $this->current_row; + } + + /** + * Iterator: next + */ + public function next() + { + ++$this->current_row; + return $this; + } + + /** + * Iterator: prev + */ + public function prev() + { + --$this->current_row; + return $this; + } + + /** + * Iterator: rewind + */ + public function rewind() + { + $this->current_row = 0; + return $this; + } + + /** + * Iterator: valid + */ + public function valid() + { + return $this->offsetExists($this->current_row); + } + +} // End Database_Result \ No newline at end of file diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 3d564f99..0fbcfc1b 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -4,12 +4,12 @@ * using the MCrypt extension. * @see http://php.net/mcrypt * - * $Id: Encrypt.php 4072 2009-03-13 17:20:38Z jheathco $ + * $Id: Encrypt.php 4683 2009-11-14 17:10:53Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Encrypt_Core { @@ -44,7 +44,7 @@ class Encrypt_Core { public function __construct($config = FALSE) { if ( ! defined('MCRYPT_ENCRYPT')) - throw new Kohana_Exception('encrypt.requires_mcrypt'); + throw new Kohana_Exception('To use the Encrypt library, mcrypt must be enabled in your PHP installation'); if (is_string($config)) { @@ -52,7 +52,7 @@ class Encrypt_Core { // Test the config group name if (($config = Kohana::config('encryption.'.$config)) === NULL) - throw new Kohana_Exception('encrypt.undefined_group', $name); + throw new Kohana_Exception('The :name: group is not defined in your configuration.', array(':name:' => $name)); } if (is_array($config)) @@ -67,7 +67,7 @@ class Encrypt_Core { } if (empty($config['key'])) - throw new Kohana_Exception('encrypt.no_encryption_key'); + throw new Kohana_Exception('To use the Encrypt library, you must set an encryption key in your config file'); // Find the max length of the key, based on cipher and mode $size = mcrypt_get_key_size($config['cipher'], $config['mode']); @@ -84,7 +84,7 @@ class Encrypt_Core { // Cache the config in the object $this->config = $config; - Kohana::log('debug', 'Encrypt Library initialized'); + Kohana_Log::add('debug', 'Encrypt Library initialized'); } /** @@ -144,16 +144,28 @@ class Encrypt_Core { * Decrypts an encoded string back to its original value. * * @param string encoded string to be decrypted - * @return string decrypted data + * @return string decrypted data or FALSE if decryption fails */ public function decode($data) { // Convert the data back to binary - $data = base64_decode($data); + $data = base64_decode($data, TRUE); + + if ( ! $data) + { + // Invalid base64 data + return FALSE; + } // Extract the initialization vector from the data $iv = substr($data, 0, $this->config['iv_size']); + if ($this->config['iv_size'] !== strlen($iv)) + { + // The iv is not the correct size + return FALSE; + } + // Remove the iv from the data $data = substr($data, $this->config['iv_size']); diff --git a/system/libraries/Event_Observer.php b/system/libraries/Event_Observer.php deleted file mode 100644 index 086c8a23..00000000 --- a/system/libraries/Event_Observer.php +++ /dev/null @@ -1,70 +0,0 @@ -update($caller); - } - - /** - * Updates the observer subject with a new caller. - * - * @chainable - * @param object Event_Subject - * @return object - */ - public function update(SplSubject $caller) - { - if ( ! ($caller instanceof Event_Subject)) - throw new Kohana_Exception('event.invalid_subject', get_class($caller), get_class($this)); - - // Update the caller - $this->caller = $caller; - - return $this; - } - - /** - * Detaches this observer from the subject. - * - * @chainable - * @return object - */ - public function remove() - { - // Detach this observer from the caller - $this->caller->detach($this); - - return $this; - } - - /** - * Notify the observer of a new message. This function must be defined in - * all observers and must take exactly one parameter of any type. - * - * @param mixed message string, object, or array - * @return void - */ - abstract public function notify($message); - -} // End Event Observer \ No newline at end of file diff --git a/system/libraries/Event_Subject.php b/system/libraries/Event_Subject.php deleted file mode 100644 index d1ccc544..00000000 --- a/system/libraries/Event_Subject.php +++ /dev/null @@ -1,67 +0,0 @@ -listeners[spl_object_hash($obj)] = $obj; - - return $this; - } - - /** - * Detach an observer from the object. - * - * @chainable - * @param object Event_Observer - * @return object - */ - public function detach(SplObserver $obj) - { - // Remove the listener - unset($this->listeners[spl_object_hash($obj)]); - - return $this; - } - - /** - * Notify all attached observers of a new message. - * - * @chainable - * @param mixed message string, object, or array - * @return object - */ - public function notify($message) - { - foreach ($this->listeners as $obj) - { - $obj->notify($message); - } - - return $this; - } - -} // End Event Subject \ No newline at end of file diff --git a/system/libraries/I18n.php b/system/libraries/I18n.php new file mode 100644 index 00000000..96752e51 --- /dev/null +++ b/system/libraries/I18n.php @@ -0,0 +1,103 @@ + $image)); // Disable error reporting, to prevent PHP warnings $ER = error_reporting(0); @@ -85,11 +91,11 @@ class Image_Core { // Make sure that the image is readable and valid if ( ! is_array($image_info) OR count($image_info) < 3) - throw new Kohana_Exception('image.file_unreadable', $image); + throw new Kohana_Exception('The file specified, :file:, is not readable or is not an image', array(':file:' => $image)); // Check to make sure the image type is allowed if ( ! isset(Image::$allowed_types[$image_info[2]])) - throw new Kohana_Exception('image.type_not_allowed', $image); + throw new Kohana_Exception('The specified image, :type:, is not an allowed image type.', array(':type:' => $image)); // Image has been validated, load it $this->image = array @@ -102,6 +108,8 @@ class Image_Core { 'mime' => $image_info['mime'] ); + $this->determine_orientation(); + // Load configuration $this->config = (array) $config + Kohana::config('image'); @@ -110,14 +118,40 @@ class Image_Core { // Load the driver if ( ! Kohana::auto_load($driver)) - throw new Kohana_Exception('core.driver_not_found', $this->config['driver'], get_class($this)); + throw new Kohana_Exception('The :driver: driver for the :library: library could not be found', + array(':driver:' => $this->config['driver'], ':library:' => get_class($this))); // Initialize the driver $this->driver = new $driver($this->config['params']); // Validate the driver if ( ! ($this->driver instanceof Image_Driver)) - throw new Kohana_Exception('core.driver_implements', $this->config['driver'], get_class($this), 'Image_Driver'); + throw new Kohana_Exception('The :driver: driver for the :library: library must implement the :interface: interface', + array(':driver:' => $this->config['driver'], ':library:' => get_class($this), ':interface:' => 'Image_Driver')); + } + + /** + * Works out the correct orientation for the image + * + * @return void + */ + protected function determine_orientation() + { + switch (TRUE) + { + case $this->image['height'] > $this->image['width']: + $orientation = Image::PORTRAIT; + break; + + case $this->image['height'] < $this->image['width']: + $orientation = Image::LANDSCAPE; + break; + + default: + $orientation = Image::SQUARE; + } + + $this->image['orientation'] = $orientation; } /** @@ -134,7 +168,8 @@ class Image_Core { } else { - throw new Kohana_Exception('core.invalid_property', $property, get_class($this)); + throw new Kohana_Exception('The :property: property does not exist in the :class: class.', + array(':property:' => $property, ':class:' => get_class($this))); } } @@ -153,13 +188,13 @@ class Image_Core { public function resize($width, $height, $master = NULL) { if ( ! $this->valid_size('width', $width)) - throw new Kohana_Exception('image.invalid_width', $width); + throw new Kohana_Exception('The width you specified, :width:, is not valid.', array(':width:' => $width)); if ( ! $this->valid_size('height', $height)) - throw new Kohana_Exception('image.invalid_height', $height); + throw new Kohana_Exception('The height you specified, :height:, is not valid.', array(':height:' => $height)); if (empty($width) AND empty($height)) - throw new Kohana_Exception('image.invalid_dimensions', __FUNCTION__); + throw new Kohana_Exception('The dimensions specified for :function: are not valid.', array(':function:' => __FUNCTION__)); if ($master === NULL) { @@ -167,7 +202,7 @@ class Image_Core { $master = Image::AUTO; } elseif ( ! $this->valid_size('master', $master)) - throw new Kohana_Exception('image.invalid_master'); + throw new Kohana_Exception('The master dimension specified is not valid.'); $this->actions['resize'] = array ( @@ -176,6 +211,8 @@ class Image_Core { 'master' => $master, ); + $this->determine_orientation(); + return $this; } @@ -194,19 +231,19 @@ class Image_Core { public function crop($width, $height, $top = 'center', $left = 'center') { if ( ! $this->valid_size('width', $width)) - throw new Kohana_Exception('image.invalid_width', $width); + throw new Kohana_Exception('The width you specified, :width:, is not valid.', array(':width:' => $width)); if ( ! $this->valid_size('height', $height)) - throw new Kohana_Exception('image.invalid_height', $height); + throw new Kohana_Exception('The height you specified, :height:, is not valid.', array(':height:' => $height)); if ( ! $this->valid_size('top', $top)) - throw new Kohana_Exception('image.invalid_top', $top); + throw new Kohana_Exception('The top offset you specified, :top:, is not valid.', array(':top:' => $top)); if ( ! $this->valid_size('left', $left)) - throw new Kohana_Exception('image.invalid_left', $left); + throw new Kohana_Exception('The left offset you specified, :left:, is not valid.', array(':left:' => $left)); if (empty($width) AND empty($height)) - throw new Kohana_Exception('image.invalid_dimensions', __FUNCTION__); + throw new Kohana_Exception('The dimensions specified for :function: are not valid.', array(':function:' => __FUNCTION__)); $this->actions['crop'] = array ( @@ -216,6 +253,8 @@ class Image_Core { 'left' => $left, ); + $this->determine_orientation(); + return $this; } @@ -269,7 +308,7 @@ class Image_Core { // Check to make sure the image type is allowed if ( ! isset(Image::$allowed_types[$image_info[2]])) - throw new Kohana_Exception('image.type_not_allowed', $overlay_file); + throw new Kohana_Exception('The specified image, :type:, is not an allowed image type.', array(':type:' => $overlay_file)); $this->actions['composite'] = array ( @@ -293,7 +332,7 @@ class Image_Core { public function flip($direction) { if ($direction !== Image::HORIZONTAL AND $direction !== Image::VERTICAL) - throw new Kohana_Exception('image.invalid_flip'); + throw new Kohana_Exception('The flip direction specified is not valid.'); $this->actions['flip'] = $direction; @@ -335,7 +374,7 @@ class Image_Core { * @param boolean keep or discard image process actions * @return object */ - public function save($new_image = FALSE, $chmod = 0644, $keep_actions = FALSE) + public function save($new_image = FALSE, $chmod = 0644, $keep_actions = FALSE, $background = NULL) { // If no new image is defined, use the current image empty($new_image) and $new_image = $this->image['file']; @@ -348,9 +387,9 @@ class Image_Core { $dir = str_replace('\\', '/', realpath($dir)).'/'; if ( ! is_writable($dir)) - throw new Kohana_Exception('image.directory_unwritable', $dir); + throw new Kohana_Exception('The specified directory, :dir:, is not writable.', array(':dir:' => $dir)); - if ($status = $this->driver->process($this->image, $this->actions, $dir, $file)) + if ($status = $this->driver->process($this->image, $this->actions, $dir, $file, FALSE, $background)) { if ($chmod !== FALSE) { @@ -359,9 +398,11 @@ class Image_Core { } } - // Reset actions. Subsequent save() or render() will not apply previous actions. - if ($keep_actions === FALSE) + if ($keep_actions !== TRUE) + { + // Reset actions. Subsequent save() or render() will not apply previous actions. $this->actions = array(); + } return $status; } @@ -372,7 +413,7 @@ class Image_Core { * @param boolean keep or discard image process actions * @return object */ - public function render($keep_actions = FALSE) + public function render($keep_actions = FALSE, $background = NULL) { $new_image = $this->image['file']; @@ -384,11 +425,13 @@ class Image_Core { $dir = str_replace('\\', '/', realpath($dir)).'/'; // Process the image with the driver - $status = $this->driver->process($this->image, $this->actions, $dir, $file, $render = TRUE); + $status = $this->driver->process($this->image, $this->actions, $dir, $file, TRUE, $background); - // Reset actions. Subsequent save() or render() will not apply previous actions. - if ($keep_actions === FALSE) + if ($keep_actions !== TRUE) + { + // Reset actions. Subsequent save() or render() will not apply previous actions. $this->actions = array(); + } return $status; } diff --git a/system/libraries/Input.php b/system/libraries/Input.php index 0e23c800..83f0ed17 100644 --- a/system/libraries/Input.php +++ b/system/libraries/Input.php @@ -2,12 +2,12 @@ /** * Input library. * - * $Id: Input.php 4346 2009-05-11 17:08:15Z zombor $ + * $Id: Input.php 4680 2009-11-10 01:57:00Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Input_Core { @@ -48,6 +48,18 @@ class Input_Core { */ public function __construct() { + // Convert all global variables to Kohana charset + $_GET = Input::clean($_GET); + $_POST = Input::clean($_POST); + $_COOKIE = Input::clean($_COOKIE); + $_SERVER = Input::clean($_SERVER); + + if (PHP_SAPI == 'cli') + { + // Convert command line arguments + $_SERVER['argv'] = Input::clean($_SERVER['argv']); + } + // Use XSS clean? $this->use_xss_clean = (bool) Kohana::config('core.global_xss_filtering'); @@ -56,15 +68,15 @@ class Input_Core { // magic_quotes_runtime is enabled if (get_magic_quotes_runtime()) { - set_magic_quotes_runtime(0); - Kohana::log('debug', 'Disable magic_quotes_runtime! It is evil and deprecated: http://php.net/magic_quotes'); + @set_magic_quotes_runtime(0); + Kohana_Log::add('debug', 'Disable magic_quotes_runtime! It is evil and deprecated: http://php.net/magic_quotes'); } // magic_quotes_gpc is enabled if (get_magic_quotes_gpc()) { $this->magic_quotes_gpc = TRUE; - Kohana::log('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes'); + Kohana_Log::add('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes'); } // register_globals is enabled @@ -93,7 +105,7 @@ class Input_Core { } // Warn the developer about register globals - Kohana::log('debug', 'Disable register_globals! It is evil and deprecated: http://php.net/register_globals'); + Kohana_Log::add('debug', 'Disable register_globals! It is evil and deprecated: http://php.net/register_globals'); } if (is_array($_GET)) @@ -142,7 +154,7 @@ class Input_Core { // Create a singleton Input::$instance = $this; - Kohana::log('debug', 'Global GET, POST and COOKIE data sanitized'); + Kohana_Log::add('debug', 'Global GET, POST and COOKIE data sanitized'); } } @@ -173,7 +185,8 @@ class Input_Core { } /** - * Fetch an item from the $_COOKIE array. + * Fetch an item from the cookie::get() ($_COOKIE won't work with signed + * cookies.) * * @param string key to find * @param mixed default value @@ -182,7 +195,7 @@ class Input_Core { */ public function cookie($key = array(), $default = NULL, $xss_clean = FALSE) { - return $this->search_array($_COOKIE, $key, $default, $xss_clean); + return $this->search_array(cookie::get(), $key, $default, $xss_clean); } /** @@ -300,93 +313,123 @@ class Input_Core { if ($tool === TRUE) { - // NOTE: This is necessary because switch is NOT type-sensative! $tool = 'default'; } + elseif ( ! method_exists($this, 'xss_filter_'.$tool)) + { + Kohana_Log::add('error', 'Unable to use Input::xss_filter_'.$tool.'(), no such method exists'); + $tool = 'default'; + } + + $method = 'xss_filter_'.$tool; - switch ($tool) + return $this->$method($data); + } + + /** + * Default built-in cross site scripting filter. + * + * @param string data to clean + * @return string + */ + protected function xss_filter_default($data) + { + // http://svn.bitflux.ch/repos/public/popoon/trunk/classes/externalinput.php + // +----------------------------------------------------------------------+ + // | Copyright (c) 2001-2006 Bitflux GmbH | + // +----------------------------------------------------------------------+ + // | Licensed under the Apache License, Version 2.0 (the "License"); | + // | you may not use this file except in compliance with the License. | + // | You may obtain a copy of the License at | + // | http://www.apache.org/licenses/LICENSE-2.0 | + // | Unless required by applicable law or agreed to in writing, software | + // | distributed under the License is distributed on an "AS IS" BASIS, | + // | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | + // | implied. See the License for the specific language governing | + // | permissions and limitations under the License. | + // +----------------------------------------------------------------------+ + // | Author: Christian Stocker | + // +----------------------------------------------------------------------+ + // + // Kohana Modifications: + // * Changed double quotes to single quotes, changed indenting and spacing + // * Removed magic_quotes stuff + // * Increased regex readability: + // * Used delimeters that aren't found in the pattern + // * Removed all unneeded escapes + // * Deleted U modifiers and swapped greediness where needed + // * Increased regex speed: + // * Made capturing parentheses non-capturing where possible + // * Removed parentheses where possible + // * Split up alternation alternatives + // * Made some quantifiers possessive + + // Fix &entity\n; + $data = str_replace(array('&','<','>'), array('&amp;','&lt;','&gt;'), $data); + $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data); + $data = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $data); + $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); + + // 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); + $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2novbscript...', $data); + $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', '$1=$2nomozbinding...', $data); + + // Only works in IE: + $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', '$1>', $data); + $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', '$1>', $data); + $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', '$1>', $data); + + // Remove namespaced elements (we do not need them) + $data = preg_replace('#]*+>#i', '', $data); + + do { - case 'htmlpurifier': - /** - * @todo License should go here, http://htmlpurifier.org/ - */ - if ( ! class_exists('HTMLPurifier_Config', FALSE)) - { - // Load HTMLPurifier - require Kohana::find_file('vendor', 'htmlpurifier/HTMLPurifier.auto', TRUE); - require 'HTMLPurifier.func.php'; - } + // Remove really unwanted tags + $old_data = $data; + $data = preg_replace('#]*+>#i', '', $data); + } + while ($old_data !== $data); - // Set configuration - $config = HTMLPurifier_Config::createDefault(); - $config->set('HTML', 'TidyLevel', 'none'); // Only XSS cleaning now - - // Run HTMLPurifier - $data = HTMLPurifier($data, $config); - break; - default: - // http://svn.bitflux.ch/repos/public/popoon/trunk/classes/externalinput.php - // +----------------------------------------------------------------------+ - // | Copyright (c) 2001-2006 Bitflux GmbH | - // +----------------------------------------------------------------------+ - // | Licensed under the Apache License, Version 2.0 (the "License"); | - // | you may not use this file except in compliance with the License. | - // | You may obtain a copy of the License at | - // | http://www.apache.org/licenses/LICENSE-2.0 | - // | Unless required by applicable law or agreed to in writing, software | - // | distributed under the License is distributed on an "AS IS" BASIS, | - // | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | - // | implied. See the License for the specific language governing | - // | permissions and limitations under the License. | - // +----------------------------------------------------------------------+ - // | Author: Christian Stocker | - // +----------------------------------------------------------------------+ - // - // Kohana Modifications: - // * Changed double quotes to single quotes, changed indenting and spacing - // * Removed magic_quotes stuff - // * Increased regex readability: - // * Used delimeters that aren't found in the pattern - // * Removed all unneeded escapes - // * Deleted U modifiers and swapped greediness where needed - // * Increased regex speed: - // * Made capturing parentheses non-capturing where possible - // * Removed parentheses where possible - // * Split up alternation alternatives - // * Made some quantifiers possessive - - // Fix &entity\n; - $data = str_replace(array('&','<','>'), array('&amp;','&lt;','&gt;'), $data); - $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data); - $data = preg_replace('/(&#x*[0-9A-F]+);*/iu', '$1;', $data); - $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); - - // 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); - $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iu', '$1=$2novbscript...', $data); - $data = preg_replace('#([a-z]*)[\x00-\x20]*=([\'"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#u', '$1=$2nomozbinding...', $data); - - // Only works in IE: - $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?expression[\x00-\x20]*\([^>]*+>#i', '$1>', $data); - $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?behaviour[\x00-\x20]*\([^>]*+>#i', '$1>', $data); - $data = preg_replace('#(<[^>]+?)style[\x00-\x20]*=[\x00-\x20]*[`\'"]*.*?s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*+>#iu', '$1>', $data); - - // Remove namespaced elements (we do not need them) - $data = preg_replace('#]*+>#i', '', $data); - - do - { - // Remove really unwanted tags - $old_data = $data; - $data = preg_replace('#]*+>#i', '', $data); - } - while ($old_data !== $data); - break; + return $data; + } + + /** + * HTMLPurifier cross site scripting filter. This version assumes the + * existence of the "Standalone Distribution" htmlpurifier library, and is set to not tidy + * input. + * + * @param string data to clean + * @return string + */ + protected function xss_filter_htmlpurifier($data) + { + /** + * @todo License should go here, http://htmlpurifier.org/ + */ + if ( ! class_exists('HTMLPurifier_Config', FALSE)) + { + // Load HTMLPurifier + require Kohana::find_file('vendor', 'htmlpurifier/HTMLPurifier.standalone', TRUE); } + // Set configuration + $config = HTMLPurifier_Config::createDefault(); + $config->set('HTML.TidyLevel', 'none'); // Only XSS cleaning now + + $cache = Kohana::config('html_purifier.cache'); + + if ($cache AND is_string($cache)) + { + $config->set('Cache.SerializerPath', $cache); + } + + // Run HTMLPurifier + $data = HTMLPurifier::instance($config)->purify($data); + return $data; } @@ -399,9 +442,7 @@ class Input_Core { */ public function clean_input_keys($str) { - $chars = PCRE_UNICODE_PROPERTIES ? '\pL' : 'a-zA-Z'; - - if ( ! preg_match('#^['.$chars.'0-9:_.-]++$#uD', $str)) + if ( ! preg_match('#^[\pL0-9:_.-]++$#uD', $str)) { exit('Disallowed key characters in global data.'); } @@ -449,4 +490,43 @@ class Input_Core { return $str; } + /** + * Recursively cleans arrays, objects, and strings. Removes ASCII control + * codes and converts to UTF-8 while silently discarding incompatible + * UTF-8 characters. + * + * @param string string to clean + * @return string + */ + public static function clean($str) + { + if (is_array($str) OR is_object($str)) + { + foreach ($str as $key => $val) + { + // Recursion! + $str[Input::clean($key)] = Input::clean($val); + } + } + elseif (is_string($str) AND $str !== '') + { + // Remove control characters + $str = text::strip_ascii_ctrl($str); + + if ( ! text::is_ascii($str)) + { + // Disable notices + $ER = error_reporting(~E_NOTICE); + + // iconv is expensive, so it is only used when needed + $str = iconv(Kohana::CHARSET, Kohana::CHARSET.'//IGNORE', $str); + + // Turn notices back on + error_reporting($ER); + } + } + + return $str; + } + } // End Input Class diff --git a/system/libraries/Kohana_404_Exception.php b/system/libraries/Kohana_404_Exception.php new file mode 100644 index 00000000..8c7cc787 --- /dev/null +++ b/system/libraries/Kohana_404_Exception.php @@ -0,0 +1,56 @@ + $page)); + } + + /** + * Throws a new 404 exception. + * + * @throws Kohana_404_Exception + * @return void + */ + public static function trigger($page = NULL) + { + throw new Kohana_404_Exception($page); + } + + /** + * Sends 404 headers, to emulate server behavior. + * + * @return void + */ + public function sendHeaders() + { + // Send the 404 header + header('HTTP/1.1 404 File Not Found'); + } + +} // End Kohana 404 Exception \ No newline at end of file diff --git a/system/libraries/Kohana_Log.php b/system/libraries/Kohana_Log.php new file mode 100644 index 00000000..44ef8af8 --- /dev/null +++ b/system/libraries/Kohana_Log.php @@ -0,0 +1,90 @@ + $driver)); + + // Initialize the driver + $driver = new $driver(array_merge(Kohana::config('log'), Kohana::config('log_'.$driver_name))); + + // Validate the driver + if ( ! ($driver instanceof Log_Driver)) + throw new Kohana_Exception('%driver% does not implement the Log_Driver interface', array('%driver%' => $driver)); + + Kohana_Log::$drivers[] = $driver; + } + + // Always save logs on shutdown + Event::add('system.shutdown', array('Kohana_Log', 'save')); + } + + Kohana_Log::$messages[] = array('date' => time(), 'type' => $type, 'message' => $message); + } + + /** + * Save all currently logged messages. + * + * @return void + */ + public static function save() + { + if (empty(Kohana_Log::$messages)) + return; + + foreach (Kohana_Log::$drivers as $driver) + { + // We can't throw exceptions here or else we will get a + // Exception thrown without a stack frame error + try + { + $driver->save(Kohana_Log::$messages); + } + catch(Exception $e){} + } + + // Reset the messages + Kohana_Log::$messages = array(); + } +} \ No newline at end of file diff --git a/system/libraries/Kohana_PHP_Exception.php b/system/libraries/Kohana_PHP_Exception.php new file mode 100644 index 00000000..fca5b30b --- /dev/null +++ b/system/libraries/Kohana_PHP_Exception.php @@ -0,0 +1,99 @@ +code = $code; + $this->file = $file; + $this->line = $line; + } + + /** + * PHP error handler. + * + * @throws Kohana_PHP_Exception + * @return void + */ + public static function error_handler($code, $error, $file, $line, $context = NULL) + { + // Respect error_reporting settings + if (error_reporting() & $code) + { + // Throw an exception + throw new Kohana_PHP_Exception($code, $error, $file, $line, $context); + } + } + + /** + * Catches errors that are not caught by the error handler, such as E_PARSE. + * + * @uses Kohana_Exception::handle() + * @return void + */ + public static function shutdown_handler() + { + if (Kohana_PHP_Exception::$enabled AND $error = error_get_last()) + { + // Fake an exception for nice debugging + Kohana_Exception::handle(new Kohana_PHP_Exception($error['type'], $error['message'], $error['file'], $error['line'])); + } + } + +} // End Kohana PHP Exception diff --git a/system/libraries/Kohana_User_Exception.php b/system/libraries/Kohana_User_Exception.php new file mode 100644 index 00000000..95b7bc68 --- /dev/null +++ b/system/libraries/Kohana_User_Exception.php @@ -0,0 +1,30 @@ +code = $title; + } + +} // End Kohana User Exception diff --git a/system/libraries/Model.php b/system/libraries/Model.php index 0c9fd8d6..01d16fdd 100644 --- a/system/libraries/Model.php +++ b/system/libraries/Model.php @@ -2,15 +2,46 @@ /** * Model base class. * - * $Id: Model.php 4007 2009-02-20 01:54:00Z jheathco $ + * $Id: Model.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team * @copyright (c) 2007-2009 Kohana Team - * @license http://kohanaphp.com/license.html + * @license http://kohanaphp.com/license */ class Model_Core { + /** + * Creates and returns a new model. + * + * @param string model name + * @param mixed constructor arguments + * @param boolean construct the model with multiple arguments + * @return Model + */ + public static function factory($name, $args = NULL, $multiple = FALSE) + { + // Model class name + $class = ucfirst($name).'_Model'; + + if ($args === NULL) + { + // Create a new model with no arguments + return new $class; + } + + if ($multiple !== TRUE) + { + // Create a model with a single argument + return new $class($args); + } + + $class = new ReflectionClass($class); + + // Create a model with multiple arguments + return $class->newInstanceArgs($args); + } + // Database object protected $db = 'default'; diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php index 5196ba27..1d1f48f5 100644 --- a/system/libraries/ORM.php +++ b/system/libraries/ORM.php @@ -8,12 +8,12 @@ * [ref-orm]: http://wikipedia.org/wiki/Object-relational_mapping * [ref-act]: http://wikipedia.org/wiki/Active_record * - * $Id: ORM.php 4354 2009-05-15 16:51:37Z kiall $ + * $Id: ORM.php 4682 2009-11-11 20:53:23Z isaiah $ * * @package ORM * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class ORM_Core { @@ -22,6 +22,7 @@ class ORM_Core { protected $belongs_to = array(); protected $has_many = array(); protected $has_and_belongs_to_many = array(); + protected $has_many_through = array(); // Relationships that should always be joined protected $load_with = array(); @@ -30,9 +31,11 @@ class ORM_Core { protected $object = array(); protected $changed = array(); protected $related = array(); - protected $loaded = FALSE; - protected $saved = FALSE; + protected $_valid = FALSE; + protected $_loaded = FALSE; + protected $_saved = FALSE; protected $sorting; + protected $rules = array(); // Related objects protected $object_relations = array(); @@ -45,6 +48,10 @@ class ORM_Core { protected $table_columns; protected $ignored_columns; + // Auto-update columns for creation and updates + protected $updated_column = NULL; + protected $created_column = NULL; + // Table primary key and value protected $primary_key = 'id'; protected $primary_val = 'name'; @@ -59,6 +66,7 @@ class ORM_Core { // Database configuration protected $db = 'default'; protected $db_applied = array(); + protected $db_builder; // With calls already applied protected $with_applied = array(); @@ -109,12 +117,15 @@ class ORM_Core { if (is_object($id)) { // Load an object - $this->load_values((array) $id); + $this->_load_values((array) $id); } elseif (!empty($id)) { - // Find an object - $this->find($id); + // Set the object's primary key, but don't load it until needed + $this->object[$this->primary_key] = $id; + + // Object is considered saved until something is set + $this->_saved = TRUE; } } @@ -152,6 +163,9 @@ class ORM_Core { // Load column information $this->reload_columns(); + + // Initialize the builder + $this->db_builder = db::build(); } /** @@ -163,7 +177,7 @@ class ORM_Core { public function __sleep() { // Store only information about the object - return array('object_name', 'object', 'changed', 'loaded', 'saved', 'sorting'); + return array('object_name', 'object', 'changed', '_loaded', '_saved', 'sorting'); } /** @@ -194,10 +208,10 @@ class ORM_Core { */ public function __call($method, array $args) { - if (method_exists($this->db, $method)) + if (method_exists($this->db_builder, $method)) { - if (in_array($method, array('query', 'get', 'insert', 'update', 'delete'))) - throw new Kohana_Exception('orm.query_methods_not_allowed'); + if (in_array($method, array('execute', 'insert', 'update', 'delete'))) + throw new Kohana_Exception('Query methods cannot be used through ORM'); // Method has been applied to the database $this->db_applied[$method] = $method; @@ -208,7 +222,7 @@ class ORM_Core { if ($method === 'select' AND $num_args > 3) { // Call select() manually to avoid call_user_func_array - $this->db->select($args); + $this->db_builder->select($args); } else { @@ -220,28 +234,28 @@ class ORM_Core { switch ($num_args) { case 0: - if (in_array($method, array('open_paren', 'close_paren', 'enable_cache', 'disable_cache'))) + if (in_array($method, array('open', 'close', 'cache'))) { // Should return ORM, not Database - $this->db->$method(); + $this->db_builder->$method(); } else { // Support for things like reset_select, reset_write, list_tables - return $this->db->$method(); + return $this->db_builder->$method(); } break; case 1: - $this->db->$method($args[0]); + $this->db_builder->$method($args[0]); break; case 2: - $this->db->$method($args[0], $args[1]); + $this->db_builder->$method($args[0], $args[1]); break; case 3: - $this->db->$method($args[0], $args[1], $args[2]); + $this->db_builder->$method($args[0], $args[1], $args[2]); break; case 4: - $this->db->$method($args[0], $args[1], $args[2], $args[3]); + $this->db_builder->$method($args[0], $args[1], $args[2], $args[3]); break; default: // Here comes the snail... @@ -254,7 +268,8 @@ class ORM_Core { } else { - throw new Kohana_Exception('core.invalid_method', $method, get_class($this)); + throw new Kohana_Exception('Invalid method :method called in :class', + array(':method' => $method, ':class' => get_class($this))); } } @@ -268,6 +283,13 @@ class ORM_Core { { if (array_key_exists($column, $this->object)) { + if( ! $this->loaded() AND ! $this->empty_primary_key()) + { + // Column asked for but the object hasn't been loaded yet, so do it now + // Ignore loading of any columns that have been changed + $this->find($this->object[$this->primary_key], TRUE); + } + return $this->object[$column]; } elseif (isset($this->related[$column])) @@ -276,16 +298,29 @@ class ORM_Core { } elseif ($column === 'primary_key_value') { + if( ! $this->loaded() AND ! $this->empty_primary_key() AND $this->unique_key($this->object[$this->primary_key]) !== $this->primary_key) + { + // Load if object hasn't been loaded and the key given isn't the primary_key + // that we need (i.e. passing an email address to ORM::factory rather than the id) + $this->find($this->object[$this->primary_key], TRUE); + } + return $this->object[$this->primary_key]; } elseif ($model = $this->related_object($column)) { // This handles the has_one and belongs_to relationships - if (in_array($model->object_name, $this->belongs_to) OR ! array_key_exists($this->foreign_key($column), $model->object)) + if (in_array($model->object_name, $this->belongs_to)) { - // Foreign key lies in this table (this model belongs_to target model) OR an invalid has_one relationship - $where = array($model->table_name.'.'.$model->primary_key => $this->object[$this->foreign_key($column)]); + if ( ! $this->loaded() AND ! $this->empty_primary_key()) + { + // Load this object first so we know what id to look for in the foreign table + $this->find($this->object[$this->primary_key], TRUE); + } + + // Foreign key lies in this table (this model belongs_to target model) + $where = array($model->foreign_key(TRUE) => $this->object[$this->foreign_key($column)]); } else { @@ -296,10 +331,10 @@ class ORM_Core { // one<>alias:one relationship return $this->related[$column] = $model->find($where); } - elseif (isset($this->has_many[$column])) + elseif (isset($this->has_many_through[$column])) { // Load the "middle" model - $through = ORM::factory(inflector::singular($this->has_many[$column])); + $through = ORM::factory(inflector::singular($this->has_many_through[$column])); // Load the "end" model $model = ORM::factory(inflector::singular($column)); @@ -308,21 +343,27 @@ class ORM_Core { // User-defined foreign keys must be defined in the 'through' model $join_table = $through->table_name; $join_col1 = $through->foreign_key($model->object_name, $join_table); - $join_col2 = $model->table_name.'.'.$model->primary_key; + $join_col2 = $model->foreign_key(TRUE); // one<>alias:many relationship - return $this->related[$column] = $model + return $model ->join($join_table, $join_col1, $join_col2) - ->where($through->foreign_key($this->object_name, $join_table), $this->object[$this->primary_key]) - ->find_all(); + ->where($through->foreign_key($this->object_name, $join_table), '=', $this->primary_key_value); + } + elseif (isset($this->has_many[$column])) + { + // one<>many aliased relationship + $model_name = $this->has_many[$column]; + + $model = ORM::factory(inflector::singular($model_name)); + + return $model->where($this->foreign_key($column, $model->table_name), '=', $this->primary_key_value); } elseif (in_array($column, $this->has_many)) { // one<>many relationship $model = ORM::factory(inflector::singular($column)); - return $this->related[$column] = $model - ->where($this->foreign_key($column, $model->table_name), $this->object[$this->primary_key]) - ->find_all(); + return $model->where($this->foreign_key($column, $model->table_name), '=', $this->primary_key_value); } elseif (in_array($column, $this->has_and_belongs_to_many)) { @@ -332,16 +373,12 @@ class ORM_Core { if ($this->has($model, TRUE)) { // many<>many relationship - return $this->related[$column] = $model - ->in($model->table_name.'.'.$model->primary_key, $this->changed_relations[$column]) - ->find_all(); + return $model->where($model->foreign_key(TRUE), 'IN', $this->changed_relations[$column]); } else { // empty many<>many relationship - return $this->related[$column] = $model - ->where($model->table_name.'.'.$model->primary_key, NULL) - ->find_all(); + return $model->where($model->foreign_key(TRUE), 'IS', NULL); } } elseif (isset($this->ignored_columns[$column])) @@ -350,10 +387,9 @@ class ORM_Core { } elseif (in_array($column, array ( - 'object_name', 'object_plural', // Object + 'object_name', 'object_plural','_valid', // Object 'primary_key', 'primary_val', 'table_name', 'table_columns', // Table - 'loaded', 'saved', // Status - 'has_one', 'belongs_to', 'has_many', 'has_and_belongs_to_many', 'load_with' // Relationships + 'has_one', 'belongs_to', 'has_many', 'has_many_through', 'has_and_belongs_to_many', 'load_with' // Relationships ))) { // Model meta information @@ -361,8 +397,32 @@ class ORM_Core { } else { - throw new Kohana_Exception('core.invalid_property', $column, get_class($this)); + throw new Kohana_Exception('The :property property does not exist in the :class class', + array(':property' => $column, ':class' => get_class($this))); + } + } + + /** + * Tells you if the Model has been loaded or not + * + * @return bool + */ + public function loaded() { + if ( ! $this->_loaded AND ! $this->empty_primary_key()) + { + // If returning the loaded member and no load has been attempted, do it now + $this->find($this->object[$this->primary_key], TRUE); } + return $this->_loaded; + } + + /** + * Tells you if the model was saved successfully or not + * + * @return bool + */ + public function saved() { + return $this->_saved; } /** @@ -386,7 +446,7 @@ class ORM_Core { $this->changed[$column] = $column; // Object is no longer saved - $this->saved = FALSE; + $this->_saved = FALSE; } $this->object[$column] = $this->load_type($column, $value); @@ -413,8 +473,33 @@ class ORM_Core { } else { - throw new Kohana_Exception('core.invalid_property', $column, get_class($this)); + throw new Kohana_Exception('The :property: property does not exist in the :class: class', + array(':property:' => $column, ':class:' => get_class($this))); + } + } + + /** + * Chainable set method + * + * @param string name of field or array of key => val + * @param mixed value + * @return ORM + */ + public function set($name, $value = NULL) + { + if (is_array($name)) + { + foreach ($name as $key => $value) + { + $this->__set($key, $value); + } + } + else + { + $this->__set($name, $value); } + + return $this; } /** @@ -446,7 +531,7 @@ class ORM_Core { */ public function __toString() { - return (string) $this->object[$this->primary_key]; + return (string) $this->primary_key_value; } /** @@ -464,6 +549,15 @@ class ORM_Core { $object[$key] = $this->$key; } + foreach ($this->with_applied as $model => $enabled) + { + // Generate arrays for relationships + if ($enabled) + { + $object[$model] = $this->$model->as_array(); + } + } + return $object; } @@ -471,8 +565,8 @@ class ORM_Core { * Binds another one-to-one object to this model. One-to-one objects * can be nested using 'object1:object2' syntax * - * @param string $target_path - * @return void + * @param string target model to bind to + * @return void */ public function with($target_path) { @@ -521,19 +615,19 @@ class ORM_Core { // Add to with_applied to prevent duplicate joins $this->with_applied[$target_path] = TRUE; + $select = array(); + // Use the keys of the empty object to determine the columns - $select = array_keys($target->object); - foreach ($select as $i => $column) + foreach (array_keys($target->object) as $column) { // Add the prefix so that load_result can determine the relationship - $select[$i] = $target_path.'.'.$column.' AS '.$target_path.':'.$column; + $select[$target_path.':'.$column] = $target_path.'.'.$column; } - // Select all of the prefixed keys in the object - $this->db->select($select); + $this->db_builder->select($select); - if (in_array($target->object_name, $parent->belongs_to) OR ! isset($target->object[$parent->foreign_key($target_name)])) + if (in_array($target->object_name, $parent->belongs_to)) { // Parent belongs_to target, use target's primary key as join column $join_col1 = $target->foreign_key(TRUE, $target_path); @@ -546,11 +640,12 @@ class ORM_Core { $join_col1 = $parent->foreign_key($target_name, $target_path); } - // This allows for models to use different table prefixes (sharing the same database) - $join_table = new Database_Expression($target->db->table_prefix().$target->table_name.' AS '.$this->db->table_prefix().$target_path); + // This trick allows for models to use different table prefixes (sharing the same database) + $join_table = array($this->db->quote_table($target_path) => $target->db->quote_table($target->table_name)); // Join the related object into the result - $this->db->join($join_table, $join_col1, $join_col2, 'LEFT'); + // Use Database_Expression to disable prefixing + $this->db_builder->join(new Database_Expression($join_table), $join_col1, $join_col2, 'LEFT'); return $this; } @@ -560,25 +655,26 @@ class ORM_Core { * * @chainable * @param mixed primary key or an array of clauses + * @param bool ignore loading of columns that have been modified * @return ORM */ - public function find($id = NULL) + public function find($id = NULL, $ignore_changed = FALSE) { if ($id !== NULL) { if (is_array($id)) { // Search for all clauses - $this->db->where($id); + $this->db_builder->where($id); } else { // Search for a specific column - $this->db->where($this->table_name.'.'.$this->unique_key($id), $id); + $this->db_builder->where($this->table_name.'.'.$this->unique_key($id), '=', $id); } } - return $this->load_result(); + return $this->load_result(FALSE, $ignore_changed); } /** @@ -627,68 +723,52 @@ class ORM_Core { } // Return a select list from the results - return $this->select($key, $val)->find_all()->select_list($key, $val); + return $this->select($this->table_name.'.'.$key, $this->table_name.'.'.$val)->find_all()->select_list($key, $val); } /** - * Validates the current object. This method should generally be called - * via the model, after the $_POST Validation object has been created. + * Validates the current object. This method requires that rules are set to be useful, if called with out + * any rules set, or if a Validation object isn't passed, nothing happens. * * @param object Validation array - * @return boolean + * @param boolean Save on validate + * @return ORM + * @chainable */ - public function validate(Validation $array, $save = FALSE) + public function validate(Validation $array = NULL) { - $safe_array = $array->safe_array(); + if ($array === NULL) + $array = new Validation($this->object); - if ( ! $array->submitted()) + if (count($this->rules) > 0) { - foreach ($safe_array as $key => $value) + foreach ($this->rules as $field => $parameters) { - // Get the value from this object - $value = $this->$key; - - if (is_object($value) AND $value instanceof ORM_Iterator) - { - // Convert the value to an array of primary keys - $value = $value->primary_key_array(); + foreach ($parameters as $type => $value) { + switch ($type) { + case 'pre_filter': + $array->pre_filter($value,$field); + break; + case 'rules': + $rules = array_merge(array($field),$value); + call_user_func_array(array($array,'add_rules'), $rules); + break; + case 'callbacks': + $callbacks = array_merge(array($field),$value); + call_user_func_array(array($array,'add_callbacks'), $callbacks); + break; + } } - - // Pre-fill data - $array[$key] = $value; } } - // Validate the array - if ($status = $array->validate()) + if (($this->_valid = $array->validate()) === FALSE) { - // Grab only set fields (excludes missing data, unlike safe_array) - $fields = $array->as_array(); - - foreach ($fields as $key => $value) - { - if (isset($safe_array[$key])) - { - // Set new data, ignoring any missing fields or fields without rules - $this->$key = $value; - } - } - - if ($save === TRUE OR is_string($save)) - { - // Save this object - $this->save(); - - if (is_string($save)) - { - // Redirect to the saved page - url::redirect($save); - } - } + ORM_Validation_Exception::handle_validation($this->table_name, $array); } // Return validation status - return $status; + return $this; } /** @@ -701,6 +781,10 @@ class ORM_Core { { if ( ! empty($this->changed)) { + // Require model validation before saving + if (!$this->_valid) + $this->validate(); + $data = array(); foreach ($this->changed as $column) { @@ -708,41 +792,64 @@ class ORM_Core { $data[$column] = $this->object[$column]; } - if ($this->loaded === TRUE) + if ( ! $this->empty_primary_key() AND ! isset($this->changed[$this->primary_key])) { - $query = $this->db - ->where($this->primary_key, $this->object[$this->primary_key]) - ->update($this->table_name, $data); + // Primary key isn't empty and hasn't been changed so do an update + + if (is_array($this->updated_column)) + { + // Fill the updated column + $column = $this->updated_column['column']; + $format = $this->updated_column['format']; + + $data[$column] = $this->object[$column] = ($format === TRUE) ? time() : date($format); + } + + $query = db::update($this->table_name) + ->set($data) + ->where($this->primary_key, '=', $this->primary_key_value) + ->execute($this->db); // Object has been saved - $this->saved = TRUE; + $this->_saved = TRUE; } else { - $query = $this->db - ->insert($this->table_name, $data); + if (is_array($this->created_column)) + { + // Fill the created column + $column = $this->created_column['column']; + $format = $this->created_column['format']; + + $data[$column] = $this->object[$column] = ($format === TRUE) ? time() : date($format); + } + + $result = db::insert($this->table_name) + ->columns(array_keys($data)) + ->values(array_values($data)) + ->execute($this->db); - if ($query->count() > 0) + if ($result->count() > 0) { if (empty($this->object[$this->primary_key])) { // Load the insert id as the primary key - $this->object[$this->primary_key] = $query->insert_id(); + $this->object[$this->primary_key] = $result->insert_id(); } // Object is now loaded and saved - $this->loaded = $this->saved = TRUE; + $this->_loaded = $this->_saved = TRUE; } } - if ($this->saved === TRUE) + if ($this->saved() === TRUE) { // All changes have been saved $this->changed = array(); } } - if ($this->saved === TRUE AND ! empty($this->changed_relations)) + if ($this->saved() === TRUE AND ! empty($this->changed_relations)) { foreach ($this->changed_relations as $column => $values) { @@ -782,20 +889,19 @@ class ORM_Core { foreach ($added as $id) { // Insert the new relationship - $this->db->insert($join_table, array - ( - $object_fk => $this->object[$this->primary_key], - $related_fk => $id, - )); + db::insert($join_table) + ->columns($object_fk, $related_fk) + ->values($this->primary_key_value, $id) + ->execute($this->db); } } if ( ! empty($removed)) { - $this->db - ->where($object_fk, $this->object[$this->primary_key]) - ->in($related_fk, $removed) - ->delete($join_table); + db::delete($join_table) + ->where($object_fk, '=', $this->primary_key_value) + ->where($related_fk, 'IN', $removed) + ->execute($this->db); } // Clear all relations for this column @@ -811,18 +917,21 @@ class ORM_Core { * relationships that have been created with other objects. * * @chainable + * @param mixed id to delete * @return ORM */ public function delete($id = NULL) { - if ($id === NULL AND $this->loaded) + if ($id === NULL) { // Use the the primary key value - $id = $this->object[$this->primary_key]; + $id = $this->primary_key_value; } // Delete this object - $this->db->where($this->primary_key, $id)->delete($this->table_name); + db::delete($this->table_name) + ->where($this->primary_key, '=', $id) + ->execute($this->db); return $this->clear(); } @@ -840,12 +949,15 @@ class ORM_Core { if (is_array($ids)) { // Delete only given ids - $this->db->in($this->primary_key, $ids); + db::delete($this->table_name) + ->where($this->primary_key, 'IN', $ids) + ->execute($this->db); } - elseif (is_null($ids)) + elseif ($ids === NULL) { // Delete all records - $this->db->where('1=1'); + db::delete($this->table_name) + ->execute($this->db); } else { @@ -853,9 +965,6 @@ class ORM_Core { return $this; } - // Delete all objects - $this->db->delete($this->table_name); - return $this->clear(); } @@ -872,7 +981,7 @@ class ORM_Core { $values = array_combine($columns, array_fill(0, count($columns), NULL)); // Replace the current object with an empty one - $this->load_values($values); + $this->_load_values($values); return $this; } @@ -941,6 +1050,12 @@ class ORM_Core { $this->changed_relations[$related] = $this->object_relations[$related] = $this->load_relations($join_table, $model); } + if( ! $model->loaded() AND ! $model->empty_primary_key()) + { + // Load the related model if it hasn't already been + $model->find($model->object[$model->primary_key]); + } + if ( ! $model->empty_primary_key()) { // Check if a specific object exists @@ -1020,40 +1135,22 @@ class ORM_Core { public function count_all() { // Return the total number of records in a table - return $this->db->count_records($this->table_name); + return $this->db_builder->count_records($this->table_name); } /** * Proxy method to Database list_fields. * - * @param string table name or NULL to use this table - * @return array - */ - public function list_fields($table = NULL) - { - if ($table === NULL) - { - $table = $this->table_name; - } - - // Proxy to database - return $this->db->list_fields($table); - } - - /** - * Proxy method to Database field_data. - * - * @param string table name * @return array */ - public function field_data($table) + public function list_fields() { // Proxy to database - return $this->db->field_data($table); + return $this->db->list_fields($this->table_name); } /** - * Proxy method to Database field_data. + * Proxy method to Database clear_cache. * * @chainable * @param string SQL query to clear @@ -1203,14 +1300,63 @@ class ORM_Core { * @return ORM */ public function load_values(array $values) + { + // Related objects + $related = array(); + + foreach ($values as $column => $value) + { + if (strpos($column, ':') === FALSE) + { + if ( ! isset($this->changed[$column])) + { + if (isset($this->table_columns[$column])) + { + //Update the column, respects __get() + $this->$column = $value; + } + } + } + else + { + list ($prefix, $column) = explode(':', $column, 2); + + $related[$prefix][$column] = $value; + } + } + + if ( ! empty($related)) + { + foreach ($related as $object => $values) + { + // Load the related objects with the values in the result + $this->related[$object] = $this->related_object($object)->load_values($values); + } + } + + return $this; + } + + /** + * Loads an array of values into into the current object. Only used internally + * + * @chainable + * @param array values to load + * @param bool ignore loading of columns that have been modified + * @return ORM + */ + public function _load_values(array $values, $ignore_changed = FALSE) { if (array_key_exists($this->primary_key, $values)) { - // Replace the object and reset the object status - $this->object = $this->changed = $this->related = array(); + if ( ! $ignore_changed) + { + // Replace the object and reset the object status + $this->object = $this->changed = $this->related = array(); + } // Set the loaded and saved object status based on the primary key - $this->loaded = $this->saved = ($values[$this->primary_key] !== NULL); + $this->_loaded = $this->_saved = ($values[$this->primary_key] !== NULL); } // Related objects @@ -1220,13 +1366,16 @@ class ORM_Core { { if (strpos($column, ':') === FALSE) { - if (isset($this->table_columns[$column])) + if ( ! $ignore_changed OR ! isset($this->changed[$column])) { - // The type of the value can be determined, convert the value - $value = $this->load_type($column, $value); - } + if (isset($this->table_columns[$column])) + { + // The type of the value can be determined, convert the value + $value = $this->load_type($column, $value); + } - $this->object[$column] = $value; + $this->object[$column] = $value; + } } else { @@ -1241,13 +1390,14 @@ class ORM_Core { foreach ($related as $object => $values) { // Load the related objects with the values in the result - $this->related[$object] = $this->related_object($object)->load_values($values); + $this->related[$object] = $this->related_object($object)->_load_values($values); } } return $this; } + /** * Loads a value according to the types defined by the column metadata. * @@ -1264,7 +1414,7 @@ class ORM_Core { // Load column data $column = $this->table_columns[$column]; - if ($value === NULL AND ! empty($column['null'])) + if ($value === NULL AND ! empty($column['nullable'])) return $value; if ( ! empty($column['binary']) AND ! empty($column['exact']) AND (int) $column['length'] === 1) @@ -1276,7 +1426,7 @@ class ORM_Core { switch ($column['type']) { case 'int': - if ($value === '' AND ! empty($column['null'])) + if ($value === '' AND ! empty($column['nullable'])) { // Forms will only submit strings, so empty integer values must be null $value = NULL; @@ -1295,9 +1445,7 @@ class ORM_Core { $value = (float) $value; break; case 'boolean': - if ($value === "t") $value = true; // For PgSQL - else if ($value === "f") $value = false; // For PgSQL - else $value = (bool) $value; + $value = (bool) $value; break; case 'string': $value = (string) $value; @@ -1313,21 +1461,24 @@ class ORM_Core { * * @chainable * @param boolean return an iterator or load a single row + * @param boolean ignore loading of columns that have been modified * @return ORM for single rows * @return ORM_Iterator for multiple rows */ - protected function load_result($array = FALSE) + protected function load_result($array = FALSE, $ignore_changed = FALSE) { + $this->db_builder->from($this->table_name); + if ($array === FALSE) { // Only fetch 1 record - $this->db->limit(1); + $this->db_builder->limit(1); } if ( ! isset($this->db_applied['select'])) { // Select all columns by default - $this->db->select($this->table_name.'.*'); + $this->db_builder->select($this->table_name.'.*'); } if ( ! empty($this->load_with)) @@ -1348,7 +1499,7 @@ class ORM_Core { } } - if ( ! isset($this->db_applied['orderby']) AND ! empty($this->sorting)) + if ( ! isset($this->db_applied['order_by']) AND ! empty($this->sorting)) { $sorting = array(); foreach ($this->sorting as $column => $direction) @@ -1364,11 +1515,11 @@ class ORM_Core { } // Apply the user-defined sorting - $this->db->orderby($sorting); + $this->db_builder->order_by($sorting); } // Load the result - $result = $this->db->get($this->table_name); + $result = $this->db_builder->execute($this->db); if ($array === TRUE) { @@ -1379,7 +1530,7 @@ class ORM_Core { if ($result->count() === 1) { // Load object values - $this->load_values($result->result(FALSE)->current()); + $this->_load_values($result->as_array()->current(), $ignore_changed); } else { @@ -1399,20 +1550,14 @@ class ORM_Core { */ protected function load_relations($table, ORM $model) { - // Save the current query chain (otherwise the next call will clash) - $this->db->push(); - - $query = $this->db - ->select($model->foreign_key(NULL).' AS id') + $result = db::select(array('id' => $model->foreign_key(NULL))) ->from($table) - ->where($this->foreign_key(NULL, $table), $this->object[$this->primary_key]) - ->get() - ->result(TRUE); - - $this->db->pop(); + ->where($this->foreign_key(NULL, $table), '=', $this->primary_key_value) + ->execute($this->db) + ->as_object(); $relations = array(); - foreach ($query as $row) + foreach ($result as $row) { $relations[] = $row->id; } diff --git a/system/libraries/ORM_Iterator.php b/system/libraries/ORM_Iterator.php index 41aa8065..403d1e93 100644 --- a/system/libraries/ORM_Iterator.php +++ b/system/libraries/ORM_Iterator.php @@ -2,12 +2,12 @@ /** * Object Relational Mapping (ORM) result iterator. * -* $Id: ORM_Iterator.php 3769 2008-12-15 00:48:56Z zombor $ +* $Id: ORM_Iterator.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package ORM * @author Kohana Team -* @copyright (c) 2007-2008 Kohana Team -* @license http://kohanaphp.com/license.html +* @copyright (c) 2007-2009 Kohana Team +* @license http://kohanaphp.com/license */ class ORM_Iterator_Core implements Iterator, ArrayAccess, Countable { @@ -26,27 +26,67 @@ class ORM_Iterator_Core implements Iterator, ArrayAccess, Countable { $this->primary_key = $model->primary_key; $this->primary_val = $model->primary_val; - // Database result - $this->result = $result->result(TRUE); + // Database result (make sure rows are returned as arrays) + $this->result = $result; } /** - * Returns an array of the results as ORM objects. + * Returns an array of the results as ORM objects or a nested array * + * @param bool TRUE to return an array of ORM objects, FALSE for an array of arrays + * @param string key column to index on, NULL to ignore * @return array */ - public function as_array() + public function as_array($objects = TRUE, $key = NULL) { $array = array(); - if ($results = $this->result->result_array()) - { - // Import class name - $class = $this->class_name; + // Import class name + $class = $this->class_name; - foreach ($results as $obj) + if ($objects) + { + // Generate an array of objects + foreach ($this->result as $data) { - $array[] = new $class($obj); + if ($key === NULL) + { + // No indexing + $array[] = new $class($data); + } + else + { + // Index on the given key + $array[$data->$key] = new $class($data); + } + } + } + else + { + // Generate an array of arrays (and the subarrays may be nested in the case of relationships) + // This could be done by creating a new ORM object and calling as_array on it, but this is much faster + foreach ($this->result as $data) + { + // Have to do a bit of magic here to handle any relationships and generate a nested array for them + $temp = array(); + + foreach ($data as $key => $val) + { + $ptr = & $temp; + + foreach (explode(':', $key) as $subkey) + { + // Walk thru the relationships (separated in the key name by a ':') + // 'user:email:address' will be array['user']['email']['address'] + $ptr = & $ptr[$subkey]; + } + + // Set the value + $ptr = $val; + } + + // Append the result + $array[] = $temp; } } @@ -90,7 +130,7 @@ class ORM_Iterator_Core implements Iterator, ArrayAccess, Countable { } $array = array(); - foreach ($this->result->result_array() as $row) + foreach ($this->result as $row) { $array[$row->$key] = $row->$val; } diff --git a/system/libraries/ORM_Tree.php b/system/libraries/ORM_Tree.php deleted file mode 100644 index cdb09fd0..00000000 --- a/system/libraries/ORM_Tree.php +++ /dev/null @@ -1,76 +0,0 @@ -related[$column])) - { - // Load child model - $model = ORM::factory(inflector::singular($this->ORM_Tree_children)); - - if (array_key_exists($this->ORM_Tree_parent_key, $this->object)) - { - // Find children of this parent - $model->where($model->primary_key, $this->object[$this->ORM_Tree_parent_key])->find(); - } - - $this->related[$column] = $model; - } - - return $this->related[$column]; - } - elseif ($column === 'children') - { - if (empty($this->related[$column])) - { - $model = ORM::factory(inflector::singular($this->ORM_Tree_children)); - - if ($this->ORM_Tree_children === $this->table_name) - { - // Load children within this table - $this->related[$column] = $model - ->where($this->ORM_Tree_parent_key, $this->object[$this->primary_key]) - ->find_all(); - } - else - { - // Find first selection of children - $this->related[$column] = $model - ->where($this->foreign_key(), $this->object[$this->primary_key]) - ->where($this->ORM_Tree_parent_key, NULL) - ->find_all(); - } - } - - return $this->related[$column]; - } - - return parent::__get($column); - } - -} // End ORM Tree \ No newline at end of file diff --git a/system/libraries/ORM_Validation_Exception.php b/system/libraries/ORM_Validation_Exception.php new file mode 100644 index 00000000..95f96c3b --- /dev/null +++ b/system/libraries/ORM_Validation_Exception.php @@ -0,0 +1,26 @@ +$table)); + $exception->validation = $array; + throw $exception; + } +} // End ORM_Validation_Exception \ No newline at end of file diff --git a/system/libraries/ORM_Versioned.php b/system/libraries/ORM_Versioned.php deleted file mode 100644 index 078fe16a..00000000 --- a/system/libraries/ORM_Versioned.php +++ /dev/null @@ -1,143 +0,0 @@ -last_version = 1 + ($this->last_version === NULL ? $this->object['version'] : $this->last_version); - $this->__set('version', $this->last_version); - - parent::save(); - - if ($this->saved) - { - $data = array(); - foreach ($this->object as $key => $value) - { - if ($key === 'id') - continue; - - $data[$key] = $value; - } - $data[$this->foreign_key()] = $this->id; - - $this->db->insert($this->table_name.'_versions', $data); - } - - return $this; - } - - /** - * Loads previous version from current object - * - * @chainable - * @return ORM - */ - public function previous() - { - if ( ! $this->loaded) - return $this; - - $this->last_version = ($this->last_version === NULL) ? $this->object['version'] : $this->last_version; - $version = $this->last_version - 1; - - $query = $this->db - ->where($this->foreign_key(), $this->object[$this->primary_key]) - ->where('version', $version) - ->limit(1) - ->get($this->table_name.'_versions'); - - if ($query->count()) - { - $this->load_values($query->result(FALSE)->current()); - } - - return $this; - } - - /** - * Restores the object with data from stored version - * - * @param integer version number you want to restore - * @return ORM - */ - public function restore($version) - { - if ( ! $this->loaded) - return $this; - - $query = $this->db - ->where($this->foreign_key(), $this->object[$this->primary_key]) - ->where('version', $version) - ->limit(1) - ->get($this->table_name.'_versions'); - - if ($query->count()) - { - $row = $query->result(FALSE)->current(); - - foreach ($row as $key => $value) - { - if ($key === $this->primary_key OR $key === $this->foreign_key()) - { - // Do not overwrite the primary key - continue; - } - - if ($key === 'version') - { - // Always use the current version - $value = $this->version; - } - - $this->__set($key, $value); - } - - $this->save(); - } - - return $this; - } - - /** - * Overloads ORM::delete() to delete all versioned entries of current object - * and the object itself - * - * @param integer id of the object you want to delete - * @return ORM - */ - public function delete($id = NULL) - { - if ($id === NULL) - { - // Use the current object id - $id = $this->object[$this->primary_key]; - } - - if ($status = parent::delete($id)) - { - $this->db->where($this->foreign_key(), $id)->delete($this->table_name.'_versions'); - } - - return $status; - } - -} \ No newline at end of file diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php deleted file mode 100644 index a8f7bb19..00000000 --- a/system/libraries/Pagination.php +++ /dev/null @@ -1,236 +0,0 @@ -initialize($config); - - Kohana::log('debug', 'Pagination Library initialized'); - } - - /** - * Sets config values. - * - * @throws Kohana_Exception - * @param array configuration settings - * @return void - */ - public function initialize($config = array()) - { - // Load config group - if (isset($config['group'])) - { - // Load and validate config group - if ( ! is_array($group_config = Kohana::config('pagination.'.$config['group']))) - throw new Kohana_Exception('pagination.undefined_group', $config['group']); - - // All pagination config groups inherit default config group - if ($config['group'] !== 'default') - { - // Load and validate default config group - if ( ! is_array($default_config = Kohana::config('pagination.default'))) - throw new Kohana_Exception('pagination.undefined_group', 'default'); - - // Merge config group with default config group - $group_config += $default_config; - } - - // Merge custom config items with config group - $config += $group_config; - } - - // Assign config values to the object - foreach ($config as $key => $value) - { - if (property_exists($this, $key)) - { - $this->$key = $value; - } - } - - // Clean view directory - $this->directory = trim($this->directory, '/').'/'; - - // Build generic URL with page in query string - if ($this->query_string !== '') - { - // Extract current page - $this->current_page = isset($_GET[$this->query_string]) ? (int) $_GET[$this->query_string] : 1; - - // Insert {page} placeholder - $_GET[$this->query_string] = '{page}'; - - // Create full URL - $base_url = ($this->base_url === '') ? Router::$current_uri : $this->base_url; - $this->url = url::site($base_url).'?'.str_replace('%7Bpage%7D', '{page}', http_build_query($_GET)); - - // Reset page number - $_GET[$this->query_string] = $this->current_page; - } - - // Build generic URL with page as URI segment - else - { - // Use current URI if no base_url set - $this->url = ($this->base_url === '') ? Router::$segments : explode('/', trim($this->base_url, '/')); - - // Convert uri 'label' to corresponding integer if needed - if (is_string($this->uri_segment)) - { - if (($key = array_search($this->uri_segment, $this->url)) === FALSE) - { - // If uri 'label' is not found, auto add it to base_url - $this->url[] = $this->uri_segment; - $this->uri_segment = count($this->url) + 1; - } - else - { - $this->uri_segment = $key + 2; - } - } - - // Insert {page} placeholder - $this->url[$this->uri_segment - 1] = '{page}'; - - // Create full URL - $this->url = url::site(implode('/', $this->url)).Router::$query_string; - - // Extract current page - $this->current_page = URI::instance()->segment($this->uri_segment); - } - - // Core pagination values - $this->total_items = (int) max(0, $this->total_items); - $this->items_per_page = (int) max(1, $this->items_per_page); - $this->total_pages = (int) ceil($this->total_items / $this->items_per_page); - $this->current_page = (int) min(max(1, $this->current_page), max(1, $this->total_pages)); - $this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items); - $this->current_last_item = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items); - - // If there is no first/last/previous/next page, relative to the - // current page, value is set to FALSE. Valid page number otherwise. - $this->first_page = ($this->current_page === 1) ? FALSE : 1; - $this->last_page = ($this->current_page >= $this->total_pages) ? FALSE : $this->total_pages; - $this->previous_page = ($this->current_page > 1) ? $this->current_page - 1 : FALSE; - $this->next_page = ($this->current_page < $this->total_pages) ? $this->current_page + 1 : FALSE; - - // SQL values - $this->sql_offset = (int) ($this->current_page - 1) * $this->items_per_page; - $this->sql_limit = sprintf(' LIMIT %d OFFSET %d ', $this->items_per_page, $this->sql_offset); - } - - /** - * Generates the HTML for the chosen pagination style. - * - * @param string pagination style - * @return string pagination html - */ - public function render($style = NULL) - { - // Hide single page pagination - if ($this->auto_hide === TRUE AND $this->total_pages <= 1) - return ''; - - if ($style === NULL) - { - // Use default style - $style = $this->style; - } - - // Return rendered pagination view - return View::factory($this->directory.$style, get_object_vars($this))->render(); - } - - /** - * Magically converts Pagination object to string. - * - * @return string pagination html - */ - public function __toString() - { - return $this->render(); - } - - /** - * Magically gets a pagination variable. - * - * @param string variable key - * @return mixed variable value if the key is found - * @return void if the key is not found - */ - public function __get($key) - { - if (isset($this->$key)) - return $this->$key; - } - - /** - * Adds a secondary interface for accessing properties, e.g. $pagination->total_pages(). - * Note that $pagination->total_pages is the recommended way to access properties. - * - * @param string function name - * @return string - */ - public function __call($func, $args = NULL) - { - return $this->__get($func); - } - -} // End Pagination Class \ No newline at end of file diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 9da053fb..b7a5ecae 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -8,100 +8,115 @@ * 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 4383 2009-06-03 00:17:24Z ixmatus $ + * $Id: Profiler.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Profiler * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Profiler_Core { - protected $profiles = array(); - protected $show; + protected static $profiles = array(); + protected static $show; - public function __construct() + /** + * Enable the profiler. + * + * @return void + */ + public static function enable() { // Add all built in profiles to event - Event::add('profiler.run', array($this, 'benchmarks')); - Event::add('profiler.run', array($this, 'database')); - Event::add('profiler.run', array($this, 'session')); - Event::add('profiler.run', array($this, 'post')); - Event::add('profiler.run', array($this, 'cookies')); + Event::add('profiler.run', array('Profiler', 'benchmarks')); + Event::add('profiler.run', array('Profiler', 'database')); + Event::add('profiler.run', array('Profiler', 'session')); + Event::add('profiler.run', array('Profiler', 'post')); + Event::add('profiler.run', array('Profiler', 'cookies')); // Add profiler to page output automatically - Event::add('system.display', array($this, 'render')); + Event::add('system.display', array('Profiler', 'render')); + + Kohana_Log::add('debug', 'Profiler library enabled'); - Kohana::log('debug', 'Profiler Library initialized'); } /** - * Magic __call method. Creates a new profiler section object. + * Disables the profiler for this page only. + * Best used when profiler is autoloaded. * - * @param string input type - * @param string input name - * @return object + * @return void */ - public function __call($method, $args) + public static function disable() { - if ( ! $this->show OR (is_array($this->show) AND ! in_array($args[0], $this->show))) - return FALSE; - - // Class name - $class = 'Profiler_'.ucfirst($method); - - $class = new $class(); - - $this->profiles[$args[0]] = $class; + // Removes itself from the event queue + Event::clear('system.display', array('Profiler', 'render')); + } - return $class; + /** + * Return whether a profile should be shown. + * Determined by the config setting or GET parameter. + * + * @param string profile name + * @return boolean + */ + public static function show($name) + { + return (Profiler::$show === TRUE OR (is_array(Profiler::$show) AND in_array($name, Profiler::$show))) ? TRUE : FALSE; } /** - * Disables the profiler for this page only. - * Best used when profiler is autoloaded. + * Add a new profile. * - * @return void + * @param object profile object + * @return boolean + * @throws Kohana_Exception */ - public function disable() + public static function add($profile) { - // Removes itself from the event queue - Event::clear('system.display', array($this, 'render')); + if (is_object($profile)) + { + Profiler::$profiles[] = $profile; + return TRUE; + } + + throw new Kohana_Exception('The profile must be an object'); } /** - * Render the profiler. Output is added to the bottom of the page by default. + * Render the profiler. * - * @param boolean return the output if TRUE + * @param boolean return the output instead of adding it to bottom of page * @return void|string */ - public function render($return = FALSE) + public static function render($return = FALSE) { $start = microtime(TRUE); + // Determine the profiles that should be shown $get = isset($_GET['profiler']) ? explode(',', $_GET['profiler']) : array(); - $this->show = empty($get) ? Kohana::config('profiler.show') : $get; + Profiler::$show = empty($get) ? Kohana::config('profiler.show') : $get; - Event::run('profiler.run', $this); + Event::run('profiler.run'); + + // Don't display if there's no profiles + if (empty(Profiler::$profiles)) + return $output; $styles = ''; - foreach ($this->profiles as $profile) + foreach (Profiler::$profiles as $profile) { $styles .= $profile->styles(); } - // Don't display if there's no profiles - if (empty($this->profiles)) - return; - // Load the profiler view $data = array ( - 'profiles' => $this->profiles, - 'styles' => $styles, + 'profiles' => Profiler::$profiles, + 'styles' => $styles, 'execution_time' => microtime(TRUE) - $start ); - $view = new View('kohana_profiler', $data); + $view = new View('profiler/profiler', $data); // Return rendered view if $return is TRUE if ($return === TRUE) @@ -125,16 +140,17 @@ class Profiler_Core { * * @return void */ - public function benchmarks() + public static function benchmarks() { - if ( ! $table = $this->table('benchmarks')) + if ( ! Profiler::show('benchmarks')) return; + $table = new Profiler_Table(); $table->add_column(); $table->add_column('kp-column kp-data'); $table->add_column('kp-column kp-data'); $table->add_column('kp-column kp-data'); - $table->add_row(array('Benchmarks', 'Time', 'Count', 'Memory'), 'kp-title', 'background-color: #FFE0E0'); + $table->add_row(array(__('Benchmarks'), __('Count'), __('Time'), __('Memory')), 'kp-title', 'background-color: #FFE0E0'); $benchmarks = Benchmark::get(TRUE); @@ -147,14 +163,20 @@ class Profiler_Core { // Clean unique id from system benchmark names $name = ucwords(str_replace(array('_', '-'), ' ', str_replace(SYSTEM_BENCHMARK.'_', '', $name))); - $data = array($name, number_format($benchmark['time'], 3), $benchmark['count'], number_format($benchmark['memory'] / 1024 / 1024, 2).'MB'); + $data = array(__($name), $benchmark['count'], number_format($benchmark['time'], Kohana::config('profiler.time_decimals')), number_format($benchmark['memory'] / 1024 / 1024, Kohana::config('profiler.memory_decimals')).'MB'); $class = text::alternate('', 'kp-altrow'); if ($name == 'Total Execution') + { + // Clear the count column + $data[1] = ''; $class = 'kp-totalrow'; + } $table->add_row($data, $class); } + + Profiler::add($table); } /** @@ -162,31 +184,37 @@ class Profiler_Core { * * @return void */ - public function database() + public static function database() { - if ( ! $table = $this->table('database')) + if ( ! Profiler::show('database')) return; + $queries = Database::$benchmarks; + + // Don't show if there are no queries + if (empty($queries)) return; + + $table = new Profiler_Table(); $table->add_column(); $table->add_column('kp-column kp-data'); $table->add_column('kp-column kp-data'); - $table->add_row(array('Queries', 'Time', 'Rows'), 'kp-title', 'background-color: #E0FFE0'); - - $queries = Database::$benchmarks; + $table->add_row(array(__('Queries'), __('Time'), __('Rows')), 'kp-title', 'background-color: #E0FFE0'); text::alternate(); $total_time = $total_rows = 0; foreach ($queries as $query) { - $data = array($query['query'], number_format($query['time'], 3), $query['rows']); + $data = array($query['query'], number_format($query['time'], Kohana::config('profiler.time_decimals')), $query['rows']); $class = text::alternate('', 'kp-altrow'); $table->add_row($data, $class); $total_time += $query['time']; $total_rows += $query['rows']; } - $data = array('Total: ' . count($queries), number_format($total_time, 3), $total_rows); + $data = array(__('Total: ') . count($queries), number_format($total_time, Kohana::config('profiler.time_decimals')), $total_rows); $table->add_row($data, 'kp-totalrow'); + + Profiler::add($table); } /** @@ -194,16 +222,17 @@ class Profiler_Core { * * @return void */ - public function session() + public static function session() { if (empty($_SESSION)) return; - if ( ! $table = $this->table('session')) + if ( ! Profiler::show('session')) return; + $table = new Profiler_Table(); $table->add_column('kp-name'); $table->add_column(); - $table->add_row(array('Session', 'Value'), 'kp-title', 'background-color: #CCE8FB'); + $table->add_row(array(__('Session'), __('Value')), 'kp-title', 'background-color: #CCE8FB'); text::alternate(); foreach($_SESSION as $name => $value) @@ -217,6 +246,8 @@ class Profiler_Core { $class = text::alternate('', 'kp-altrow'); $table->add_row($data, $class); } + + Profiler::add($table); } /** @@ -224,16 +255,17 @@ class Profiler_Core { * * @return void */ - public function post() + public static function post() { if (empty($_POST)) return; - if ( ! $table = $this->table('post')) + if ( ! Profiler::show('post')) return; + $table = new Profiler_Table(); $table->add_column('kp-name'); $table->add_column(); - $table->add_row(array('POST', 'Value'), 'kp-title', 'background-color: #E0E0FF'); + $table->add_row(array(__('POST'), __('Value')), 'kp-title', 'background-color: #E0E0FF'); text::alternate(); foreach($_POST as $name => $value) @@ -242,6 +274,8 @@ class Profiler_Core { $class = text::alternate('', 'kp-altrow'); $table->add_row($data, $class); } + + Profiler::add($table); } /** @@ -249,16 +283,17 @@ class Profiler_Core { * * @return void */ - public function cookies() + public static function cookies() { if (empty($_COOKIE)) return; - if ( ! $table = $this->table('cookies')) + if ( ! Profiler::show('cookies')) return; + $table = new Profiler_Table(); $table->add_column('kp-name'); $table->add_column(); - $table->add_row(array('Cookies', 'Value'), 'kp-title', 'background-color: #FFF4D7'); + $table->add_row(array(__('Cookies'), __('Value')), 'kp-title', 'background-color: #FFF4D7'); text::alternate(); foreach($_COOKIE as $name => $value) @@ -267,5 +302,7 @@ class Profiler_Core { $class = text::alternate('', 'kp-altrow'); $table->add_row($data, $class); } + + Profiler::add($table); } -} \ No newline at end of file +} diff --git a/system/libraries/Profiler_Table.php b/system/libraries/Profiler_Table.php index a0058a58..fdb62aef 100644 --- a/system/libraries/Profiler_Table.php +++ b/system/libraries/Profiler_Table.php @@ -2,12 +2,12 @@ /** * Provides a table layout for sections in the Profiler library. * - * $Id$ + * $Id: Profiler_Table.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Profiler * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Profiler_Table_Core { @@ -26,7 +26,7 @@ class Profiler_Table_Core { if ( ! $styles_output) { $styles_output = TRUE; - return file_get_contents(Kohana::find_file('views', 'kohana_profiler_table', FALSE, 'css')); + return file_get_contents(Kohana::find_file('views', 'profiler/table', FALSE, 'css')); } return ''; @@ -64,6 +64,6 @@ class Profiler_Table_Core { { $data['rows'] = $this->rows; $data['columns'] = $this->columns; - return View::factory('kohana_profiler_table', $data)->render(); + return View::factory('profiler/table', $data)->render(); } } \ No newline at end of file diff --git a/system/libraries/Router.php b/system/libraries/Router.php index ef0e1e47..82dbb9b5 100644 --- a/system/libraries/Router.php +++ b/system/libraries/Router.php @@ -2,12 +2,12 @@ /** * Router * - * $Id: Router.php 4391 2009-06-04 03:10:12Z zombor $ + * $Id: Router.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Router_Core { @@ -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($_SERVER['QUERY_STRING'], '&/'); + Router::$query_string = '?'.trim(urldecode($_SERVER['QUERY_STRING']), '&/'); } if (Router::$routes === NULL) @@ -53,8 +53,8 @@ class Router_Core { if (Router::$current_uri === '') { // Make sure the default route is set - if ( ! isset(Router::$routes['_default'])) - throw new Kohana_Exception('core.no_default_route'); + if (empty(Router::$routes['_default'])) + throw new Kohana_Exception('Please set a default route in config/routes.php.'); // Use the default route when no segments exist Router::$current_uri = Router::$routes['_default']; @@ -63,32 +63,34 @@ class Router_Core { $default_route = TRUE; } - // Make sure the URL is not tainted with HTML characters - Router::$current_uri = html::specialchars(Router::$current_uri, FALSE); - // Remove all dot-paths from the URI, they are not valid Router::$current_uri = preg_replace('#\.[\s./]*/#', '', Router::$current_uri); - // At this point segments, rsegments, and current URI are all the same - Router::$segments = Router::$rsegments = Router::$current_uri = trim(Router::$current_uri, '/'); - - // Set the complete URI - Router::$complete_uri = Router::$current_uri.Router::$query_string; + // At this point routed URI and current URI are the same + Router::$routed_uri = Router::$current_uri = trim(Router::$current_uri, '/'); - // Explode the segments by slashes - Router::$segments = ($default_route === TRUE OR Router::$segments === '') ? array() : explode('/', Router::$segments); - - if ($default_route === FALSE AND count(Router::$routes) > 1) + if ($default_route === TRUE) { - // Custom routing - Router::$rsegments = Router::routed_uri(Router::$current_uri); + Router::$complete_uri = Router::$query_string; + Router::$current_uri = ''; + Router::$segments = array(); } + else + { + Router::$complete_uri = Router::$current_uri.Router::$query_string; - // The routed URI is now complete - Router::$routed_uri = Router::$rsegments; + // Explode the segments by slashes + Router::$segments = explode('/', Router::$current_uri); - // Routed segments will never be empty - Router::$rsegments = explode('/', Router::$rsegments); + if (count(Router::$routes) > 1) + { + // Custom routing + Router::$routed_uri = Router::routed_uri(Router::$current_uri); + } + } + + // Explode the routed segments by slashes + Router::$rsegments = explode('/', Router::$routed_uri); // Prepare to find the controller $controller_path = ''; @@ -187,7 +189,7 @@ class Router_Core { parse_str($query, $_GET); // Convert $_GET to UTF-8 - $_GET = utf8::clean($_GET); + $_GET = Input::clean($_GET); } } } @@ -202,28 +204,37 @@ class Router_Core { // Remove the URI from $_SERVER['QUERY_STRING'] $_SERVER['QUERY_STRING'] = preg_replace('~\bkohana_uri\b[^&]*+&?~', '', $_SERVER['QUERY_STRING']); } - elseif (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO']) - { - Router::$current_uri = $_SERVER['PATH_INFO']; - } - elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO']) - { - Router::$current_uri = $_SERVER['ORIG_PATH_INFO']; - } - elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF']) - { - Router::$current_uri = $_SERVER['PHP_SELF']; - } - - if (($strpos_fc = strpos(Router::$current_uri, KOHANA)) !== FALSE) + else { - // Remove the front controller from the current uri - Router::$current_uri = (string) substr(Router::$current_uri, $strpos_fc + strlen(KOHANA)); + if (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO']) + { + Router::$current_uri = $_SERVER['PATH_INFO']; + } + elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO']) + { + Router::$current_uri = $_SERVER['ORIG_PATH_INFO']; + } + elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF']) + { + // PATH_INFO is empty during requests to the front controller + Router::$current_uri = $_SERVER['PHP_SELF']; + } + + if (isset($_SERVER['SCRIPT_NAME']) AND $_SERVER['SCRIPT_NAME']) + { + // Clean up PATH_INFO fallbacks + // PATH_INFO may be formatted for ISAPI instead of CGI on IIS + if (strncmp(Router::$current_uri, $_SERVER['SCRIPT_NAME'], strlen($_SERVER['SCRIPT_NAME'])) === 0) + { + // Remove the front controller from the current uri + Router::$current_uri = (string) substr(Router::$current_uri, strlen($_SERVER['SCRIPT_NAME'])); + } + } } - + // Remove slashes from the start and end of the URI Router::$current_uri = trim(Router::$current_uri, '/'); - + if (Router::$current_uri !== '') { if ($suffix = Kohana::config('core.url_suffix') AND strpos(Router::$current_uri, $suffix) !== FALSE) diff --git a/system/libraries/Session.php b/system/libraries/Session.php index 51acce00..9764a35c 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -2,12 +2,12 @@ /** * Session library. * - * $Id: Session.php 4493 2009-07-27 20:05:41Z ixmatus $ + * $Id: Session.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Session_Core { @@ -32,18 +32,24 @@ class Session_Core { /** * Singleton instance of Session. + * + * @param string Force a specific session_id */ - public static function instance() + public static function instance($session_id = NULL) { if (Session::$instance == NULL) { // Create a new instance - new Session; + new Session($session_id); + } + elseif( ! is_null($session_id) AND $session_id != session_id() ) + { + throw new Kohana_Exception('A session (SID: :session:) is already open, cannot open the specified session (SID: :new_session:).', array(':session:' => session_id(), ':new_session:' => $session_id)); } return Session::$instance; } - + /** * Be sure to block the use of __clone. */ @@ -51,8 +57,10 @@ class Session_Core { /** * On first session instance creation, sets up the driver and creates session. + * + * @param string Force a specific session_id */ - protected function __construct() + protected function __construct($session_id = NULL) { $this->input = Input::instance(); @@ -71,7 +79,7 @@ class Session_Core { ini_set('session.gc_maxlifetime', (Session::$config['expiration'] == 0) ? 86400 : Session::$config['expiration']); // Create a new session - $this->create(); + $this->create(NULL, $session_id); if (Session::$config['regenerate'] > 0 AND ($_SESSION['total_hits'] % Session::$config['regenerate']) === 0) { @@ -84,18 +92,15 @@ class Session_Core { cookie::set(Session::$config['name'], $_SESSION['session_id'], Session::$config['expiration']); } - // Close the session just before sending the headers, so that + // Close the session on system shutdown (run before sending the headers), so that // the session cookie(s) can be written. - Event::add('system.send_headers', array($this, 'write_close')); - - // Make sure that sessions are closed before exiting - register_shutdown_function(array($this, 'write_close')); + Event::add('system.shutdown', array($this, 'write_close')); // Singleton instance Session::$instance = $this; } - Kohana::log('debug', 'Session Library initialized'); + Kohana_Log::add('debug', 'Session Library initialized'); } /** @@ -112,9 +117,10 @@ class Session_Core { * Create a new session. * * @param array variables to set after creation + * @param string Force a specific session_id * @return void */ - public function create($vars = NULL) + public function create($vars = NULL, $session_id = NULL) { // Destroy any current sessions $this->destroy(); @@ -126,14 +132,16 @@ class Session_Core { // Load the driver if ( ! Kohana::auto_load($driver)) - throw new Kohana_Exception('core.driver_not_found', Session::$config['driver'], get_class($this)); + throw new Kohana_Exception('The :driver: driver for the :library: library could not be found', + array(':driver:' => Session::$config['driver'], ':library:' => get_class($this))); // Initialize the driver Session::$driver = new $driver(); // Validate the driver if ( ! (Session::$driver instanceof Session_Driver)) - throw new Kohana_Exception('core.driver_implements', Session::$config['driver'], get_class($this), 'Session_Driver'); + throw new Kohana_Exception('The :driver: driver for the :library: library must implement the :interface: interface', + array(':driver:' => Session::$config['driver'], ':library:' => get_class($this), ':interface:' => 'Session_Driver')); // Register non-native driver as the session handler session_set_save_handler @@ -149,7 +157,7 @@ class Session_Core { // Validate the session name if ( ! preg_match('~^(?=.*[a-z])[a-z0-9_]++$~iD', Session::$config['name'])) - throw new Kohana_Exception('session.invalid_session_name', Session::$config['name']); + throw new Kohana_Exception('The session_name, :session:, is invalid. It must contain only alphanumeric characters and underscores. Also at least one letter must be present.', array(':session:' => Session::$config['name'])); // Name the session, this will also be the name of the cookie session_name(Session::$config['name']); @@ -164,6 +172,20 @@ class Session_Core { Kohana::config('cookie.httponly') ); + $cookie = cookie::get(Session::$config['name']); + + if ($session_id === NULL) + { + // Reopen session from signed cookie value. + $session_id = $cookie; + } + + // Reopen an existing session if supplied + if ( ! is_null($session_id)) + { + session_id($session_id); + } + // Start the session! session_start(); @@ -176,7 +198,7 @@ class Session_Core { $_SESSION['total_hits'] = 0; $_SESSION['_kf_flash_'] = array(); - $_SESSION['user_agent'] = Kohana::$user_agent; + $_SESSION['user_agent'] = request::user_agent(); $_SESSION['ip_address'] = $this->input->ip_address(); } @@ -196,7 +218,7 @@ class Session_Core { { // Check user agent for consistency case 'user_agent': - if ($_SESSION[$valid] !== Kohana::$user_agent) + if ($_SESSION[$valid] !== request::user_agent()) return $this->create(); break; @@ -253,7 +275,7 @@ class Session_Core { if (isset($_COOKIE[$name])) { // Change the cookie value to match the new session id to prevent "lag" - $_COOKIE[$name] = $_SESSION['session_id']; + cookie::set($name, $_SESSION['session_id']); } } @@ -467,7 +489,7 @@ class Session_Core { * Do not save this session. * This is a performance feature only, if using the native * session "driver" the save will NOT be aborted. - * + * * @return void */ public function abort_save() diff --git a/system/libraries/URI.php b/system/libraries/URI.php index d9ccdcf7..4df54fc0 100644 --- a/system/libraries/URI.php +++ b/system/libraries/URI.php @@ -2,12 +2,12 @@ /** * URI library. * - * $Id: URI.php 4072 2009-03-13 17:20:38Z jheathco $ + * $Id: URI.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class URI_Core extends Router { diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php index 5a48bfc5..f340e63c 100644 --- a/system/libraries/Validation.php +++ b/system/libraries/Validation.php @@ -2,12 +2,12 @@ /** * Validation library. * - * $Id: Validation.php 4120 2009-03-25 19:22:31Z jheathco $ + * $Id: Validation.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Validation * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Validation_Core extends ArrayObject { @@ -247,7 +247,7 @@ class Validation_Core extends ArrayObject { $name = $callback; } - throw new Kohana_Exception('validation.not_callable', $name); + throw new Kohana_Exception('Callback %name% used for Validation is not callable', array('%name%' => $name)); } return $callback; @@ -349,8 +349,23 @@ class Validation_Core extends ArrayObject { // Arguments for rule $args = NULL; + // False rule + $false_rule = FALSE; + + $rule_tmp = trim(is_string($rule) ? $rule : $rule[1]); + + // Should the rule return false? + if ($rule_tmp !== ($rule_name = ltrim($rule_tmp, '! '))) + { + $false_rule = TRUE; + } + if (is_string($rule)) { + // Use the updated rule name + $rule = $rule_name; + + // Have arguments? if (preg_match('/^([^\[]++)\[(.+)\]$/', $rule, $matches)) { // Split the rule into the function and args @@ -361,6 +376,10 @@ class Validation_Core extends ArrayObject { $args = str_replace('\,', ',', $args); } } + else + { + $rule[1] = $rule_name; + } if ($rule === 'is_array') { @@ -372,7 +391,7 @@ class Validation_Core extends ArrayObject { $rule = $this->callback($rule); // Add the rule, with args, to the field - $this->rules[$field][] = array($rule, $args); + $this->rules[$field][] = array($rule, $args, $false_rule); } return $this; @@ -429,36 +448,7 @@ class Validation_Core extends ArrayObject { $object = $this; } - // Get all field names - $fields = $this->field_names(); - - // Copy the array from the object, to optimize multiple sets - $array = $this->getArrayCopy(); - - foreach ($fields as $field) - { - if ($field === '*') - { - // Ignore wildcard - continue; - } - - if ( ! isset($array[$field])) - { - if (isset($this->array_fields[$field])) - { - // This field must be an array - $array[$field] = array(); - } - else - { - $array[$field] = NULL; - } - } - } - - // Swap the array back into the object - $this->exchangeArray($array); + $array = $this->safe_array(); // Get all defined field names $fields = array_keys($array); @@ -471,12 +461,12 @@ class Validation_Core extends ArrayObject { { foreach ($fields as $f) { - $this[$f] = is_array($this[$f]) ? array_map($callback, $this[$f]) : call_user_func($callback, $this[$f]); + $array[$f] = is_array($array[$f]) ? array_map($callback, $array[$f]) : call_user_func($callback, $array[$f]); } } else { - $this[$field] = is_array($this[$field]) ? array_map($callback, $this[$field]) : call_user_func($callback, $this[$field]); + $array[$field] = is_array($array[$field]) ? array_map($callback, $array[$field]) : call_user_func($callback, $array[$field]); } } } @@ -488,8 +478,8 @@ class Validation_Core extends ArrayObject { { foreach ($callbacks as $callback) { - // Separate the callback and arguments - list ($callback, $args) = $callback; + // Separate the callback, arguments and is false bool + list ($callback, $args, $is_false) = $callback; // Function or method name of the rule $rule = is_array($callback) ? $callback[1] : $callback; @@ -508,31 +498,20 @@ class Validation_Core extends ArrayObject { continue; } - if (empty($this[$f]) AND ! in_array($rule, $this->empty_rules)) + if (empty($array[$f]) AND ! in_array($rule, $this->empty_rules)) { // This rule does not need to be processed on empty fields continue; } - if ($args === NULL) - { - if ( ! call_user_func($callback, $this[$f])) - { - $this->errors[$f] = $rule; + $result = ($args === NULL) ? call_user_func($callback, $array[$f]) : call_user_func($callback, $array[$f], $args); - // Stop validating this field when an error is found - continue; - } - } - else + if (($result == $is_false)) { - if ( ! call_user_func($callback, $this[$f], $args)) - { - $this->errors[$f] = $rule; + $this->add_error($f, $rule, $args); - // Stop validating this field when an error is found - continue; - } + // Stop validating this field when an error is found + continue; } } } @@ -544,31 +523,21 @@ class Validation_Core extends ArrayObject { break; } - if ( ! in_array($rule, $this->empty_rules) AND ! $this->required($this[$field])) + if ( ! in_array($rule, $this->empty_rules) AND ! $this->required($array[$field])) { // This rule does not need to be processed on empty fields continue; } - if ($args === NULL) - { - if ( ! call_user_func($callback, $this[$field])) - { - $this->errors[$field] = $rule; + // Results of our test + $result = ($args === NULL) ? call_user_func($callback, $array[$field]) : call_user_func($callback, $array[$field], $args); - // Stop validating this field when an error is found - break; - } - } - else + if (($result == $is_false)) { - if ( ! call_user_func($callback, $this[$field], $args)) - { - $this->errors[$field] = $rule; + $this->add_error($field, $rule, $args); - // Stop validating this field when an error is found - break; - } + // Stop validating this field when an error is found + break; } } } @@ -616,16 +585,19 @@ class Validation_Core extends ArrayObject { { foreach ($fields as $f) { - $this[$f] = is_array($this[$f]) ? array_map($callback, $this[$f]) : call_user_func($callback, $this[$f]); + $array[$f] = is_array($array[$f]) ? array_map($callback, $array[$f]) : call_user_func($callback, $array[$f]); } } else { - $this[$field] = is_array($this[$field]) ? array_map($callback, $this[$field]) : call_user_func($callback, $this[$field]); + $array[$field] = is_array($array[$field]) ? array_map($callback, $array[$field]) : call_user_func($callback, $array[$field]); } } } + // Swap the array back into the object + $this->exchangeArray($array); + // Return TRUE if there are no errors return $this->errors === array(); } @@ -636,11 +608,12 @@ class Validation_Core extends ArrayObject { * @chainable * @param string input name * @param string unique error name + * @param string arguments to pass to lang file * @return object */ - public function add_error($field, $name) + public function add_error($field, $name, $args = NULL) { - $this->errors[$field] = $name; + $this->errors[$field] = array($name, $args); return $this; } @@ -688,14 +661,19 @@ class Validation_Core extends ArrayObject { /** * Return the errors array. * - * @param boolean load errors from a lang file + * @param boolean load errors from a message file * @return array */ public function errors($file = NULL) { if ($file === NULL) { - return $this->errors; + $errors = array(); + foreach($this->errors as $field => $error) + { + $errors[$field] = $error[0]; + } + return $errors; } else { @@ -704,12 +682,12 @@ class Validation_Core extends ArrayObject { foreach ($this->errors as $input => $error) { // Key for this input error - $key = "$file.$input.$error"; + $key = "$file.$input.$error[0]"; - if (($errors[$input] = Kohana::lang($key)) === $key) + if (($errors[$input] = Kohana::message('validation/'.$key, $error[1])) === $key) { // Get the default error message - $errors[$input] = Kohana::lang("$file.$input.default"); + $errors[$input] = Kohana::message("$file.$input.default"); } } @@ -772,7 +750,7 @@ class Validation_Core extends ArrayObject { if ( ! is_string($str)) return FALSE; - $size = utf8::strlen($str); + $size = mb_strlen($str); $status = FALSE; if (count($length) > 1) @@ -823,4 +801,4 @@ class Validation_Core extends ArrayObject { return ! preg_match('![^'.implode('', $chars).']!u', $value); } -} // End Validation +} // End Validation \ No newline at end of file diff --git a/system/libraries/View.php b/system/libraries/View.php index 2b8471c6..d7e5e774 100644 --- a/system/libraries/View.php +++ b/system/libraries/View.php @@ -3,12 +3,12 @@ * Loads and displays Kohana view files. Can also handle output of some binary * files, such as image, Javascript, and CSS files. * - * $Id: View.php 4072 2009-03-13 17:20:38Z jheathco $ + * $Id: View.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class View_Core { @@ -18,7 +18,6 @@ class View_Core { // View variable storage protected $kohana_local_data = array(); - protected static $kohana_global_data = array(); /** * Creates a new View using the given parameters. @@ -88,7 +87,7 @@ class View_Core { { // Check if the filetype is allowed by the configuration if ( ! in_array($type, Kohana::config('view.allowed_filetypes'))) - throw new Kohana_Exception('core.invalid_filetype', $type); + throw new Kohana_Exception('The requested filetype, .:type:, is not allowed in your view configuration file', array(':type:' => $type)); // Load the filename and set the content type $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type); @@ -152,13 +151,13 @@ class View_Core { foreach ($key as $property) { // Set the result to an associative array - $result[$property] = (array_key_exists($property, $this->kohana_local_data) OR array_key_exists($property, View::$kohana_global_data)) ? TRUE : FALSE; + $result[$property] = (array_key_exists($property, $this->kohana_local_data)) ? TRUE : FALSE; } } else { // Otherwise just check one property - $result = (array_key_exists($key, $this->kohana_local_data) OR array_key_exists($key, View::$kohana_global_data)) ? TRUE : FALSE; + $result = (array_key_exists($key, $this->kohana_local_data)) ? TRUE : FALSE; } // Return the result @@ -179,28 +178,6 @@ class View_Core { return $this; } - /** - * Sets a view global variable. - * - * @param string|array name of variable or an array of variables - * @param mixed value when using a named variable - * @return void - */ - public static function set_global($name, $value = NULL) - { - if (is_array($name)) - { - foreach ($name as $key => $value) - { - View::$kohana_global_data[$key] = $value; - } - } - else - { - View::$kohana_global_data[$name] = $value; - } - } - /** * Magically sets a view variable. * @@ -223,13 +200,18 @@ class View_Core { public function &__get($key) { if (isset($this->kohana_local_data[$key])) + { return $this->kohana_local_data[$key]; - - if (isset(View::$kohana_global_data[$key])) - return View::$kohana_global_data[$key]; - - if (isset($this->$key)) + } + elseif (isset($this->$key)) + { return $this->$key; + } + else + { + throw new Kohana_Exception('Undefined view variable: :var', + array(':var' => $key)); + } } /** @@ -245,8 +227,8 @@ class View_Core { } catch (Exception $e) { - // Display the exception using its internal __toString method - return (string) $e; + Kohana_Exception::handle($e); + return (string) ''; } } @@ -255,21 +237,27 @@ class View_Core { * * @param boolean set to TRUE to echo the output instead of returning it * @param callback special renderer to pass the output through + * @param callback modifier to pass the data through before rendering * @return string if print is FALSE * @return void if print is TRUE */ - public function render($print = FALSE, $renderer = FALSE) + public function render($print = FALSE, $renderer = FALSE, $modifier = FALSE) { if (empty($this->kohana_filename)) - throw new Kohana_Exception('core.view_set_filename'); + throw new Kohana_Exception('You must set the the view filename before calling render'); if (is_string($this->kohana_filetype)) { // Merge global and local data, local overrides global with the same name - $data = array_merge(View::$kohana_global_data, $this->kohana_local_data); + $data = $this->kohana_local_data; + + if ($modifier !== FALSE AND is_callable($modifier, TRUE)) + { + // Pass the data through the user defined modifier + $data = call_user_func($modifier, $data); + } - // Load the view in the controller for access to $this - $output = Kohana::$instance->_kohana_load_view($this->kohana_filename, $data); + $output = $this->load_view($this->kohana_filename, $data); if ($renderer !== FALSE AND is_callable($renderer, TRUE)) { @@ -306,4 +294,36 @@ class View_Core { return $output; } -} // End View \ No newline at end of file + + /** + * Includes a View within the controller scope. + * + * @param string view filename + * @param array array of view variables + * @return string + */ + public function load_view($kohana_view_filename, $kohana_input_data) + { + if ($kohana_view_filename == '') + return; + + // Buffering on + ob_start(); + + // Import the view variables to local namespace + extract($kohana_input_data, EXTR_SKIP); + + try + { + include $kohana_view_filename; + } + catch (Exception $e) + { + ob_end_clean(); + throw $e; + } + + // Fetch the output and close the buffer + return ob_get_clean(); + } +} // End View diff --git a/system/libraries/drivers/Cache.php b/system/libraries/drivers/Cache.php index 7c5e3c31..97415096 100644 --- a/system/libraries/drivers/Cache.php +++ b/system/libraries/drivers/Cache.php @@ -1,40 +1,42 @@ config = $config; + $this->config['directory'] = str_replace('\\', '/', realpath($this->config['directory'])).'/'; - // Make sure the cache directory is writable - if ( ! is_dir($directory) OR ! is_writable($directory)) - throw new Kohana_Exception('cache.unwritable', $directory); - - // Directory is valid - $this->directory = $directory; + if ( ! is_dir($this->config['directory']) OR ! is_writable($this->config['directory'])) + throw new Cache_Exception('The configured cache directory, :directory:, is not writable.', array(':directory:' => $this->config['directory'])); } /** * Finds an array of files matching the given id or tag. * - * @param string cache id or tag + * @param string cache key or tag * @param bool search for tags * @return array of filenames matching the id or tag */ - public function exists($id, $tag = FALSE) + public function exists($keys, $tag = FALSE) { - if ($id === TRUE) + if ($keys === TRUE) { // Find all the files - return glob($this->directory.'*~*~*'); + return glob($this->config['directory'].'*~*~*'); } elseif ($tag === TRUE) { // Find all the files that have the tag name - $paths = glob($this->directory.'*~*'.$id.'*~*'); + $paths = array(); + + foreach ( (array) $keys as $tag) + { + $paths = array_merge($paths, glob($this->config['directory'].'*~*'.$tag.'*~*')); + } // Find all tags matching the given tag $files = array(); + foreach ($paths as $path) { // Split the files @@ -60,12 +59,16 @@ class Cache_File_Driver implements Cache_Driver { continue; // Split the tags by plus signs, used to separate tags - $tags = explode('+', $tags[1]); + $item_tags = explode('+', $tags[1]); - if (in_array($tag, $tags)) + // Check each supplied tag, and match aginst the tags on each item. + foreach ($keys as $tag) { - // Add the file to the array, it has the requested tag - $files[] = $path; + if (in_array($tag, $item_tags)) + { + // Add the file to the array, it has the requested tag + $files[] = $path; + } } } @@ -73,98 +76,68 @@ class Cache_File_Driver implements Cache_Driver { } else { - // Find the file matching the given id - return glob($this->directory.$id.'~*'); + $paths = array(); + + foreach ( (array) $keys as $key) + { + // Find the file matching the given key + $paths = array_merge($paths, glob($this->config['directory'].str_replace(array('/', '\\', ' '), '_', $key).'~*')); + } + + return $paths; } } - /** - * Sets a cache item to the given data, tags, and lifetime. - * - * @param string cache id to set - * @param string data in the cache - * @param array cache tags - * @param integer lifetime - * @return bool - */ - public function set($id, $data, array $tags = NULL, $lifetime) + public function set($items, $tags = NULL, $lifetime = NULL) { - // Remove old cache files - $this->delete($id); - - // Cache File driver expects unix timestamp if ($lifetime !== 0) { + // File driver expects unix timestamp $lifetime += time(); } - if ( ! empty($tags)) + + if ( ! is_null($tags) AND ! empty($tags)) { // Convert the tags into a string list - $tags = implode('+', $tags); + $tags = implode('+', (array) $tags); } - // Write out a serialized cache - return (bool) file_put_contents($this->directory.$id.'~'.$tags.'~'.$lifetime, serialize($data)); - } + $success = TRUE; - /** - * Finds an array of ids for a given tag. - * - * @param string tag name - * @return array of ids that match the tag - */ - public function find($tag) - { - // An array will always be returned - $result = array(); - - if ($paths = $this->exists($tag, TRUE)) + foreach ($items as $key => $value) { - // Length of directory name - $offset = strlen($this->directory); + if (is_resource($value)) + throw new Cache_Exception('Caching of resources is impossible, because resources cannot be serialised.'); - // Find all the files with the given tag - foreach ($paths as $path) - { - // Get the id from the filename - list($id, $junk) = explode('~', basename($path), 2); + // Remove old cache file + $this->delete($key); - if (($data = $this->get($id)) !== FALSE) - { - // Add the result to the array - $result[$id] = $data; - } + if ( ! (bool) file_put_contents($this->config['directory'].str_replace(array('/', '\\', ' '), '_', $key).'~'.$tags.'~'.$lifetime, serialize($value))) + { + $success = FALSE; } } - return $result; + return $success; } - /** - * Fetches a cache item. This will delete the item if it is expired or if - * the hash does not match the stored hash. - * - * @param string cache id - * @return mixed|NULL - */ - public function get($id) + public function get($keys, $single = FALSE) { - if ($file = $this->exists($id)) + $items = array(); + + if ($files = $this->exists($keys)) { - // Use the first file - $file = current($file); + // Turn off errors while reading the files + $ER = error_reporting(0); - // Validate that the cache has not expired - if ($this->expired($file)) - { - // Remove this cache, it has expired - $this->delete($id); - } - else + foreach ($files as $file) { - // Turn off errors while reading the file - $ER = error_reporting(0); + // Validate that the item has not expired + if ($this->expired($file)) + continue; + + list($key, $junk) = explode('~', basename($file), 2); if (($data = file_get_contents($file)) !== FALSE) { @@ -173,80 +146,102 @@ class Cache_File_Driver implements Cache_Driver { } else { - // Delete the data - unset($data); + $data = NULL; } - // Turn errors back on - error_reporting($ER); + $items[$key] = $data; } + + // Turn errors back on + error_reporting($ER); } - // Return NULL if there is no data - return isset($data) ? $data : NULL; + // Reutrn a single item if only one key was requested + if ($single) + { + return (count($items) > 0) ? current($items) : NULL; + } + else + { + return $items; + } } /** - * Deletes a cache item by id or tag - * - * @param string cache id or tag, or TRUE for "all items" - * @param boolean use tags - * @return boolean + * Get cache items by tag + */ + public function get_tag($tags) + { + // An array will always be returned + $result = array(); + + if ($paths = $this->exists($tags, TRUE)) + { + // Find all the files with the given tag + foreach ($paths as $path) + { + // Get the id from the filename + list($key, $junk) = explode('~', basename($path), 2); + + if (($data = $this->get($key)) !== FALSE) + { + // Add the result to the array + $result[$key] = $data; + } + } + } + + return $result; + } + + /** + * Delete cache items by keys or tags */ - public function delete($id, $tag = FALSE) + public function delete($keys, $tag = FALSE) { - $files = $this->exists($id, $tag); + $success = TRUE; - if (empty($files)) - return FALSE; + $paths = $this->exists($keys, $tag); // Disable all error reporting while deleting $ER = error_reporting(0); - foreach ($files as $file) + foreach ($paths as $path) { // Remove the cache file - if ( ! unlink($file)) - Kohana::log('error', 'Cache: Unable to delete cache file: '.$file); + if ( ! unlink($path)) + { + Kohana::log('error', 'Cache: Unable to delete cache file: '.$path); + $success = FALSE; + } } // Turn on error reporting again error_reporting($ER); - return TRUE; + return $success; } /** - * Deletes all cache files that are older than the current time. - * - * @return void + * Delete cache items by tag */ - public function delete_expired() + public function delete_tag($tags) { - if ($files = $this->exists(TRUE)) - { - // Disable all error reporting while deleting - $ER = error_reporting(0); - - foreach ($files as $file) - { - if ($this->expired($file)) - { - // The cache file has already expired, delete it - if ( ! unlink($file)) - Kohana::log('error', 'Cache: Unable to delete cache file: '.$file); - } - } + return $this->delete($tags, TRUE); + } - // Turn on error reporting again - error_reporting($ER); - } + /** + * Empty the cache + */ + public function delete_all() + { + return $this->delete(TRUE); } /** * Check if a cache file has expired by filename. * - * @param string filename + * @param string|array array of filenames * @return bool */ protected function expired($file) @@ -257,5 +252,4 @@ class Cache_File_Driver implements Cache_Driver { // Expirations of 0 are "never expire" return ($expires !== 0 AND $expires <= time()); } - -} // End Cache File Driver \ No newline at end of file +} // End Cache Memcache Driver diff --git a/system/libraries/drivers/Cache/Memcache.php b/system/libraries/drivers/Cache/Memcache.php index d801de9c..636191d4 100644 --- a/system/libraries/drivers/Cache/Memcache.php +++ b/system/libraries/drivers/Cache/Memcache.php @@ -2,190 +2,128 @@ /** * Memcache-based Cache driver. * - * $Id: Memcache.php 4102 2009-03-19 12:55:54Z Shadowhand $ + * $Id$ * * @package Cache * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ -class Cache_Memcache_Driver implements Cache_Driver { - - const TAGS_KEY = 'memcache_tags_array'; - - // Cache backend object and flags +class Cache_Memcache_Driver extends Cache_Driver { + protected $config; protected $backend; protected $flags; - // Tags array - protected static $tags; - - // Have the tags been changed? - protected static $tags_changed = FALSE; - - public function __construct() + public function __construct($config) { if ( ! extension_loaded('memcache')) - throw new Kohana_Exception('cache.extension_not_loaded', 'memcache'); + throw new Kohana_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); + + $this->config = $config; $this->backend = new Memcache; - $this->flags = Kohana::config('cache_memcache.compression') ? MEMCACHE_COMPRESSED : FALSE; - $servers = Kohana::config('cache_memcache.servers'); + $this->flags = (isset($config['compression']) AND $config['compression']) ? MEMCACHE_COMPRESSED : FALSE; - foreach ($servers as $server) + foreach ($config['servers'] as $server) { // Make sure all required keys are set - $server += array('host' => '127.0.0.1', 'port' => 11211, 'persistent' => FALSE); + $server += array('host' => '127.0.0.1', + 'port' => 11211, + 'persistent' => FALSE, + 'weight' => 1, + 'timeout' => 1, + 'retry_interval' => 15 + ); // Add the server to the pool - $this->backend->addServer($server['host'], $server['port'], (bool) $server['persistent']) - or Kohana::log('error', 'Cache: Connection failed: '.$server['host']); - } - - // Load tags - self::$tags = $this->backend->get(self::TAGS_KEY); - - if ( ! is_array(self::$tags)) - { - // Create a new tags array - self::$tags = array(); - - // Tags have been created - self::$tags_changed = TRUE; + $this->backend->addServer($server['host'], $server['port'], (bool) $server['persistent'], (int) $server['weight'], (int) $server['timeout'], (int) $server['retry_interval'], TRUE, array($this,'_memcache_failure_callback')); } } - public function __destruct() + public function _memcache_failure_callback($host, $port) { - if (self::$tags_changed === TRUE) - { - // Save the tags - $this->backend->set(self::TAGS_KEY, self::$tags, $this->flags, 0); - - // Tags are now unchanged - self::$tags_changed = FALSE; - } + $this->backend->setServerParams($host, $port, 1, -1, FALSE); + Kohana_Log::add('error', __('Cache: Memcache server down: :host:::port:',array(':host:' => $host,':port:' => $port))); } - public function find($tag) + public function set($items, $tags = NULL, $lifetime = NULL) { - if (isset(self::$tags[$tag]) AND $results = $this->backend->get(self::$tags[$tag])) - { - // Return all the found caches - return $results; - } - else + if ($lifetime !== 0) { - // No matching tags - return array(); + // Memcache driver expects unix timestamp + $lifetime += time(); } - } - public function get($id) - { - return (($return = $this->backend->get($id)) === FALSE) ? NULL : $return; - } + if ($tags !== NULL) + throw new Cache_Exception('Memcache driver does not support tags'); - public function set($id, $data, array $tags = NULL, $lifetime) - { - if ( ! empty($tags)) + foreach ($items as $key => $value) { - // Tags will be changed - self::$tags_changed = TRUE; + if (is_resource($value)) + throw new Cache_Exception('Caching of resources is impossible, because resources cannot be serialised.'); - foreach ($tags as $tag) + if ( ! $this->backend->set($key, $value, $this->flags, $lifetime)) { - // Add the id to each tag - self::$tags[$tag][$id] = $id; + return FALSE; } } - if ($lifetime !== 0) - { - // Memcache driver expects unix timestamp - $lifetime += time(); - } - - // Set a new value - return $this->backend->set($id, $data, $this->flags, $lifetime); + return TRUE; } - public function delete($id, $tag = FALSE) + public function get($keys, $single = FALSE) { - // Tags will be changed - self::$tags_changed = TRUE; + $items = $this->backend->get($keys); - if ($id === TRUE) + if ($single) { - if ($status = $this->backend->flush()) - { - // Remove all tags, all items have been deleted - self::$tags = array(); - - // We must sleep after flushing, or overwriting will not work! - // @see http://php.net/manual/en/function.memcache-flush.php#81420 - sleep(1); - } - - return $status; - } - elseif ($tag === TRUE) - { - if (isset(self::$tags[$id])) - { - foreach (self::$tags[$id] as $_id) - { - // Delete each id in the tag - $this->backend->delete($_id); - } - - // Delete the tag - unset(self::$tags[$id]); - } - - return TRUE; + return ($items === FALSE OR count($items) > 0) ? current($items) : NULL; } else { - foreach (self::$tags as $tag => $_ids) - { - if (isset(self::$tags[$tag][$id])) - { - // Remove the id from the tags - unset(self::$tags[$tag][$id]); - } - } - - return $this->backend->delete($id); + return ($items === FALSE) ? array() : $items; } } - public function delete_expired() + /** + * Get cache items by tag + */ + public function get_tag($tags) { - // Tags will be changed - self::$tags_changed = TRUE; + throw new Cache_Exception('Memcache driver does not support tags'); + } - foreach (self::$tags as $tag => $_ids) + /** + * Delete cache item by key + */ + public function delete($keys) + { + foreach ($keys as $key) { - foreach ($_ids as $id) + if ( ! $this->backend->delete($key)) { - if ( ! $this->backend->get($id)) - { - // This id has disappeared, delete it from the tags - unset(self::$tags[$tag][$id]); - } - } - - if (empty(self::$tags[$tag])) - { - // The tag no longer has any valid ids - unset(self::$tags[$tag]); + return FALSE; } } - // Memcache handles garbage collection internally return TRUE; } + /** + * Delete cache items by tag + */ + public function delete_tag($tags) + { + throw new Cache_Exception('Memcache driver does not support tags'); + } + + /** + * Empty the cache + */ + public function delete_all() + { + return $this->backend->flush(); + } } // End Cache Memcache Driver diff --git a/system/libraries/drivers/Cache/Sqlite.php b/system/libraries/drivers/Cache/Sqlite.php deleted file mode 100644 index 9458d851..00000000 --- a/system/libraries/drivers/Cache/Sqlite.php +++ /dev/null @@ -1,257 +0,0 @@ -db = new SQLiteDatabase($filename, '0666', $error); - - // Throw an exception if there's an error - if ( ! empty($error)) - throw new Kohana_Exception('cache.driver_error', sqlite_error_string($error)); - - $query = "SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'caches'"; - $tables = $this->db->query($query, SQLITE_BOTH, $error); - - // Throw an exception if there's an error - if ( ! empty($error)) - throw new Kohana_Exception('cache.driver_error', sqlite_error_string($error)); - - if ($tables->numRows() == 0) - { - Kohana::log('error', 'Cache: Initializing new SQLite cache database'); - - // Issue a CREATE TABLE command - $this->db->unbufferedQuery(Kohana::config('cache_sqlite.schema')); - } - } - - /** - * Checks if a cache id is already set. - * - * @param string cache id - * @return boolean - */ - public function exists($id) - { - // Find the id that matches - $query = "SELECT id FROM caches WHERE id = '$id'"; - - return ($this->db->query($query)->numRows() > 0); - } - - /** - * Sets a cache item to the given data, tags, and lifetime. - * - * @param string cache id to set - * @param string data in the cache - * @param array cache tags - * @param integer lifetime - * @return bool - */ - public function set($id, $data, array $tags = NULL, $lifetime) - { - // Serialize and escape the data - $data = sqlite_escape_string(serialize($data)); - - if ( ! empty($tags)) - { - // Escape the tags, adding brackets so the tag can be explicitly matched - $tags = sqlite_escape_string('<'.implode('>,<', $tags).'>'); - } - - // Cache Sqlite driver expects unix timestamp - if ($lifetime !== 0) - { - $lifetime += time(); - } - - $query = $this->exists($id) - ? "UPDATE caches SET tags = '$tags', expiration = '$lifetime', cache = '$data' WHERE id = '$id'" - : "INSERT INTO caches VALUES('$id', '$tags', '$lifetime', '$data')"; - - // Run the query - $this->db->unbufferedQuery($query, SQLITE_BOTH, $error); - - if ( ! empty($error)) - { - self::log_error($error); - return FALSE; - } - else - { - return TRUE; - } - } - - /** - * Finds an array of ids for a given tag. - * - * @param string tag name - * @return array of ids that match the tag - */ - public function find($tag) - { - $query = "SELECT id,cache FROM caches WHERE tags LIKE '%<{$tag}>%'"; - $query = $this->db->query($query, SQLITE_BOTH, $error); - - // An array will always be returned - $result = array(); - - if ( ! empty($error)) - { - self::log_error($error); - } - elseif ($query->numRows() > 0) - { - // Disable notices for unserializing - $ER = error_reporting(~E_NOTICE); - - while ($row = $query->fetchObject()) - { - // Add each cache to the array - $result[$row->id] = unserialize($row->cache); - } - - // Turn notices back on - error_reporting($ER); - } - - return $result; - } - - /** - * Fetches a cache item. This will delete the item if it is expired or if - * the hash does not match the stored hash. - * - * @param string cache id - * @return mixed|NULL - */ - public function get($id) - { - $query = "SELECT id, expiration, cache FROM caches WHERE id = '$id' LIMIT 0, 1"; - $query = $this->db->query($query, SQLITE_BOTH, $error); - - if ( ! empty($error)) - { - self::log_error($error); - } - elseif ($cache = $query->fetchObject()) - { - // Make sure the expiration is valid and that the hash matches - if ($cache->expiration != 0 AND $cache->expiration <= time()) - { - // Cache is not valid, delete it now - $this->delete($cache->id); - } - else - { - // Disable notices for unserializing - $ER = error_reporting(~E_NOTICE); - - // Return the valid cache data - $data = $cache->cache; - - // Turn notices back on - error_reporting($ER); - } - } - - // No valid cache found - return NULL; - } - - /** - * Deletes a cache item by id or tag - * - * @param string cache id or tag, or TRUE for "all items" - * @param bool delete a tag - * @return bool - */ - public function delete($id, $tag = FALSE) - { - if ($id === TRUE) - { - // Delete all caches - $where = '1'; - } - elseif ($tag === TRUE) - { - // Delete by tag - $where = "tags LIKE '%<{$id}>%'"; - } - else - { - // Delete by id - $where = "id = '$id'"; - } - - $this->db->unbufferedQuery('DELETE FROM caches WHERE '.$where, SQLITE_BOTH, $error); - - if ( ! empty($error)) - { - self::log_error($error); - return FALSE; - } - else - { - return TRUE; - } - } - - /** - * Deletes all cache files that are older than the current time. - */ - public function delete_expired() - { - // Delete all expired caches - $query = 'DELETE FROM caches WHERE expiration != 0 AND expiration <= '.time(); - - $this->db->unbufferedQuery($query); - - return TRUE; - } - -} // End Cache SQLite Driver \ No newline at end of file diff --git a/system/libraries/drivers/Cache/Xcache.php b/system/libraries/drivers/Cache/Xcache.php index 6254bbb6..ad11e6d7 100644 --- a/system/libraries/drivers/Cache/Xcache.php +++ b/system/libraries/drivers/Cache/Xcache.php @@ -1,85 +1,128 @@ config = $config; } - public function set($id, $data, array $tags = NULL, $lifetime) + public function set($items, $tags = NULL, $lifetime = NULL) { - if ( ! empty($tags)) + if ($tags !== NULL) { - Kohana::log('error', 'Cache: tags are unsupported by the Xcache driver'); + Kohana_Log::add('debug', __('Cache: XCache driver does not support tags')); } - return xcache_set($id, $data, $lifetime); - } + foreach ($items as $key => $value) + { + if (is_resource($value)) + throw new Cache_Exception('Caching of resources is impossible, because resources cannot be serialised.'); - public function find($tag) - { - Kohana::log('error', 'Cache: tags are unsupported by the Xcache driver'); - return FALSE; + if ( ! xcache_set($key, $value, $lifetime)) + { + return FALSE; + } + } + + return TRUE; } - public function delete($id, $tag = FALSE) + public function get($keys, $single = FALSE) { - if ($tag !== FALSE) - { - Kohana::log('error', 'Cache: tags are unsupported by the Xcache driver'); - return TRUE; - } - elseif ($id !== TRUE) + $items = array(); + + foreach ($keys as $key) { if (xcache_isset($id)) - return xcache_unset($id); + { + $items[$key] = xcache_get($id); + } + else + { + $items[$key] = NULL; + } + } - return FALSE; + if ($single) + { + return ($items === FALSE OR count($items) > 0) ? current($items) : NULL; } else { - // Do the login - $this->auth(); - $result = TRUE; - for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) + return ($items === FALSE) ? array() : $items; + } + } + + /** + * Get cache items by tag + */ + public function get_tag($tags) + { + Kohana_Log::add('debug', __('Cache: XCache driver does not support tags')); + return NULL; + } + + /** + * Delete cache item by key + */ + public function delete($keys) + { + foreach ($keys as $key) + { + if ( ! xcache_unset($key)) { - if (xcache_clear_cache(XC_TYPE_VAR, $i) !== NULL) - { - $result = FALSE; - break; - } + return FALSE; } - - // Undo the login - $this->auth(TRUE); - return $result; } return TRUE; } - public function delete_expired() + /** + * Delete cache items by tag + */ + public function delete_tag($tags) { - return TRUE; + Kohana_Log::add('debug', __('Cache: XCache driver does not support tags')); + return NULL; + } + + /** + * Empty the cache + */ + public function delete_all() + { + $this->auth(); + $result = TRUE; + + for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) + { + if (xcache_clear_cache(XC_TYPE_VAR, $i) !== NULL) + { + $result = FALSE; + break; + } + } + + // Undo the login + $this->auth(TRUE); + + return $result; } private function auth($reverse = FALSE) @@ -111,9 +154,8 @@ class Cache_Xcache_Driver implements Cache_Driver { $backup[$key] = $value; } - $_SERVER[$key] = Kohana::config('cache_xcache.'.$key); + $_SERVER[$key] = $this->config->{$key}; } } } - -} // End Cache Xcache Driver +} // End Cache XCache Driver diff --git a/system/libraries/drivers/Captcha.php b/system/libraries/drivers/Captcha.php deleted file mode 100644 index a4343e19..00000000 --- a/system/libraries/drivers/Captcha.php +++ /dev/null @@ -1,227 +0,0 @@ -response = $this->generate_challenge(); - - // Store the correct Captcha response in a session - Event::add('system.post_controller', array($this, 'update_response_session')); - } - - /** - * Generate a new Captcha challenge. - * - * @return string the challenge answer - */ - abstract public function generate_challenge(); - - /** - * Output the Captcha challenge. - * - * @param boolean html output - * @return mixed the rendered Captcha (e.g. an image, riddle, etc.) - */ - abstract public function render($html); - - /** - * Stores the response for the current Captcha challenge in a session so it is available - * on the next page load for Captcha::valid(). This method is called after controller - * execution (in the system.post_controller event) in order not to overwrite itself too soon. - * - * @return void - */ - public function update_response_session() - { - Session::instance()->set('captcha_response', sha1(strtoupper($this->response))); - } - - /** - * Validates a Captcha response from a user. - * - * @param string captcha response - * @return boolean - */ - public function valid($response) - { - return (sha1(strtoupper($response)) === Session::instance()->get('captcha_response')); - } - - /** - * Returns the image type. - * - * @param string filename - * @return string|FALSE image type ("png", "gif" or "jpeg") - */ - public function image_type($filename) - { - switch (strtolower(substr(strrchr($filename, '.'), 1))) - { - case 'png': - return 'png'; - - case 'gif': - return 'gif'; - - case 'jpg': - case 'jpeg': - // Return "jpeg" and not "jpg" because of the GD2 function names - return 'jpeg'; - - default: - return FALSE; - } - } - - /** - * Creates an image resource with the dimensions specified in config. - * If a background image is supplied, the image dimensions are used. - * - * @throws Kohana_Exception if no GD2 support - * @param string path to the background image file - * @return void - */ - public function image_create($background = NULL) - { - // Check for GD2 support - if ( ! function_exists('imagegd2')) - throw new Kohana_Exception('captcha.requires_GD2'); - - // Create a new image (black) - $this->image = imagecreatetruecolor(Captcha::$config['width'], Captcha::$config['height']); - - // Use a background image - if ( ! empty($background)) - { - // Create the image using the right function for the filetype - $function = 'imagecreatefrom'.$this->image_type($background); - $this->background_image = $function($background); - - // Resize the image if needed - if (imagesx($this->background_image) !== Captcha::$config['width'] - OR imagesy($this->background_image) !== Captcha::$config['height']) - { - imagecopyresampled - ( - $this->image, $this->background_image, 0, 0, 0, 0, - Captcha::$config['width'], Captcha::$config['height'], - imagesx($this->background_image), imagesy($this->background_image) - ); - } - - // Free up resources - imagedestroy($this->background_image); - } - } - - /** - * Fills the background with a gradient. - * - * @param resource gd image color identifier for start color - * @param resource gd image color identifier for end color - * @param string direction: 'horizontal' or 'vertical', 'random' by default - * @return void - */ - public function image_gradient($color1, $color2, $direction = NULL) - { - $directions = array('horizontal', 'vertical'); - - // Pick a random direction if needed - if ( ! in_array($direction, $directions)) - { - $direction = $directions[array_rand($directions)]; - - // Switch colors - if (mt_rand(0, 1) === 1) - { - $temp = $color1; - $color1 = $color2; - $color2 = $temp; - } - } - - // Extract RGB values - $color1 = imagecolorsforindex($this->image, $color1); - $color2 = imagecolorsforindex($this->image, $color2); - - // Preparations for the gradient loop - $steps = ($direction === 'horizontal') ? Captcha::$config['width'] : Captcha::$config['height']; - - $r1 = ($color1['red'] - $color2['red']) / $steps; - $g1 = ($color1['green'] - $color2['green']) / $steps; - $b1 = ($color1['blue'] - $color2['blue']) / $steps; - - if ($direction === 'horizontal') - { - $x1 =& $i; - $y1 = 0; - $x2 =& $i; - $y2 = Captcha::$config['height']; - } - else - { - $x1 = 0; - $y1 =& $i; - $x2 = Captcha::$config['width']; - $y2 =& $i; - } - - // Execute the gradient loop - for ($i = 0; $i <= $steps; $i++) - { - $r2 = $color1['red'] - floor($i * $r1); - $g2 = $color1['green'] - floor($i * $g1); - $b2 = $color1['blue'] - floor($i * $b1); - $color = imagecolorallocate($this->image, $r2, $g2, $b2); - - imageline($this->image, $x1, $y1, $x2, $y2, $color); - } - } - - /** - * Returns the img html element or outputs the image to the browser. - * - * @param boolean html output - * @return mixed html string or void - */ - public function image_render($html) - { - // Output html element - if ($html) - return 'Captcha'; - - // Send the correct HTTP header - header('Content-Type: image/'.$this->image_type); - - // Pick the correct output function - $function = 'image'.$this->image_type; - $function($this->image); - - // Free up resources - imagedestroy($this->image); - } - -} // End Captcha Driver \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Alpha.php b/system/libraries/drivers/Captcha/Alpha.php deleted file mode 100644 index 27795804..00000000 --- a/system/libraries/drivers/Captcha/Alpha.php +++ /dev/null @@ -1,92 +0,0 @@ -image - $this->image_create(Captcha::$config['background']); - - // Add a random gradient - if (empty(Captcha::$config['background'])) - { - $color1 = imagecolorallocate($this->image, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100)); - $color2 = imagecolorallocate($this->image, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100)); - $this->image_gradient($color1, $color2); - } - - // Add a few random circles - for ($i = 0, $count = mt_rand(10, Captcha::$config['complexity'] * 3); $i < $count; $i++) - { - $color = imagecolorallocatealpha($this->image, mt_rand(0, 255), mt_rand(0, 255), mt_rand(0, 255), mt_rand(80, 120)); - $size = mt_rand(5, Captcha::$config['height'] / 3); - imagefilledellipse($this->image, mt_rand(0, Captcha::$config['width']), mt_rand(0, Captcha::$config['height']), $size, $size, $color); - } - - // Calculate character font-size and spacing - $default_size = min(Captcha::$config['width'], Captcha::$config['height'] * 2) / strlen($this->response); - $spacing = (int) (Captcha::$config['width'] * 0.9 / strlen($this->response)); - - // Background alphabetic character attributes - $color_limit = mt_rand(96, 160); - $chars = 'ABEFGJKLPQRTVY'; - - // Draw each Captcha character with varying attributes - for ($i = 0, $strlen = strlen($this->response); $i < $strlen; $i++) - { - // Use different fonts if available - $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][array_rand(Captcha::$config['fonts'])]; - - $angle = mt_rand(-40, 20); - // Scale the character size on image height - $size = $default_size / 10 * mt_rand(8, 12); - $box = imageftbbox($size, $angle, $font, $this->response[$i]); - - // Calculate character starting coordinates - $x = $spacing / 4 + $i * $spacing; - $y = Captcha::$config['height'] / 2 + ($box[2] - $box[5]) / 4; - - // Draw captcha text character - // Allocate random color, size and rotation attributes to text - $color = imagecolorallocate($this->image, mt_rand(150, 255), mt_rand(200, 255), mt_rand(0, 255)); - - // Write text character to image - imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response[$i]); - - // Draw "ghost" alphabetic character - $text_color = imagecolorallocatealpha($this->image, mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255), mt_rand(70, 120)); - $char = $chars[mt_rand(0, 14)]; - imagettftext($this->image, $size * 2, mt_rand(-45, 45), ($x - (mt_rand(5, 10))), ($y + (mt_rand(5, 10))), $text_color, $font, $char); - } - - // Output - return $this->image_render($html); - } - -} // End Captcha Alpha Driver Class \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Basic.php b/system/libraries/drivers/Captcha/Basic.php deleted file mode 100644 index d212e72c..00000000 --- a/system/libraries/drivers/Captcha/Basic.php +++ /dev/null @@ -1,81 +0,0 @@ -image - $this->image_create(Captcha::$config['background']); - - // Add a random gradient - if (empty(Captcha::$config['background'])) - { - $color1 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(150, 255)); - $color2 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(150, 255)); - $this->image_gradient($color1, $color2); - } - - // Add a few random lines - for ($i = 0, $count = mt_rand(5, Captcha::$config['complexity'] * 4); $i < $count; $i++) - { - $color = imagecolorallocatealpha($this->image, mt_rand(0, 255), mt_rand(0, 255), mt_rand(100, 255), mt_rand(50, 120)); - imageline($this->image, mt_rand(0, Captcha::$config['width']), 0, mt_rand(0, Captcha::$config['width']), Captcha::$config['height'], $color); - } - - // Calculate character font-size and spacing - $default_size = min(Captcha::$config['width'], Captcha::$config['height'] * 2) / (strlen($this->response) + 1); - $spacing = (int) (Captcha::$config['width'] * 0.9 / strlen($this->response)); - - // Draw each Captcha character with varying attributes - for ($i = 0, $strlen = strlen($this->response); $i < $strlen; $i++) - { - // Use different fonts if available - $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][array_rand(Captcha::$config['fonts'])]; - - // Allocate random color, size and rotation attributes to text - $color = imagecolorallocate($this->image, mt_rand(0, 150), mt_rand(0, 150), mt_rand(0, 150)); - $angle = mt_rand(-40, 20); - - // Scale the character size on image height - $size = $default_size / 10 * mt_rand(8, 12); - $box = imageftbbox($size, $angle, $font, $this->response[$i]); - - // Calculate character starting coordinates - $x = $spacing / 4 + $i * $spacing; - $y = Captcha::$config['height'] / 2 + ($box[2] - $box[5]) / 4; - - // Write text character to image - imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response[$i]); - } - - // Output - return $this->image_render($html); - } - -} // End Captcha Basic Driver Class \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Black.php b/system/libraries/drivers/Captcha/Black.php deleted file mode 100644 index 6a2e2226..00000000 --- a/system/libraries/drivers/Captcha/Black.php +++ /dev/null @@ -1,72 +0,0 @@ -image_create(Captcha::$config['background']); - - // Add random white/gray arcs, amount depends on complexity setting - $count = (Captcha::$config['width'] + Captcha::$config['height']) / 2; - $count = $count / 5 * min(10, Captcha::$config['complexity']); - for ($i = 0; $i < $count; $i++) - { - imagesetthickness($this->image, mt_rand(1, 2)); - $color = imagecolorallocatealpha($this->image, 255, 255, 255, mt_rand(0, 120)); - imagearc($this->image, mt_rand(-Captcha::$config['width'], Captcha::$config['width']), mt_rand(-Captcha::$config['height'], Captcha::$config['height']), mt_rand(-Captcha::$config['width'], Captcha::$config['width']), mt_rand(-Captcha::$config['height'], Captcha::$config['height']), mt_rand(0, 360), mt_rand(0, 360), $color); - } - - // Use different fonts if available - $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][array_rand(Captcha::$config['fonts'])]; - - // Draw the character's white shadows - $size = (int) min(Captcha::$config['height'] / 2, Captcha::$config['width'] * 0.8 / strlen($this->response)); - $angle = mt_rand(-15 + strlen($this->response), 15 - strlen($this->response)); - $x = mt_rand(1, Captcha::$config['width'] * 0.9 - $size * strlen($this->response)); - $y = ((Captcha::$config['height'] - $size) / 2) + $size; - $color = imagecolorallocate($this->image, 255, 255, 255); - imagefttext($this->image, $size, $angle, $x + 1, $y + 1, $color, $font, $this->response); - - // Add more shadows for lower complexities - (Captcha::$config['complexity'] < 10) and imagefttext($this->image, $size, $angle, $x - 1, $y - 1, $color, $font , $this->response); - (Captcha::$config['complexity'] < 8) and imagefttext($this->image, $size, $angle, $x - 2, $y + 2, $color, $font , $this->response); - (Captcha::$config['complexity'] < 6) and imagefttext($this->image, $size, $angle, $x + 2, $y - 2, $color, $font , $this->response); - (Captcha::$config['complexity'] < 4) and imagefttext($this->image, $size, $angle, $x + 3, $y + 3, $color, $font , $this->response); - (Captcha::$config['complexity'] < 2) and imagefttext($this->image, $size, $angle, $x - 3, $y - 3, $color, $font , $this->response); - - // Finally draw the foreground characters - $color = imagecolorallocate($this->image, 0, 0, 0); - imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response); - - // Output - return $this->image_render($html); - } - -} // End Captcha Black Driver Class \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Math.php b/system/libraries/drivers/Captcha/Math.php deleted file mode 100644 index 4ac20248..00000000 --- a/system/libraries/drivers/Captcha/Math.php +++ /dev/null @@ -1,61 +0,0 @@ -math_exercice = implode(' + ', $numbers).' = '; - - // Return the answer - return array_sum($numbers); - } - - /** - * Outputs the Captcha riddle. - * - * @param boolean html output - * @return mixed - */ - public function render($html) - { - return $this->math_exercice; - } - -} // End Captcha Math Driver Class \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Riddle.php b/system/libraries/drivers/Captcha/Riddle.php deleted file mode 100644 index 765eeaad..00000000 --- a/system/libraries/drivers/Captcha/Riddle.php +++ /dev/null @@ -1,47 +0,0 @@ -riddle = $riddle[0]; - - // Return the answer - return $riddle[1]; - } - - /** - * Outputs the Captcha riddle. - * - * @param boolean html output - * @return mixed - */ - public function render($html) - { - return $this->riddle; - } - -} // End Captcha Riddle Driver Class \ No newline at end of file diff --git a/system/libraries/drivers/Captcha/Word.php b/system/libraries/drivers/Captcha/Word.php deleted file mode 100644 index 856bd9b4..00000000 --- a/system/libraries/drivers/Captcha/Word.php +++ /dev/null @@ -1,37 +0,0 @@ -cache_lifetime = $cache_setting; + // Restore the cached configuration + $this->config = $this->load_cache(); + + if (count($this->config) > 0) + $this->loaded = TRUE; + + // Add the save cache method to system.shutshut event + Event::add('system.shutdown', array($this, 'save_cache')); + } + + } + + /** + * Gets a value from config. If required is TRUE + * then get will throw an exception if value cannot + * be loaded. + * + * @param string key the setting to get + * @param bool slash remove trailing slashes + * @param bool required is setting required? + * @return mixed + * @access public + */ + public function get($key, $slash = FALSE, $required = FALSE) + { + // Get the group name from the key + $group = explode('.', $key, 2); + $group = $group[0]; + + // Check for existing value and load it dynamically if required + if ( ! isset($this->config[$group])) + $this->config[$group] = $this->load($group, $required); + + // Get the value of the key string + $value = Kohana::key_string($this->config, $key); + + if ($slash === TRUE AND is_string($value) AND $value !== '') + { + // Force the value to end with "/" + $value = rtrim($value, '/').'/'; + } + + if (($required === TRUE) AND ($value === null)) + throw new Kohana_Config_Exception('Value not found in config driver'); + + $this->loaded = TRUE; + return $value; + } + + /** + * Sets a new value to the configuration + * + * @param string key + * @param mixed value + * @return bool + * @access public + */ + public function set($key, $value) + { + // Do this to make sure that the config array is already loaded + $this->get($key); + + if (substr($key, 0, 7) === 'routes.') + { + // Routes cannot contain sub keys due to possible dots in regex + $keys = explode('.', $key, 2); + } + else + { + // Convert dot-noted key string to an array + $keys = explode('.', $key); + } + + // Used for recursion + $conf =& $this->config; + $last = count($keys) - 1; + + foreach ($keys as $i => $k) + { + if ($i === $last) + { + $conf[$k] = $value; + } + else + { + $conf =& $conf[$k]; + } + } + + if (substr($key,0,12) === 'core.modules') + { + // Reprocess the include paths + Kohana::include_paths(TRUE); + } + + // Set config to changed + return $this->changed = TRUE; + } + + /** + * Clear the configuration + * + * @param string group + * @return bool + * @access public + */ + public function clear($group) + { + // Remove the group from config + unset($this->config[$group]); + + // Set config to changed + return $this->changed = TRUE; + } + + /** + * Checks whether the setting exists in + * config + * + * @param string $key + * @return bool + * @access public + */ + public function setting_exists($key) + { + return $this->get($key) === NULL; + } + + /** + * Loads a configuration group based on the setting + * + * @param string group + * @param bool required + * @return array + * @access public + * @abstract + */ + abstract public function load($group, $required = FALSE); + + /** + * Loads the cached version of this configuration driver + * + * @return array + * @access public + */ + public function load_cache() + { + // Load the cache for this configuration + $cached_config = Kohana::cache($this->cache_name, $this->cache_lifetime); + + // If the configuration wasn't loaded from the cache + if ($cached_config === NULL) + $cached_config = array(); + + // Return the cached config + return $cached_config; + } + + /** + * Saves a cached version of this configuration driver + * + * @return bool + * @access public + */ + public function save_cache() + { + // If this configuration has changed + if ($this->get('core.internal_cache') !== FALSE AND $this->changed) + { + $data = $this->config; + + // Save the cache + return Kohana::cache_save($this->cache_name, $data, $this->cache_lifetime); + } + + return TRUE; + } +} // End Kohana_Config_Driver \ No newline at end of file diff --git a/system/libraries/drivers/Config/Array.php b/system/libraries/drivers/Config/Array.php new file mode 100644 index 00000000..b2ca19ba --- /dev/null +++ b/system/libraries/drivers/Config/Array.php @@ -0,0 +1,83 @@ +escape_table($table).' WHERE '.implode(' ', $where); - } - - /** - * Builds an UPDATE query. - * - * @param string table name - * @param array key => value pairs - * @param array where clause - * @return string - */ - public function update($table, $values, $where) - { - foreach ($values as $key => $val) - { - $valstr[] = $this->escape_column($key).' = '.$val; - } - return 'UPDATE '.$this->escape_table($table).' SET '.implode(', ', $valstr).' WHERE '.implode(' ',$where); - } - - /** - * Set the charset using 'SET NAMES '. - * - * @param string character set to use - */ - public function set_charset($charset) - { - throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__); - } - - /** - * Wrap the tablename in backticks, has support for: table.field syntax. - * - * @param string table name - * @return string - */ - abstract public function escape_table($table); - - /** - * Escape a column/field name, has support for special commands. - * - * @param string column name - * @return string - */ - abstract public function escape_column($column); - - /** - * Builds a WHERE portion of a query. - * - * @param mixed key - * @param string value - * @param string type - * @param int number of where clauses - * @param boolean escape the value - * @return string - */ - public function where($key, $value, $type, $num_wheres, $quote) - { - $prefix = ($num_wheres == 0) ? '' : $type; - - if ($quote === -1) - { - $value = ''; - } - else - { - if ($value === NULL) - { - if ( ! $this->has_operator($key)) - { - $key .= ' IS'; - } - - $value = ' NULL'; - } - elseif (is_bool($value)) - { - if ( ! $this->has_operator($key)) - { - $key .= ' ='; - } - - $value = ($value == TRUE) ? ' TRUE' : ' FALSE'; - } - else - { - if ( ! $this->has_operator($key) AND ! empty($key)) - { - $key = $this->escape_column($key).' ='; - } - else - { - preg_match('/^(.+?)([<>!=]+|\bIS(?:\s+NULL))\s*$/i', $key, $matches); - if (isset($matches[1]) AND isset($matches[2])) - { - $key = $this->escape_column(trim($matches[1])).' '.trim($matches[2]); - } - } - - $value = ' '.(($quote == TRUE) ? $this->escape($value) : $value); - } - } - - return $prefix.$key.$value; - } - - /** - * Builds a LIKE portion of a query. - * - * @param mixed field name - * @param string value to match with field - * @param boolean add wildcards before and after the match - * @param string clause type (AND or OR) - * @param int number of likes - * @return string - */ - public function like($field, $match, $auto, $type, $num_likes) - { - $prefix = ($num_likes == 0) ? '' : $type; - - $match = $this->escape_str($match); - - if ($auto === TRUE) - { - // Add the start and end quotes - $match = '%'.str_replace('%', '\\%', $match).'%'; - } - - return $prefix.' '.$this->escape_column($field).' LIKE \''.$match . '\''; - } - - /** - * Builds a NOT LIKE portion of a query. - * - * @param mixed field name - * @param string value to match with field - * @param string clause type (AND or OR) - * @param int number of likes - * @return string - */ - public function notlike($field, $match, $auto, $type, $num_likes) - { - $prefix = ($num_likes == 0) ? '' : $type; - - $match = $this->escape_str($match); - - if ($auto === TRUE) - { - // Add the start and end quotes - $match = '%'.$match.'%'; - } - - return $prefix.' '.$this->escape_column($field).' NOT LIKE \''.$match.'\''; - } - - /** - * Builds a REGEX portion of a query. - * - * @param string field name - * @param string value to match with field - * @param string clause type (AND or OR) - * @param integer number of regexes - * @return string - */ - public function regex($field, $match, $type, $num_regexs) - { - throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__); - } - - /** - * Builds a NOT REGEX portion of a query. - * - * @param string field name - * @param string value to match with field - * @param string clause type (AND or OR) - * @param integer number of regexes - * @return string - */ - public function notregex($field, $match, $type, $num_regexs) - { - throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__); - } - - /** - * Builds an INSERT query. - * - * @param string table name - * @param array keys - * @param array values - * @return string - */ - public function insert($table, $keys, $values) - { - // Escape the column names - foreach ($keys as $key => $value) - { - $keys[$key] = $this->escape_column($value); - } - return 'INSERT INTO '.$this->escape_table($table).' ('.implode(', ', $keys).') VALUES ('.implode(', ', $values).')'; - } - - /** - * Builds a MERGE portion of a query. - * - * @param string table name - * @param array keys - * @param array values - * @return string - */ - public function merge($table, $keys, $values) - { - throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__); - } - - /** - * Builds a LIMIT portion of a query. - * - * @param integer limit - * @param integer offset - * @return string - */ - abstract public function limit($limit, $offset = 0); - - /** - * Creates a prepared statement. - * - * @param string SQL query - * @return Database_Stmt - */ - public function stmt_prepare($sql = '') - { - throw new Kohana_Database_Exception('database.not_implemented', __FUNCTION__); - } - - /** - * Compiles the SELECT statement. - * Generates a query string based on which functions were used. - * Should not be called directly, the get() function calls it. - * - * @param array select query values - * @return string - */ - abstract public function compile_select($database); - - /** - * Determines if the string has an arithmetic operator in it. - * - * @param string string to check - * @return boolean - */ - public function has_operator($str) - { - return (bool) preg_match('/[<>!=]|\sIS(?:\s+NOT\s+)?\b|BETWEEN/i', trim($str)); - } - - /** - * Escapes any input value. - * - * @param mixed value to escape - * @return string - */ - public function escape($value) - { - if ( ! $this->db_config['escape']) - return $value; - - switch (gettype($value)) - { - case 'string': - $value = '\''.$this->escape_str($value).'\''; - break; - case 'boolean': - $value = ($value == TRUE) ? 'TRUE' : 'FALSE'; - break; - case 'double': - // Convert to non-locale aware float to prevent possible commas - $value = sprintf('%F', $value); - break; - default: - $value = ($value === NULL) ? 'NULL' : $value; - break; - } - - return (string) $value; - } - - /** - * Escapes a string for a query. - * - * @param mixed value to escape - * @return string - */ - abstract public function escape_str($str); - - /** - * Lists all tables in the database. - * - * @return array - */ - abstract public function list_tables(); - - /** - * Lists all fields in a table. - * - * @param string table name - * @return array - */ - abstract function list_fields($table); - - /** - * Returns the last database error. - * - * @return string - */ - abstract public function show_error(); - - /** - * Returns field data about a table. - * - * @param string table name - * @return array - */ - abstract public function field_data($table); - - /** - * Fetches SQL type information about a field, in a generic format. - * - * @param string field datatype - * @return array - */ - protected function sql_type($str) - { - static $sql_types; - - if ($sql_types === NULL) - { - // Load SQL data types - $sql_types = Kohana::config('sql_types'); - } - - $str = strtolower(trim($str)); - - if (($open = strpos($str, '(')) !== FALSE) - { - // Find closing bracket - $close = strpos($str, ')', $open) - 1; - - // Find the type without the size - $type = substr($str, 0, $open); - } - else - { - // No length - $type = $str; - } - - empty($sql_types[$type]) and exit - ( - 'Unknown field type: '.$type.'. '. - 'Please report this: http://trac.kohanaphp.com/newticket' - ); - - // Fetch the field definition - $field = $sql_types[$type]; - - switch ($field['type']) - { - case 'string': - case 'float': - if (isset($close)) - { - // Add the length to the field info - $field['length'] = substr($str, $open + 1, $close - $open); - } - break; - case 'int': - // Add unsigned value - $field['unsigned'] = (strpos($str, 'unsigned') !== FALSE); - break; - } - - return $field; - } - - /** - * Clears the internal query cache. - * - * @param string SQL query - */ - public function clear_cache($sql = NULL) - { - if (empty($sql)) - { - $this->query_cache = array(); - } - else - { - unset($this->query_cache[$this->query_hash($sql)]); - } - - Kohana::log('debug', 'Database cache cleared: '.get_class($this)); - } - - /** - * Creates a hash for an SQL query string. Replaces newlines with spaces, - * trims, and hashes. - * - * @param string SQL query - * @return string - */ - protected function query_hash($sql) - { - return sha1(str_replace("\n", ' ', trim($sql))); - } - -} // End Database Driver Interface - -/** - * Database_Result - * - */ -abstract class Database_Result implements ArrayAccess, Iterator, Countable { - - // Result resource, insert id, and SQL - protected $result; - protected $insert_id; - protected $sql; - - // Current and total rows - protected $current_row = 0; - protected $total_rows = 0; - - // Fetch function and return type - protected $fetch_type; - protected $return_type; - - /** - * Returns the SQL used to fetch the result. - * - * @return string - */ - public function sql() - { - return $this->sql; - } - - /** - * Returns the insert id from the result. - * - * @return mixed - */ - public function insert_id() - { - return $this->insert_id; - } - - /** - * Prepares the query result. - * - * @param boolean return rows as objects - * @param mixed type - * @return Database_Result - */ - abstract function result($object = TRUE, $type = FALSE); - - /** - * Builds an array of query results. - * - * @param boolean return rows as objects - * @param mixed type - * @return array - */ - abstract function result_array($object = NULL, $type = FALSE); - - /** - * Gets the fields of an already run query. - * - * @return array - */ - abstract public function list_fields(); - - /** - * Seek to an offset in the results. - * - * @return boolean - */ - abstract public function seek($offset); - - /** - * Countable: count - */ - public function count() - { - return $this->total_rows; - } - - /** - * ArrayAccess: offsetExists - */ - public function offsetExists($offset) - { - if ($this->total_rows > 0) - { - $min = 0; - $max = $this->total_rows - 1; - - return ! ($offset < $min OR $offset > $max); - } - - return FALSE; - } - - /** - * ArrayAccess: offsetGet - */ - public function offsetGet($offset) - { - if ( ! $this->seek($offset)) - return FALSE; - - // Return the row by calling the defined fetching callback - return call_user_func($this->fetch_type, $this->result, $this->return_type); - } - - /** - * ArrayAccess: offsetSet - * - * @throws Kohana_Database_Exception - */ - final public function offsetSet($offset, $value) - { - throw new Kohana_Database_Exception('database.result_read_only'); - } - - /** - * ArrayAccess: offsetUnset - * - * @throws Kohana_Database_Exception - */ - final public function offsetUnset($offset) - { - throw new Kohana_Database_Exception('database.result_read_only'); - } - - /** - * Iterator: current - */ - public function current() - { - return $this->offsetGet($this->current_row); - } - - /** - * Iterator: key - */ - public function key() - { - return $this->current_row; - } - - /** - * Iterator: next - */ - public function next() - { - ++$this->current_row; - return $this; - } - - /** - * Iterator: prev - */ - public function prev() - { - --$this->current_row; - return $this; - } - - /** - * Iterator: rewind - */ - public function rewind() - { - $this->current_row = 0; - return $this; - } - - /** - * Iterator: valid - */ - public function valid() - { - return $this->offsetExists($this->current_row); - } - -} // End Database Result Interface diff --git a/system/libraries/drivers/Database/Mssql.php b/system/libraries/drivers/Database/Mssql.php deleted file mode 100644 index 8b5ed50b..00000000 --- a/system/libraries/drivers/Database/Mssql.php +++ /dev/null @@ -1,462 +0,0 @@ -db_config = $config; - - Kohana::log('debug', 'MSSQL Database Driver Initialized'); - } - - /** - * Closes the database connection. - */ - public function __destruct() - { - is_resource($this->link) and mssql_close($this->link); - } - - /** - * Make the connection - * - * @return return connection - */ - public function connect() - { - // Check if link already exists - if (is_resource($this->link)) - return $this->link; - - // Import the connect variables - extract($this->db_config['connection']); - - // Persistent connections enabled? - $connect = ($this->db_config['persistent'] == TRUE) ? 'mssql_pconnect' : 'mssql_connect'; - - // Build the connection info - $host = isset($host) ? $host : $socket; - - // Windows uses a comma instead of a colon - $port = (isset($port) AND is_string($port)) ? (KOHANA_IS_WIN ? ',' : ':').$port : ''; - - // Make the connection and select the database - if (($this->link = $connect($host.$port, $user, $pass, TRUE)) AND mssql_select_db($database, $this->link)) - { - /* This is being removed so I can use it, will need to come up with a more elegant workaround in the future... - * - if ($charset = $this->db_config['character_set']) - { - $this->set_charset($charset); - } - */ - - // Clear password after successful connect - $this->db_config['connection']['pass'] = NULL; - - return $this->link; - } - - return FALSE; - } - - public function query($sql) - { - // Only cache if it's turned on, and only cache if it's not a write statement - if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|REPLACE|SET)\b#i', $sql)) - { - $hash = $this->query_hash($sql); - - if ( ! isset($this->query_cache[$hash])) - { - // Set the cached object - $this->query_cache[$hash] = new Mssql_Result(mssql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql); - } - else - { - // Rewind cached result - $this->query_cache[$hash]->rewind(); - } - - // Return the cached query - return $this->query_cache[$hash]; - } - - return new Mssql_Result(mssql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql); - } - - public function escape_table($table) - { - if (stripos($table, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $table = str_ireplace(' AS ', ' AS ', $table); - - // Runs escape_table on both sides of an AS statement - $table = array_map(array($this, __FUNCTION__), explode(' AS ', $table)); - - // Re-create the AS statement - return implode(' AS ', $table); - } - return '['.str_replace('.', '[.]', $table).']'; - } - - public function escape_column($column) - { - if (!$this->db_config['escape']) - return $column; - - if ($column == '*') - return $column; - - // This matches any functions we support to SELECT. - if ( preg_match('/(avg|count|sum|max|min)\(\s*(.*)\s*\)(\s*as\s*(.+)?)?/i', $column, $matches)) - { - if ( count($matches) == 3) - { - return $matches[1].'('.$this->escape_column($matches[2]).')'; - } - else if ( count($matches) == 5) - { - return $matches[1].'('.$this->escape_column($matches[2]).') AS '.$this->escape_column($matches[2]); - } - } - - // This matches any modifiers we support to SELECT. - if ( ! preg_match('/\b(?:rand|all|distinct(?:row)?|high_priority|sql_(?:small_result|b(?:ig_result|uffer_result)|no_cache|ca(?:che|lc_found_rows)))\s/i', $column)) - { - if (stripos($column, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $column = str_ireplace(' AS ', ' AS ', $column); - - // Runs escape_column on both sides of an AS statement - $column = array_map(array($this, __FUNCTION__), explode(' AS ', $column)); - - // Re-create the AS statement - return implode(' AS ', $column); - } - - return preg_replace('/[^.*]+/', '[$0]', $column); - } - - $parts = explode(' ', $column); - $column = ''; - - for ($i = 0, $c = count($parts); $i < $c; $i++) - { - // The column is always last - if ($i == ($c - 1)) - { - $column .= preg_replace('/[^.*]+/', '[$0]', $parts[$i]); - } - else // otherwise, it's a modifier - { - $column .= $parts[$i].' '; - } - } - return $column; - } - - /** - * Limit in SQL Server 2000 only uses the keyword - * 'TOP'; 2007 may have an offset keyword, but - * I am unsure - for pagination style limit,offset - * functionality, a fancy query needs to be built. - * - * @param unknown_type $limit - * @return unknown - */ - public function limit($limit, $offset=null) - { - return 'TOP '.$limit; - } - - public function compile_select($database) - { - $sql = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT '; - $sql .= (count($database['select']) > 0) ? implode(', ', $database['select']) : '*'; - - if (count($database['from']) > 0) - { - // Escape the tables - $froms = array(); - foreach ($database['from'] as $from) - $froms[] = $this->escape_column($from); - $sql .= "\nFROM "; - $sql .= implode(', ', $froms); - } - - if (count($database['join']) > 0) - { - foreach($database['join'] AS $join) - { - $sql .= "\n".$join['type'].'JOIN '.implode(', ', $join['tables']).' ON '.$join['conditions']; - } - } - - if (count($database['where']) > 0) - { - $sql .= "\nWHERE "; - } - - $sql .= implode("\n", $database['where']); - - if (count($database['groupby']) > 0) - { - $sql .= "\nGROUP BY "; - $sql .= implode(', ', $database['groupby']); - } - - if (count($database['having']) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $database['having']); - } - - if (count($database['orderby']) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $database['orderby']); - } - - if (is_numeric($database['limit'])) - { - $sql .= "\n"; - $sql .= $this->limit($database['limit']); - } - - return $sql; - } - - public function escape_str($str) - { - if (!$this->db_config['escape']) - return $str; - - is_resource($this->link) or $this->connect(); - //mssql_real_escape_string($str, $this->link); <-- this function doesn't exist - - $characters = array('/\x00/', '/\x1a/', '/\n/', '/\r/', '/\\\/', '/\'/'); - $replace = array('\\\x00', '\\x1a', '\\n', '\\r', '\\\\', "''"); - return preg_replace($characters, $replace, $str); - } - - public function list_tables() - { - $sql = 'SHOW TABLES FROM ['.$this->db_config['connection']['database'].']'; - $result = $this->query($sql)->result(FALSE, MSSQL_ASSOC); - - $retval = array(); - foreach ($result as $row) - { - $retval[] = current($row); - } - - return $retval; - } - - public function show_error() - { - return mssql_get_last_message($this->link); - } - - public function list_fields($table) - { - $result = array(); - - foreach ($this->field_data($table) as $row) - { - // Make an associative array - $result[$row->Field] = $this->sql_type($row->Type); - } - - return $result; - } - - public function field_data($table) - { - $query = $this->query("SELECT COLUMN_NAME AS Field, DATA_TYPE as Type FROM INFORMATION_SCHEMA.Columns WHERE TABLE_NAME = '".$this->escape_table($table)."'", $this->link); - - return $query->result_array(TRUE); - } -} - -/** - * MSSQL Result - */ -class Mssql_Result extends Database_Result { - - // Fetch function and return type - protected $fetch_type = 'mssql_fetch_object'; - protected $return_type = MSSQL_ASSOC; - - /** - * Sets up the result variables. - * - * @param resource query result - * @param resource database link - * @param boolean return objects or arrays - * @param string SQL query that was run - */ - public function __construct($result, $link, $object = TRUE, $sql) - { - $this->result = $result; - - // If the query is a resource, it was a SELECT, SHOW, DESCRIBE, EXPLAIN query - if (is_resource($result)) - { - $this->current_row = 0; - $this->total_rows = mssql_num_rows($this->result); - $this->fetch_type = ($object === TRUE) ? 'mssql_fetch_object' : 'mssql_fetch_array'; - } - elseif (is_bool($result)) - { - if ($result == FALSE) - { - // SQL error - throw new Kohana_Database_Exception('database.error', mssql_get_last_message($link).' - '.$sql); - } - else - { - // Its an DELETE, INSERT, REPLACE, or UPDATE querys - $last_id = mssql_query('SELECT @@IDENTITY AS last_id', $link); - $result = mssql_fetch_assoc($last_id); - $this->insert_id = $result['last_id']; - $this->total_rows = mssql_rows_affected($link); - } - } - - // Set result type - $this->result($object); - - // Store the SQL - $this->sql = $sql; - } - - /** - * Destruct, the cleanup crew! - */ - public function __destruct() - { - if (is_resource($this->result)) - { - mssql_free_result($this->result); - } - } - - public function result($object = TRUE, $type = MSSQL_ASSOC) - { - $this->fetch_type = ((bool) $object) ? 'mssql_fetch_object' : 'mssql_fetch_array'; - - // This check has to be outside the previous statement, because we do not - // know the state of fetch_type when $object = NULL - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - if ($this->fetch_type == 'mssql_fetch_object') - { - $this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $this->return_type = $type; - } - - return $this; - } - - public function as_array($object = NULL, $type = MSSQL_ASSOC) - { - return $this->result_array($object, $type); - } - - public function result_array($object = NULL, $type = MSSQL_ASSOC) - { - $rows = array(); - - if (is_string($object)) - { - $fetch = $object; - } - elseif (is_bool($object)) - { - if ($object === TRUE) - { - $fetch = 'mssql_fetch_object'; - - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $fetch = 'mssql_fetch_array'; - } - } - else - { - // Use the default config values - $fetch = $this->fetch_type; - - if ($fetch == 'mssql_fetch_object') - { - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - } - - if (mssql_num_rows($this->result)) - { - // Reset the pointer location to make sure things work properly - mssql_data_seek($this->result, 0); - - while ($row = $fetch($this->result, $type)) - { - $rows[] = $row; - } - } - - return isset($rows) ? $rows : array(); - } - - public function list_fields() - { - $field_names = array(); - while ($field = mssql_fetch_field($this->result)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - public function seek($offset) - { - if ( ! $this->offsetExists($offset)) - return FALSE; - - return mssql_data_seek($this->result, $offset); - } - -} // End mssql_Result Class diff --git a/system/libraries/drivers/Database/Mysql.php b/system/libraries/drivers/Database/Mysql.php deleted file mode 100644 index d5222f50..00000000 --- a/system/libraries/drivers/Database/Mysql.php +++ /dev/null @@ -1,496 +0,0 @@ -db_config = $config; - - Kohana::log('debug', 'MySQL Database Driver Initialized'); - } - - /** - * Closes the database connection. - */ - public function __destruct() - { - is_resource($this->link) and mysql_close($this->link); - } - - public function connect() - { - // Check if link already exists - if (is_resource($this->link)) - return $this->link; - - // Import the connect variables - extract($this->db_config['connection']); - - // Persistent connections enabled? - $connect = ($this->db_config['persistent'] == TRUE) ? 'mysql_pconnect' : 'mysql_connect'; - - // Build the connection info - $host = isset($host) ? $host : $socket; - $port = isset($port) ? ':'.$port : ''; - - // Make the connection and select the database - if (($this->link = $connect($host.$port, $user, $pass, TRUE)) AND mysql_select_db($database, $this->link)) - { - if ($charset = $this->db_config['character_set']) - { - $this->set_charset($charset); - } - - // Clear password after successful connect - $this->db_config['connection']['pass'] = NULL; - - return $this->link; - } - - return FALSE; - } - - public function query($sql) - { - // Only cache if it's turned on, and only cache if it's not a write statement - if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|REPLACE|SET|DELETE|TRUNCATE)\b#i', $sql)) - { - $hash = $this->query_hash($sql); - - if ( ! isset($this->query_cache[$hash])) - { - // Set the cached object - $this->query_cache[$hash] = new Mysql_Result(mysql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql); - } - else - { - // Rewind cached result - $this->query_cache[$hash]->rewind(); - } - - // Return the cached query - return $this->query_cache[$hash]; - } - - return new Mysql_Result(mysql_query($sql, $this->link), $this->link, $this->db_config['object'], $sql); - } - - public function set_charset($charset) - { - $this->query('SET NAMES '.$this->escape_str($charset)); - } - - public function escape_table($table) - { - if (!$this->db_config['escape']) - return $table; - - if (stripos($table, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $table = str_ireplace(' AS ', ' AS ', $table); - - // Runs escape_table on both sides of an AS statement - $table = array_map(array($this, __FUNCTION__), explode(' AS ', $table)); - - // Re-create the AS statement - return implode(' AS ', $table); - } - return '`'.str_replace('.', '`.`', $table).'`'; - } - - public function escape_column($column) - { - if (!$this->db_config['escape']) - return $column; - - if ($column == '*') - return $column; - - // This matches any functions we support to SELECT. - if ( preg_match('/(avg|count|sum|max|min)\(\s*(.*)\s*\)(\s*as\s*(.+)?)?/i', $column, $matches)) - { - if ( count($matches) == 3) - { - return $matches[1].'('.$this->escape_column($matches[2]).')'; - } - else if ( count($matches) == 5) - { - return $matches[1].'('.$this->escape_column($matches[2]).') AS '.$this->escape_column($matches[2]); - } - } - - // This matches any modifiers we support to SELECT. - if ( ! preg_match('/\b(?:rand|all|distinct(?:row)?|high_priority|sql_(?:small_result|b(?:ig_result|uffer_result)|no_cache|ca(?:che|lc_found_rows)))\s/i', $column)) - { - if (stripos($column, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $column = str_ireplace(' AS ', ' AS ', $column); - - // Runs escape_column on both sides of an AS statement - $column = array_map(array($this, __FUNCTION__), explode(' AS ', $column)); - - // Re-create the AS statement - return implode(' AS ', $column); - } - - return preg_replace('/[^.*]+/', '`$0`', $column); - } - - $parts = explode(' ', $column); - $column = ''; - - for ($i = 0, $c = count($parts); $i < $c; $i++) - { - // The column is always last - if ($i == ($c - 1)) - { - $column .= preg_replace('/[^.*]+/', '`$0`', $parts[$i]); - } - else // otherwise, it's a modifier - { - $column .= $parts[$i].' '; - } - } - return $column; - } - - public function regex($field, $match, $type, $num_regexs) - { - $prefix = ($num_regexs == 0) ? '' : $type; - - return $prefix.' '.$this->escape_column($field).' REGEXP \''.$this->escape_str($match).'\''; - } - - public function notregex($field, $match, $type, $num_regexs) - { - $prefix = $num_regexs == 0 ? '' : $type; - - return $prefix.' '.$this->escape_column($field).' NOT REGEXP \''.$this->escape_str($match) . '\''; - } - - public function merge($table, $keys, $values) - { - // Escape the column names - foreach ($keys as $key => $value) - { - $keys[$key] = $this->escape_column($value); - } - return 'REPLACE INTO '.$this->escape_table($table).' ('.implode(', ', $keys).') VALUES ('.implode(', ', $values).')'; - } - - public function limit($limit, $offset = 0) - { - return 'LIMIT '.$offset.', '.$limit; - } - - public function compile_select($database) - { - $sql = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT '; - $sql .= (count($database['select']) > 0) ? implode(', ', $database['select']) : '*'; - - if (count($database['from']) > 0) - { - // Escape the tables - $froms = array(); - foreach ($database['from'] as $from) - { - $froms[] = $this->escape_column($from); - } - $sql .= "\nFROM ("; - $sql .= implode(', ', $froms).")"; - } - - if (count($database['join']) > 0) - { - foreach($database['join'] AS $join) - { - $sql .= "\n".$join['type'].'JOIN '.implode(', ', $join['tables']).' ON '.$join['conditions']; - } - } - - if (count($database['where']) > 0) - { - $sql .= "\nWHERE "; - } - - $sql .= implode("\n", $database['where']); - - if (count($database['groupby']) > 0) - { - $sql .= "\nGROUP BY "; - $sql .= implode(', ', $database['groupby']); - } - - if (count($database['having']) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $database['having']); - } - - if (count($database['orderby']) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $database['orderby']); - } - - if (is_numeric($database['limit'])) - { - $sql .= "\n"; - $sql .= $this->limit($database['limit'], $database['offset']); - } - - return $sql; - } - - public function escape_str($str) - { - if (!$this->db_config['escape']) - return $str; - - is_resource($this->link) or $this->connect(); - - return mysql_real_escape_string($str, $this->link); - } - - public function list_tables() - { - $tables = array(); - - if ($query = $this->query('SHOW TABLES FROM '.$this->escape_table($this->db_config['connection']['database']))) - { - foreach ($query->result(FALSE) as $row) - { - $tables[] = current($row); - } - } - - return $tables; - } - - public function show_error() - { - return mysql_error($this->link); - } - - public function list_fields($table) - { - $result = NULL; - - foreach ($this->field_data($table) as $row) - { - // Make an associative array - $result[$row->Field] = $this->sql_type($row->Type); - - if ($row->Key === 'PRI' AND $row->Extra === 'auto_increment') - { - // For sequenced (AUTO_INCREMENT) tables - $result[$row->Field]['sequenced'] = TRUE; - } - - if ($row->Null === 'YES') - { - // Set NULL status - $result[$row->Field]['null'] = TRUE; - } - } - - if (!isset($result)) - throw new Kohana_Database_Exception('database.table_not_found', $table); - - return $result; - } - - public function field_data($table) - { - $result = $this->query('SHOW COLUMNS FROM '.$this->escape_table($table)); - - return $result->result_array(TRUE); - } - -} // End Database_Mysql_Driver Class - -/** - * MySQL Result - */ -class Mysql_Result extends Database_Result { - - // Fetch function and return type - protected $fetch_type = 'mysql_fetch_object'; - protected $return_type = MYSQL_ASSOC; - - /** - * Sets up the result variables. - * - * @param resource query result - * @param resource database link - * @param boolean return objects or arrays - * @param string SQL query that was run - */ - public function __construct($result, $link, $object = TRUE, $sql) - { - $this->result = $result; - - // If the query is a resource, it was a SELECT, SHOW, DESCRIBE, EXPLAIN query - if (is_resource($result)) - { - $this->current_row = 0; - $this->total_rows = mysql_num_rows($this->result); - $this->fetch_type = ($object === TRUE) ? 'mysql_fetch_object' : 'mysql_fetch_array'; - } - elseif (is_bool($result)) - { - if ($result == FALSE) - { - // SQL error - throw new Kohana_Database_Exception('database.error', mysql_error($link).' - '.$sql); - } - else - { - // Its an DELETE, INSERT, REPLACE, or UPDATE query - $this->insert_id = mysql_insert_id($link); - $this->total_rows = mysql_affected_rows($link); - } - } - - // Set result type - $this->result($object); - - // Store the SQL - $this->sql = $sql; - } - - /** - * Destruct, the cleanup crew! - */ - public function __destruct() - { - if (is_resource($this->result)) - { - mysql_free_result($this->result); - } - } - - public function result($object = TRUE, $type = MYSQL_ASSOC) - { - $this->fetch_type = ((bool) $object) ? 'mysql_fetch_object' : 'mysql_fetch_array'; - - // This check has to be outside the previous statement, because we do not - // know the state of fetch_type when $object = NULL - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - if ($this->fetch_type == 'mysql_fetch_object' AND $object === TRUE) - { - $this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $this->return_type = $type; - } - - return $this; - } - - public function as_array($object = NULL, $type = MYSQL_ASSOC) - { - return $this->result_array($object, $type); - } - - public function result_array($object = NULL, $type = MYSQL_ASSOC) - { - $rows = array(); - - if (is_string($object)) - { - $fetch = $object; - } - elseif (is_bool($object)) - { - if ($object === TRUE) - { - $fetch = 'mysql_fetch_object'; - - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $fetch = 'mysql_fetch_array'; - } - } - else - { - // Use the default config values - $fetch = $this->fetch_type; - - if ($fetch == 'mysql_fetch_object') - { - $type = (is_string($this->return_type) AND Kohana::auto_load($this->return_type)) ? $this->return_type : 'stdClass'; - } - } - - if (mysql_num_rows($this->result)) - { - // Reset the pointer location to make sure things work properly - mysql_data_seek($this->result, 0); - - while ($row = $fetch($this->result, $type)) - { - $rows[] = $row; - } - } - - return isset($rows) ? $rows : array(); - } - - public function list_fields() - { - $field_names = array(); - while ($field = mysql_fetch_field($this->result)) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - public function seek($offset) - { - if ($this->offsetExists($offset) AND mysql_data_seek($this->result, $offset)) - { - // Set the current row to the offset - $this->current_row = $offset; - - return TRUE; - } - else - { - return FALSE; - } - } - -} // End Mysql_Result Class diff --git a/system/libraries/drivers/Database/Mysqli.php b/system/libraries/drivers/Database/Mysqli.php deleted file mode 100644 index 0dd9f05c..00000000 --- a/system/libraries/drivers/Database/Mysqli.php +++ /dev/null @@ -1,358 +0,0 @@ -db_config = $config; - - Kohana::log('debug', 'MySQLi Database Driver Initialized'); - } - - /** - * Closes the database connection. - */ - public function __destruct() - { - is_object($this->link) and $this->link->close(); - } - - public function connect() - { - // Check if link already exists - if (is_object($this->link)) - return $this->link; - - // Import the connect variables - extract($this->db_config['connection']); - - // Build the connection info - $host = isset($host) ? $host : $socket; - - // Make the connection and select the database - if ($this->link = new mysqli($host, $user, $pass, $database, $port)) - { - if ($charset = $this->db_config['character_set']) - { - $this->set_charset($charset); - } - - // Clear password after successful connect - $this->db_config['connection']['pass'] = NULL; - - return $this->link; - } - - return FALSE; - } - - public function query($sql) - { - // Only cache if it's turned on, and only cache if it's not a write statement - if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|REPLACE|SET|DELETE|TRUNCATE)\b#i', $sql)) - { - $hash = $this->query_hash($sql); - - if ( ! isset($this->query_cache[$hash])) - { - // Set the cached object - $this->query_cache[$hash] = new Kohana_Mysqli_Result($this->link, $this->db_config['object'], $sql); - } - else - { - // Rewind cached result - $this->query_cache[$hash]->rewind(); - } - - // Return the cached query - return $this->query_cache[$hash]; - } - - return new Kohana_Mysqli_Result($this->link, $this->db_config['object'], $sql); - } - - public function set_charset($charset) - { - if ($this->link->set_charset($charset) === FALSE) - throw new Kohana_Database_Exception('database.error', $this->show_error()); - } - - public function escape_str($str) - { - if (!$this->db_config['escape']) - return $str; - - is_object($this->link) or $this->connect(); - - return $this->link->real_escape_string($str); - } - - public function show_error() - { - return $this->link->error; - } - -} // End Database_Mysqli_Driver Class - -/** - * MySQLi Result - */ -class Kohana_Mysqli_Result extends Database_Result { - - // Database connection - protected $link; - - // Data fetching types - protected $fetch_type = 'mysqli_fetch_object'; - protected $return_type = MYSQLI_ASSOC; - - /** - * Sets up the result variables. - * - * @param object database link - * @param boolean return objects or arrays - * @param string SQL query that was run - */ - public function __construct($link, $object = TRUE, $sql) - { - $this->link = $link; - - if ( ! $this->link->multi_query($sql)) - { - // SQL error - throw new Kohana_Database_Exception('database.error', $this->link->error.' - '.$sql); - } - else - { - $this->result = $this->link->store_result(); - - // If the query is an object, it was a SELECT, SHOW, DESCRIBE, EXPLAIN query - if (is_object($this->result)) - { - $this->current_row = 0; - $this->total_rows = $this->result->num_rows; - $this->fetch_type = ($object === TRUE) ? 'fetch_object' : 'fetch_array'; - } - elseif ($this->link->error) - { - // SQL error - throw new Kohana_Database_Exception('database.error', $this->link->error.' - '.$sql); - } - else - { - // Its an DELETE, INSERT, REPLACE, or UPDATE query - $this->insert_id = $this->link->insert_id; - $this->total_rows = $this->link->affected_rows; - } - } - - // Set result type - $this->result($object); - - // Store the SQL - $this->sql = $sql; - } - - /** - * Magic __destruct function, frees the result. - */ - public function __destruct() - { - if (is_object($this->result)) - { - $this->result->free_result(); - - // this is kinda useless, but needs to be done to avoid the "Commands out of sync; you - // can't run this command now" error. Basically, we get all results after the first one - // (the one we actually need) and free them. - if (is_resource($this->link) AND $this->link->more_results()) - { - do - { - if ($result = $this->link->store_result()) - { - $result->free_result(); - } - } while ($this->link->next_result()); - } - } - } - - public function result($object = TRUE, $type = MYSQLI_ASSOC) - { - $this->fetch_type = ((bool) $object) ? 'fetch_object' : 'fetch_array'; - - // This check has to be outside the previous statement, because we do not - // know the state of fetch_type when $object = NULL - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - if ($this->fetch_type == 'fetch_object') - { - $this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $this->return_type = $type; - } - - return $this; - } - - public function as_array($object = NULL, $type = MYSQLI_ASSOC) - { - return $this->result_array($object, $type); - } - - public function result_array($object = NULL, $type = MYSQLI_ASSOC) - { - $rows = array(); - - if (is_string($object)) - { - $fetch = $object; - } - elseif (is_bool($object)) - { - if ($object === TRUE) - { - $fetch = 'fetch_object'; - - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $fetch = 'fetch_array'; - } - } - else - { - // Use the default config values - $fetch = $this->fetch_type; - - if ($fetch == 'fetch_object') - { - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - } - - if ($this->result->num_rows) - { - // Reset the pointer location to make sure things work properly - $this->result->data_seek(0); - - while ($row = $this->result->$fetch($type)) - { - $rows[] = $row; - } - } - - return isset($rows) ? $rows : array(); - } - - public function list_fields() - { - $field_names = array(); - while ($field = $this->result->fetch_field()) - { - $field_names[] = $field->name; - } - - return $field_names; - } - - public function seek($offset) - { - if ($this->offsetExists($offset) AND $this->result->data_seek($offset)) - { - // Set the current row to the offset - $this->current_row = $offset; - - return TRUE; - } - - return FALSE; - } - - public function offsetGet($offset) - { - if ( ! $this->seek($offset)) - return FALSE; - - // Return the row - $fetch = $this->fetch_type; - return $this->result->$fetch($this->return_type); - } - -} // End Mysqli_Result Class - -/** - * MySQLi Prepared Statement (experimental) - */ -class Kohana_Mysqli_Statement { - - protected $link = NULL; - protected $stmt; - protected $var_names = array(); - protected $var_values = array(); - - public function __construct($sql, $link) - { - $this->link = $link; - - $this->stmt = $this->link->prepare($sql); - - return $this; - } - - public function __destruct() - { - $this->stmt->close(); - } - - // Sets the bind parameters - public function bind_params($param_types, $params) - { - $this->var_names = array_keys($params); - $this->var_values = array_values($params); - call_user_func_array(array($this->stmt, 'bind_param'), array_merge($param_types, $var_names)); - - return $this; - } - - public function bind_result($params) - { - call_user_func_array(array($this->stmt, 'bind_result'), $params); - } - - // Runs the statement - public function execute() - { - foreach ($this->var_names as $key => $name) - { - $$name = $this->var_values[$key]; - } - $this->stmt->execute(); - return $this->stmt; - } -} diff --git a/system/libraries/drivers/Database/Pdosqlite.php b/system/libraries/drivers/Database/Pdosqlite.php deleted file mode 100644 index c2d1bb21..00000000 --- a/system/libraries/drivers/Database/Pdosqlite.php +++ /dev/null @@ -1,486 +0,0 @@ - - */ - -class Database_Pdosqlite_Driver extends Database_Driver { - - // Database connection link - protected $link; - protected $db_config; - - /* - * Constructor: __construct - * Sets up the config for the class. - * - * Parameters: - * config - database configuration - * - */ - public function __construct($config) - { - $this->db_config = $config; - - Kohana::log('debug', 'PDO:Sqlite Database Driver Initialized'); - } - - public function connect() - { - // Import the connect variables - extract($this->db_config['connection']); - - try - { - $this->link = new PDO('sqlite:'.$socket.$database, $user, $pass, - array(PDO::ATTR_PERSISTENT => $this->db_config['persistent'])); - - $this->link->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL); - //$this->link->query('PRAGMA count_changes=1;'); - - if ($charset = $this->db_config['character_set']) - { - $this->set_charset($charset); - } - } - catch (PDOException $e) - { - throw new Kohana_Database_Exception('database.error', $e->getMessage()); - } - - // Clear password after successful connect - $this->db_config['connection']['pass'] = NULL; - - return $this->link; - } - - public function query($sql) - { - try - { - $sth = $this->link->prepare($sql); - } - catch (PDOException $e) - { - throw new Kohana_Database_Exception('database.error', $e->getMessage()); - } - return new Pdosqlite_Result($sth, $this->link, $this->db_config['object'], $sql); - } - - public function set_charset($charset) - { - $this->link->query('PRAGMA encoding = '.$this->escape_str($charset)); - } - - public function escape_table($table) - { - if ( ! $this->db_config['escape']) - return $table; - - return '`'.str_replace('.', '`.`', $table).'`'; - } - - public function escape_column($column) - { - if ( ! $this->db_config['escape']) - return $column; - - if ($column == '*') - return $column; - - // This matches any functions we support to SELECT. - if ( preg_match('/(avg|count|sum|max|min)\(\s*(.*)\s*\)(\s*as\s*(.+)?)?/i', $column, $matches)) - { - if ( count($matches) == 3) - { - return $matches[1].'('.$this->escape_column($matches[2]).')'; - } - else if ( count($matches) == 5) - { - return $matches[1].'('.$this->escape_column($matches[2]).') AS '.$this->escape_column($matches[2]); - } - } - - // This matches any modifiers we support to SELECT. - if ( ! preg_match('/\b(?:rand|all|distinct(?:row)?|high_priority|sql_(?:small_result|b(?:ig_result|uffer_result)|no_cache|ca(?:che|lc_found_rows)))\s/i', $column)) - { - if (stripos($column, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $column = str_ireplace(' AS ', ' AS ', $column); - - // Runs escape_column on both sides of an AS statement - $column = array_map(array($this, __FUNCTION__), explode(' AS ', $column)); - - // Re-create the AS statement - return implode(' AS ', $column); - } - - return preg_replace('/[^.*]+/', '`$0`', $column); - } - - $parts = explode(' ', $column); - $column = ''; - - for ($i = 0, $c = count($parts); $i < $c; $i++) - { - // The column is always last - if ($i == ($c - 1)) - { - $column .= preg_replace('/[^.*]+/', '`$0`', $parts[$i]); - } - else // otherwise, it's a modifier - { - $column .= $parts[$i].' '; - } - } - return $column; - } - - public function limit($limit, $offset = 0) - { - return 'LIMIT '.$offset.', '.$limit; - } - - public function compile_select($database) - { - $sql = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT '; - $sql .= (count($database['select']) > 0) ? implode(', ', $database['select']) : '*'; - - if (count($database['from']) > 0) - { - $sql .= "\nFROM "; - $sql .= implode(', ', $database['from']); - } - - if (count($database['join']) > 0) - { - foreach($database['join'] AS $join) - { - $sql .= "\n".$join['type'].'JOIN '.implode(', ', $join['tables']).' ON '.$join['conditions']; - } - } - - if (count($database['where']) > 0) - { - $sql .= "\nWHERE "; - } - - $sql .= implode("\n", $database['where']); - - if (count($database['groupby']) > 0) - { - $sql .= "\nGROUP BY "; - $sql .= implode(', ', $database['groupby']); - } - - if (count($database['having']) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $database['having']); - } - - if (count($database['orderby']) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $database['orderby']); - } - - if (is_numeric($database['limit'])) - { - $sql .= "\n"; - $sql .= $this->limit($database['limit'], $database['offset']); - } - - return $sql; - } - - public function escape_str($str) - { - if ( ! $this->db_config['escape']) - return $str; - - if (function_exists('sqlite_escape_string')) - { - $res = sqlite_escape_string($str); - } - else - { - $res = str_replace("'", "''", $str); - } - return $res; - } - - public function list_tables() - { - $sql = "SELECT `name` FROM `sqlite_master` WHERE `type`='table' ORDER BY `name`;"; - try - { - $result = $this->query($sql)->result(FALSE, PDO::FETCH_ASSOC); - $tables = array(); - foreach ($result as $row) - { - $tables[] = current($row); - } - } - catch (PDOException $e) - { - throw new Kohana_Database_Exception('database.error', $e->getMessage()); - } - return $tables; - } - - public function show_error() - { - $err = $this->link->errorInfo(); - return isset($err[2]) ? $err[2] : 'Unknown error!'; - } - - public function list_fields($table, $query = FALSE) - { - static $tables; - if (is_object($query)) - { - if (empty($tables[$table])) - { - $tables[$table] = array(); - - foreach ($query->result() as $row) - { - $tables[$table][] = $row->name; - } - } - - return $tables[$table]; - } - else - { - $result = $this->link->query( 'PRAGMA table_info('.$this->escape_table($table).')' ); - - foreach ($result as $row) - { - $tables[$table][$row['name']] = $this->sql_type($row['type']); - } - - return $tables[$table]; - } - } - - public function field_data($table) - { - Kohana::log('error', 'This method is under developing'); - } - /** - * Version number query string - * - * @access public - * @return string - */ - function version() - { - return $this->link->getAttribute(constant("PDO::ATTR_SERVER_VERSION")); - } - -} // End Database_PdoSqlite_Driver Class - -/* - * PDO-sqlite Result - */ -class Pdosqlite_Result extends Database_Result { - - // Data fetching types - protected $fetch_type = PDO::FETCH_OBJ; - protected $return_type = PDO::FETCH_ASSOC; - - /** - * Sets up the result variables. - * - * @param resource query result - * @param resource database link - * @param boolean return objects or arrays - * @param string SQL query that was run - */ - public function __construct($result, $link, $object = TRUE, $sql) - { - if (is_object($result) OR $result = $link->prepare($sql)) - { - // run the query. Return true if success, false otherwise - if( ! $result->execute()) - { - // Throw Kohana Exception with error message. See PDOStatement errorInfo() method - $arr_infos = $result->errorInfo(); - throw new Kohana_Database_Exception('database.error', $arr_infos[2]); - } - - if (preg_match('/^SELECT|PRAGMA|EXPLAIN/i', $sql)) - { - $this->result = $result; - $this->current_row = 0; - - $this->total_rows = $this->sqlite_row_count(); - - $this->fetch_type = ($object === TRUE) ? PDO::FETCH_OBJ : PDO::FETCH_ASSOC; - } - elseif (preg_match('/^DELETE|INSERT|UPDATE/i', $sql)) - { - $this->insert_id = $link->lastInsertId(); - - $this->total_rows = $result->rowCount(); - } - } - else - { - // SQL error - throw new Kohana_Database_Exception('database.error', $link->errorInfo().' - '.$sql); - } - - // Set result type - $this->result($object); - - // Store the SQL - $this->sql = $sql; - } - - private function sqlite_row_count() - { - $count = 0; - while ($this->result->fetch()) - { - $count++; - } - - // The query must be re-fetched now. - $this->result->execute(); - - return $count; - } - - /* - * Destructor: __destruct - * Magic __destruct function, frees the result. - */ - public function __destruct() - { - if (is_object($this->result)) - { - $this->result->closeCursor(); - $this->result = NULL; - } - } - - public function result($object = TRUE, $type = PDO::FETCH_BOTH) - { - $this->fetch_type = (bool) $object ? PDO::FETCH_OBJ : PDO::FETCH_BOTH; - - if ($this->fetch_type == PDO::FETCH_OBJ) - { - $this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $this->return_type = $type; - } - - return $this; - } - - public function as_array($object = NULL, $type = PDO::FETCH_ASSOC) - { - return $this->result_array($object, $type); - } - - public function result_array($object = NULL, $type = PDO::FETCH_ASSOC) - { - $rows = array(); - - if (is_string($object)) - { - $fetch = $object; - } - elseif (is_bool($object)) - { - if ($object === TRUE) - { - $fetch = PDO::FETCH_OBJ; - - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $fetch = PDO::FETCH_OBJ; - } - } - else - { - // Use the default config values - $fetch = $this->fetch_type; - - if ($fetch == PDO::FETCH_OBJ) - { - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - } - try - { - while ($row = $this->result->fetch($fetch)) - { - $rows[] = $row; - } - } - catch(PDOException $e) - { - throw new Kohana_Database_Exception('database.error', $e->getMessage()); - return FALSE; - } - return $rows; - } - - public function list_fields() - { - $field_names = array(); - for ($i = 0, $max = $this->result->columnCount(); $i < $max; $i++) - { - $info = $this->result->getColumnMeta($i); - $field_names[] = $info['name']; - } - return $field_names; - } - - public function seek($offset) - { - // To request a scrollable cursor for your PDOStatement object, you must - // set the PDO::ATTR_CURSOR attribute to PDO::CURSOR_SCROLL when you - // prepare the statement. - Kohana::log('error', get_class($this).' does not support scrollable cursors, '.__FUNCTION__.' call ignored'); - - return FALSE; - } - - public function offsetGet($offset) - { - try - { - return $this->result->fetch($this->fetch_type, PDO::FETCH_ORI_ABS, $offset); - } - catch(PDOException $e) - { - throw new Kohana_Database_Exception('database.error', $e->getMessage()); - } - } - - public function rewind() - { - // Same problem that seek() has, see above. - return $this->seek(0); - } - -} // End PdoSqlite_Result Class \ No newline at end of file diff --git a/system/libraries/drivers/Database/Pgsql.php b/system/libraries/drivers/Database/Pgsql.php deleted file mode 100644 index c53c8439..00000000 --- a/system/libraries/drivers/Database/Pgsql.php +++ /dev/null @@ -1,538 +0,0 @@ -db_config = $config; - - Kohana::log('debug', 'PgSQL Database Driver Initialized'); - } - - public function connect() - { - // Check if link already exists - if (is_resource($this->link)) - return $this->link; - - // Import the connect variables - extract($this->db_config['connection']); - - // Persistent connections enabled? - $connect = ($this->db_config['persistent'] == TRUE) ? 'pg_pconnect' : 'pg_connect'; - - // Build the connection info - $port = isset($port) ? 'port=\''.$port.'\'' : ''; - $host = isset($host) ? 'host=\''.$host.'\' '.$port : ''; // if no host, connect with the socket - - $connection_string = $host.' dbname=\''.$database.'\' user=\''.$user.'\' password=\''.$pass.'\''; - // Make the connection and select the database - if ($this->link = $connect($connection_string)) - { - if ($charset = $this->db_config['character_set']) - { - echo $this->set_charset($charset); - } - - // Clear password after successful connect - $this->db_config['connection']['pass'] = NULL; - - return $this->link; - } - - return FALSE; - } - - public function query($sql) - { - // Only cache if it's turned on, and only cache if it's not a write statement - if ($this->db_config['cache'] AND ! preg_match('#\b(?:INSERT|UPDATE|SET)\b#i', $sql)) - { - $hash = $this->query_hash($sql); - - if ( ! isset($this->query_cache[$hash])) - { - // Set the cached object - $this->query_cache[$hash] = new Pgsql_Result(pg_query($this->link, $sql), $this->link, $this->db_config['object'], $sql); - } - else - { - // Rewind cached result - $this->query_cache[$hash]->rewind(); - } - - return $this->query_cache[$hash]; - } - - // Suppress warning triggered when a database error occurs (e.g., a constraint violation) - return new Pgsql_Result(@pg_query($this->link, $sql), $this->link, $this->db_config['object'], $sql); - } - - public function set_charset($charset) - { - $this->query('SET client_encoding TO '.pg_escape_string($this->link, $charset)); - } - - public function escape_table($table) - { - if (!$this->db_config['escape']) - return $table; - - return '"'.str_replace('.', '"."', $table).'"'; - } - - public function escape_column($column) - { - if (!$this->db_config['escape']) - return $column; - - if ($column == '*') - return $column; - - // This matches any functions we support to SELECT. - if ( preg_match('/(avg|count|sum|max|min)\(\s*(.*)\s*\)(\s*as\s*(.+)?)?/i', $column, $matches)) - { - if ( count($matches) == 3) - { - return $matches[1].'('.$this->escape_column($matches[2]).')'; - } - else if ( count($matches) == 5) - { - return $matches[1].'('.$this->escape_column($matches[2]).') AS '.$this->escape_column($matches[2]); - } - } - - // This matches any modifiers we support to SELECT. - if ( ! preg_match('/\b(?:all|distinct)\s/i', $column)) - { - if (stripos($column, ' AS ') !== FALSE) - { - // Force 'AS' to uppercase - $column = str_ireplace(' AS ', ' AS ', $column); - - // Runs escape_column on both sides of an AS statement - $column = array_map(array($this, __FUNCTION__), explode(' AS ', $column)); - - // Re-create the AS statement - return implode(' AS ', $column); - } - - return preg_replace('/[^.*]+/', '"$0"', $column); - } - - $parts = explode(' ', $column); - $column = ''; - - for ($i = 0, $c = count($parts); $i < $c; $i++) - { - // The column is always last - if ($i == ($c - 1)) - { - $column .= preg_replace('/[^.*]+/', '"$0"', $parts[$i]); - } - else // otherwise, it's a modifier - { - $column .= $parts[$i].' '; - } - } - return $column; - } - - public function regex($field, $match, $type, $num_regexs) - { - $prefix = ($num_regexs == 0) ? '' : $type; - - return $prefix.' '.$this->escape_column($field).' ~* \''.$this->escape_str($match).'\''; - } - - public function notregex($field, $match, $type, $num_regexs) - { - $prefix = $num_regexs == 0 ? '' : $type; - - return $prefix.' '.$this->escape_column($field).' !~* \''.$this->escape_str($match) . '\''; - } - - public function limit($limit, $offset = 0) - { - return 'LIMIT '.$limit.' OFFSET '.$offset; - } - - public function compile_select($database) - { - $sql = ($database['distinct'] == TRUE) ? 'SELECT DISTINCT ' : 'SELECT '; - $sql .= (count($database['select']) > 0) ? implode(', ', $database['select']) : '*'; - - if (count($database['from']) > 0) - { - $sql .= "\nFROM "; - $sql .= implode(', ', $database['from']); - } - - if (count($database['join']) > 0) - { - foreach($database['join'] AS $join) - { - $sql .= "\n".$join['type'].'JOIN '.implode(', ', $join['tables']).' ON '.$join['conditions']; - } - } - - if (count($database['where']) > 0) - { - $sql .= "\nWHERE "; - } - - $sql .= implode("\n", $database['where']); - - if (count($database['groupby']) > 0) - { - $sql .= "\nGROUP BY "; - $sql .= implode(', ', $database['groupby']); - } - - if (count($database['having']) > 0) - { - $sql .= "\nHAVING "; - $sql .= implode("\n", $database['having']); - } - - if (count($database['orderby']) > 0) - { - $sql .= "\nORDER BY "; - $sql .= implode(', ', $database['orderby']); - } - - if (is_numeric($database['limit'])) - { - $sql .= "\n"; - $sql .= $this->limit($database['limit'], $database['offset']); - } - - return $sql; - } - - public function escape_str($str) - { - if (!$this->db_config['escape']) - return $str; - - is_resource($this->link) or $this->connect(); - - return pg_escape_string($this->link, $str); - } - - public function list_tables() - { - $sql = 'SELECT table_schema || \'.\' || table_name FROM information_schema.tables WHERE table_schema NOT IN (\'pg_catalog\', \'information_schema\')'; - $result = $this->query($sql)->result(FALSE, PGSQL_ASSOC); - - $retval = array(); - foreach ($result as $row) - { - $retval[] = current($row); - } - - return $retval; - } - - public function show_error() - { - return pg_last_error($this->link); - } - - public function list_fields($table) - { - $result = NULL; - - foreach ($this->field_data($table) as $row) - { - // Make an associative array - $result[$row->column_name] = $this->sql_type($row->data_type); - - if (!strncmp($row->column_default, 'nextval(', 8)) - { - $result[$row->column_name]['sequenced'] = TRUE; - } - - if ($row->is_nullable === 'YES') - { - $result[$row->column_name]['null'] = TRUE; - } - } - - if (!isset($result)) - throw new Kohana_Database_Exception('database.table_not_found', $table); - - return $result; - } - - public function field_data($table) - { - // http://www.postgresql.org/docs/8.3/static/infoschema-columns.html - $result = $this->query(' - SELECT column_name, column_default, is_nullable, data_type, udt_name, - character_maximum_length, numeric_precision, numeric_precision_radix, numeric_scale - FROM information_schema.columns - WHERE table_name = \''. $this->escape_str($table) .'\' - ORDER BY ordinal_position - '); - - return $result->result_array(TRUE); - } - -} // End Database_Pgsql_Driver Class - -/** - * PostgreSQL Result - */ -class Pgsql_Result extends Database_Result { - - // Data fetching types - protected $fetch_type = 'pgsql_fetch_object'; - protected $return_type = PGSQL_ASSOC; - - /** - * Sets up the result variables. - * - * @param resource query result - * @param resource database link - * @param boolean return objects or arrays - * @param string SQL query that was run - */ - public function __construct($result, $link, $object = TRUE, $sql) - { - $this->link = $link; - $this->result = $result; - - // If the query is a resource, it was a SELECT, SHOW, DESCRIBE, EXPLAIN query - if (is_resource($result)) - { - // Its an DELETE, INSERT, REPLACE, or UPDATE query - if (preg_match('/^(?:delete|insert|replace|update)\b/iD', trim($sql), $matches)) - { - $this->insert_id = (strtolower($matches[0]) == 'insert') ? $this->insert_id() : FALSE; - $this->total_rows = pg_affected_rows($this->result); - } - else - { - $this->current_row = 0; - $this->total_rows = pg_num_rows($this->result); - $this->fetch_type = ($object === TRUE) ? 'pg_fetch_object' : 'pg_fetch_array'; - } - } - else - { - throw new Kohana_Database_Exception('database.error', pg_last_error().' - '.$sql); - } - - // Set result type - $this->result($object); - - // Store the SQL - $this->sql = $sql; - } - - /** - * Magic __destruct function, frees the result. - */ - public function __destruct() - { - if (is_resource($this->result)) - { - pg_free_result($this->result); - } - } - - public function result($object = TRUE, $type = PGSQL_ASSOC) - { - $this->fetch_type = ((bool) $object) ? 'pg_fetch_object' : 'pg_fetch_array'; - - // This check has to be outside the previous statement, because we do not - // know the state of fetch_type when $object = NULL - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - if ($this->fetch_type == 'pg_fetch_object') - { - $this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $this->return_type = $type; - } - - return $this; - } - - public function as_array($object = NULL, $type = PGSQL_ASSOC) - { - return $this->result_array($object, $type); - } - - public function result_array($object = NULL, $type = PGSQL_ASSOC) - { - $rows = array(); - - if (is_string($object)) - { - $fetch = $object; - } - elseif (is_bool($object)) - { - if ($object === TRUE) - { - $fetch = 'pg_fetch_object'; - - // NOTE - The class set by $type must be defined before fetching the result, - // autoloading is disabled to save a lot of stupid overhead. - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - else - { - $fetch = 'pg_fetch_array'; - } - } - else - { - // Use the default config values - $fetch = $this->fetch_type; - - if ($fetch == 'pg_fetch_object') - { - $type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass'; - } - } - - if ($this->total_rows) - { - pg_result_seek($this->result, 0); - - while ($row = $fetch($this->result, NULL, $type)) - { - $rows[] = $row; - } - } - - return $rows; - } - - public function insert_id() - { - if ($this->insert_id === NULL) - { - $query = 'SELECT LASTVAL() AS insert_id'; - - // Disable error reporting for this, just to silence errors on - // tables that have no serial column. - $ER = error_reporting(0); - - $result = pg_query($this->link, $query); - $insert_id = pg_fetch_array($result, NULL, PGSQL_ASSOC); - - $this->insert_id = $insert_id['insert_id']; - - // Reset error reporting - error_reporting($ER); - } - - return $this->insert_id; - } - - public function seek($offset) - { - if ($this->offsetExists($offset) AND pg_result_seek($this->result, $offset)) - { - // Set the current row to the offset - $this->current_row = $offset; - - return TRUE; - } - - return FALSE; - } - - public function list_fields() - { - $field_names = array(); - - $fields = pg_num_fields($this->result); - for ($i = 0; $i < $fields; ++$i) - { - $field_names[] = pg_field_name($this->result, $i); - } - - return $field_names; - } - - /** - * ArrayAccess: offsetGet - */ - public function offsetGet($offset) - { - if ( ! $this->seek($offset)) - return FALSE; - - // Return the row by calling the defined fetching callback - $fetch = $this->fetch_type; - return $fetch($this->result, NULL, $this->return_type); - } - -} // End Pgsql_Result Class - -/** - * PostgreSQL Prepared Statement (experimental) - */ -class Kohana_Pgsql_Statement { - - protected $link = NULL; - protected $stmt; - - public function __construct($sql, $link) - { - $this->link = $link; - - $this->stmt = $this->link->prepare($sql); - - return $this; - } - - public function __destruct() - { - $this->stmt->close(); - } - - // Sets the bind parameters - public function bind_params() - { - $argv = func_get_args(); - return $this; - } - - // sets the statement values to the bound parameters - public function set_vals() - { - return $this; - } - - // Runs the statement - public function execute() - { - return $this; - } -} diff --git a/system/libraries/drivers/Image.php b/system/libraries/drivers/Image.php index f89ba953..39936c30 100644 --- a/system/libraries/drivers/Image.php +++ b/system/libraries/drivers/Image.php @@ -2,12 +2,12 @@ /** * Image API driver. * - * $Id: Image.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: Image.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Image * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ abstract class Image_Driver { @@ -102,9 +102,11 @@ abstract class Image_Driver { * @param array actions to execute * @param string destination directory path * @param string destination filename + * @param boolean render the image + * @param string background color * @return boolean */ - abstract public function process($image, $actions, $dir, $file); + abstract public function process($image, $actions, $dir, $file, $render = FALSE, $background = NULL); /** * Flip an image. Valid directions are horizontal and vertical. diff --git a/system/libraries/drivers/Image/GD.php b/system/libraries/drivers/Image/GD.php index be2af4e2..6ffffe8a 100644 --- a/system/libraries/drivers/Image/GD.php +++ b/system/libraries/drivers/Image/GD.php @@ -2,12 +2,12 @@ /** * GD Image Driver. * - * $Id: GD.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: GD.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Image * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Image_GD_Driver extends Image_Driver { @@ -20,17 +20,17 @@ class Image_GD_Driver extends Image_Driver { { // Make sure that GD2 is available if ( ! function_exists('gd_info')) - throw new Kohana_Exception('image.gd.requires_v2'); + throw new Kohana_Exception('The Image library requires GD2. Please see http://php.net/gd_info for more information.'); // Get the GD information $info = gd_info(); // Make sure that the GD2 is installed if (strpos($info['GD Version'], '2.') === FALSE) - throw new Kohana_Exception('image.gd.requires_v2'); + throw new Kohana_Exception('The Image library requires GD2. Please see http://php.net/gd_info for more information.'); } - public function process($image, $actions, $dir, $file, $render = FALSE) + public function process($image, $actions, $dir, $file, $render = FALSE, $background = NULL) { // Set the "create" function switch ($image['type']) @@ -63,11 +63,11 @@ class Image_GD_Driver extends Image_Driver { // Make sure the image type is supported for import if (empty($create) OR ! function_exists($create)) - throw new Kohana_Exception('image.type_not_allowed', $image['file']); + throw new Kohana_Exception('The specified image, :type:, is not an allowed image type.', array(':type:' => $image['file'])); // Make sure the image type is supported for saving if (empty($save) OR ! function_exists($save)) - throw new Kohana_Exception('image.type_not_allowed', $dir.$file); + throw new Kohana_Exception('The specified image, :type:, is not an allowed image type.', array(':type:' => $dir.$file)); // Load the image $this->image = $image; @@ -211,11 +211,11 @@ class Image_GD_Driver extends Image_Driver { // Recalculate the percentage to a pixel size $properties['height'] = round($height * (substr($properties['height'], 0, -1) / 100)); } - + // Recalculate the width and height, if they are missing empty($properties['width']) and $properties['width'] = round($width * $properties['height'] / $height); empty($properties['height']) and $properties['height'] = round($height * $properties['width'] / $width); - + if ($properties['master'] === Image::AUTO) { // Change an automatic master dim to the correct type @@ -314,7 +314,7 @@ class Image_GD_Driver extends Image_Driver { { // Make sure that the sharpening function is available if ( ! function_exists('imageconvolution')) - throw new Kohana_Exception('image.unsupported_method', __FUNCTION__); + throw new Kohana_Exception('Your configured driver does not support the :method: image transformation.', array(':method:' => __FUNCTION__)); // Amount should be in the range of 18-10 $amount = round(abs(-18 + ($amount * 0.08)), 2); @@ -336,23 +336,52 @@ class Image_GD_Driver extends Image_Driver { switch($properties['mime']) { case "image/jpeg": - $overlay_img = imagecreatefromjpeg($properties['overlay_file']); + $overlay_img = imagecreatefromjpeg($properties['overlay_file']); break; case "image/gif": - $overlay_img = imagecreatefromgif($properties['overlay_file']); + $overlay_img = imagecreatefromgif($properties['overlay_file']); break; case "image/png": - $overlay_img = imagecreatefrompng($properties['overlay_file']); + $overlay_img = imagecreatefrompng($properties['overlay_file']); break; } - imagecopymerge($this->tmp_image, $overlay_img, $properties['x'], $properties['y'], 0, 0, imagesx($overlay_img), imagesy($overlay_img), $properties['transparency']); + $this->imagecopymerge_alpha($this->tmp_image, $overlay_img, $properties['x'], $properties['y'], 0, 0, imagesx($overlay_img), imagesy($overlay_img), $properties['transparency']); + imagedestroy($overlay_img); + return TRUE; } + /** + * A replacement for php's imagecopymerge() function that supports the alpha channel + * See php bug #23815: http://bugs.php.net/bug.php?id=23815 + * + * @param resource $dst_im Destination image link resource + * @param resource $src_im Source image link resource + * @param integer $dst_x x-coordinate of destination point + * @param integer $dst_y y-coordinate of destination point + * @param integer $src_x x-coordinate of source point + * @param integer $src_y y-coordinate of source point + * @param integer $src_w Source width + * @param integer $src_h Source height + * @param integer $pct Transparency percent (0 to 100) + */ + protected function imagecopymerge_alpha($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct) + { + // Create a new blank image the site of our source image + $cut = imagecreatetruecolor($src_w, $src_h); + + // Copy the blank image into the destination image where the source goes + imagecopy($cut, $dst_im, 0, 0, $dst_x, $dst_y, $src_w, $src_h); + + // Place the source image in the destination image + imagecopy($cut, $src_im, 0, 0, $src_x, $src_y, $src_w, $src_h); + imagecopymerge($dst_im, $cut, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct); + } + protected function properties() { return array(imagesx($this->tmp_image), imagesy($this->tmp_image)); @@ -368,6 +397,16 @@ class Image_GD_Driver extends Image_Driver { */ protected function imagecreatetransparent($width, $height) { + if ($width < 1) + { + $width = 1; + } + + if ($height < 1) + { + $height = 1; + } + if (self::$blank_png === NULL) { // Decode the blank PNG if it has not been done already diff --git a/system/libraries/drivers/Image/GraphicsMagick.php b/system/libraries/drivers/Image/GraphicsMagick.php index a8bc4d9b..89b40b41 100644 --- a/system/libraries/drivers/Image/GraphicsMagick.php +++ b/system/libraries/drivers/Image/GraphicsMagick.php @@ -4,8 +4,8 @@ * * @package Image * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Image_GraphicsMagick_Driver extends Image_Driver { @@ -31,7 +31,7 @@ class Image_GraphicsMagick_Driver extends Image_Driver { { // Attempt to locate GM by using "which" (only works for *nix!) if ( ! is_file($path = exec('which gm'))) - throw new Kohana_Exception('image.graphicsmagick.not_found'); + throw new Kohana_Exception('The GraphicsMagick directory specified does not contain a required program.'); $config['directory'] = dirname($path); } @@ -41,7 +41,7 @@ class Image_GraphicsMagick_Driver extends Image_Driver { // Check to make sure the provided path is correct if ( ! is_file(realpath($config['directory']).'/gm'.$this->ext)) - throw new Kohana_Exception('image.graphicsmagick.not_found', 'gm'.$this->ext); + throw new Kohana_Exception('The GraphicsMagick directory specified does not contain a required program, :gm:.', array(':gm:' => 'gm'.$this->ext)); // Set the installation directory @@ -52,8 +52,12 @@ class Image_GraphicsMagick_Driver extends Image_Driver { * Creates a temporary image and executes the given actions. By creating a * temporary copy of the image before manipulating it, this process is atomic. */ - public function process($image, $actions, $dir, $file, $render = FALSE) + public function process($image, $actions, $dir, $file, $render = FALSE, $background = NULL) { + // Need to implement $background support + if ($background !== NULL) + throw new Kohana_Exception('The GraphicsMagick driver does not support setting a background color'); + // We only need the filename $image = $image['file']; diff --git a/system/libraries/drivers/Image/ImageMagick.php b/system/libraries/drivers/Image/ImageMagick.php index 4b381fd6..31862f75 100644 --- a/system/libraries/drivers/Image/ImageMagick.php +++ b/system/libraries/drivers/Image/ImageMagick.php @@ -2,12 +2,12 @@ /** * ImageMagick Image Driver. * - * $Id: ImageMagick.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: ImageMagick.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Image * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Image_ImageMagick_Driver extends Image_Driver { @@ -33,7 +33,7 @@ class Image_ImageMagick_Driver extends Image_Driver { { // Attempt to locate IM by using "which" (only works for *nix!) if ( ! is_file($path = exec('which convert'))) - throw new Kohana_Exception('image.imagemagick.not_found'); + throw new Kohana_Exception('The ImageMagick directory specified does not contain a required program.'); $config['directory'] = dirname($path); } @@ -43,7 +43,7 @@ class Image_ImageMagick_Driver extends Image_Driver { // Check to make sure the provided path is correct if ( ! is_file(realpath($config['directory']).'/convert'.$this->ext)) - throw new Kohana_Exception('image.imagemagick.not_found', 'convert'.$this->ext); + throw new Kohana_Exception('The ImageMagick directory specified does not contain a required program, :im:', array(':im:' => 'convert'.$this->ext)); // Set the installation directory $this->dir = str_replace('\\', '/', realpath($config['directory'])).'/'; @@ -53,7 +53,7 @@ class Image_ImageMagick_Driver extends Image_Driver { * Creates a temporary image and executes the given actions. By creating a * temporary copy of the image before manipulating it, this process is atomic. */ - public function process($image, $actions, $dir, $file, $render = FALSE) + public function process($image, $actions, $dir, $file, $render = FALSE, $background = NULL) { // We only need the filename $image = $image['file']; @@ -70,23 +70,34 @@ class Image_ImageMagick_Driver extends Image_Driver { // Use 95 for the default quality empty($quality) and $quality = 95; + if (is_string($background)) + { + // Set the background color + $this->background = escapeshellarg($background); + } + else + { + // Use a transparent background + $this->background = 'transparent'; + } + // All calls to these will need to be escaped, so do it now $this->cmd_image = escapeshellarg($this->tmp_image); - $this->new_image = ($render)? $this->cmd_image : escapeshellarg($dir.$file); + $this->new_image = $render ? $this->cmd_image : escapeshellarg($dir.$file); if ($status = $this->execute($actions)) { // Use convert to change the image into its final version. This is // done to allow the file type to change correctly, and to handle // the quality conversion in the most effective way possible. - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -quality '.$quality.'% '.$this->cmd_image.' '.$this->new_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten -quality '.$quality.'% '.$this->cmd_image.' '.$this->new_image)) { $this->errors[] = $error; } else { // Output the image directly to the browser - if ($render !== FALSE) + if ($render === TRUE) { $contents = file_get_contents($this->tmp_image); switch (substr($file, strrpos($file, '.') + 1)) @@ -122,7 +133,7 @@ class Image_ImageMagick_Driver extends Image_Driver { // Set the IM geometry based on the properties $geometry = escapeshellarg($prop['width'].'x'.$prop['height'].'+'.$prop['left'].'+'.$prop['top']); - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -crop '.$geometry.' '.$this->cmd_image.' '.$this->cmd_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten -crop '.$geometry.' '.$this->cmd_image.' '.$this->cmd_image)) { $this->errors[] = $error; return FALSE; @@ -136,7 +147,7 @@ class Image_ImageMagick_Driver extends Image_Driver { // Convert the direction into a IM command $dir = ($dir === Image::HORIZONTAL) ? '-flop' : '-flip'; - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' '.$dir.' '.$this->cmd_image.' '.$this->cmd_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten '.$dir.' '.$this->cmd_image.' '.$this->cmd_image)) { $this->errors[] = $error; return FALSE; @@ -164,7 +175,7 @@ class Image_ImageMagick_Driver extends Image_Driver { } // Use "convert" to change the width and height - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -resize '.$dim.' '.$this->cmd_image.' '.$this->cmd_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten -resize '.$dim.' '.$this->cmd_image.' '.$this->cmd_image)) { $this->errors[] = $error; return FALSE; @@ -175,7 +186,7 @@ class Image_ImageMagick_Driver extends Image_Driver { public function rotate($amt) { - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -rotate '.escapeshellarg($amt).' -background transparent '.$this->cmd_image.' '.$this->cmd_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten -rotate '.escapeshellarg($amt).' -background transparent '.$this->cmd_image.' '.$this->cmd_image)) { $this->errors[] = $error; return FALSE; @@ -195,7 +206,7 @@ class Image_ImageMagick_Driver extends Image_Driver { // Convert the amount to an IM command $sharpen = escapeshellarg($radius.'x'.$sigma.'+'.$amount.'+0'); - if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -unsharp '.$sharpen.' '.$this->cmd_image.' '.$this->cmd_image)) + if ($error = exec(escapeshellcmd($this->dir.'convert'.$this->ext).' -background '.$this->background.' -flatten -unsharp '.$sharpen.' '.$this->cmd_image.' '.$this->cmd_image)) { $this->errors[] = $error; return FALSE; diff --git a/system/libraries/drivers/Log.php b/system/libraries/drivers/Log.php new file mode 100644 index 00000000..cd6dba7d --- /dev/null +++ b/system/libraries/drivers/Log.php @@ -0,0 +1,22 @@ +config = $config; + } + + abstract public function save(array $messages); +} \ No newline at end of file diff --git a/system/libraries/drivers/Log/Database.php b/system/libraries/drivers/Log/Database.php new file mode 100644 index 00000000..19db9747 --- /dev/null +++ b/system/libraries/drivers/Log/Database.php @@ -0,0 +1,40 @@ +config['group']) + ->insert($this->config['table']) + ->columns(array('date', 'level', 'message')); + + $run_insert = FALSE; + + foreach ($messages AS $message) + { + if ($this->config['log_levels'][$message['type']] <= $this->config['log_threshold']) + { + // Add new message to database + $insert->values($message); + + // There is data to insert + $run_insert = TRUE; + } + } + + // Update the database + if ($run_insert) + { + $insert->execute(); + } + } +} \ No newline at end of file diff --git a/system/libraries/drivers/Log/File.php b/system/libraries/drivers/Log/File.php new file mode 100644 index 00000000..6ad565b4 --- /dev/null +++ b/system/libraries/drivers/Log/File.php @@ -0,0 +1,44 @@ +config['log_directory'].'/'.date('Y-m-d').'.log'.EXT; + + if ( ! is_file($filename)) + { + // Write the SYSPATH checking header + file_put_contents($filename, + ''.PHP_EOL.PHP_EOL); + + // Prevent external writes + chmod($filename, $this->config['posix_permissions']); + } + + foreach ($messages AS $message) + { + if ($this->config['log_levels'][$message['type']] <= $this->config['log_threshold']) + { + // Add a new message line + $messages_to_write[] = date($this->config['date_format'], $message['date']).' --- '.$message['type'].': '.$message['message']; + } + } + + if ( ! empty($messages_to_write)) + { + // Write messages to log file + file_put_contents($filename, implode(PHP_EOL, $messages_to_write).PHP_EOL, FILE_APPEND); + } + } +} \ No newline at end of file diff --git a/system/libraries/drivers/Log/Syslog.php b/system/libraries/drivers/Log/Syslog.php new file mode 100644 index 00000000..5da5d255 --- /dev/null +++ b/system/libraries/drivers/Log/Syslog.php @@ -0,0 +1,34 @@ + LOG_ERR, + 'alert' => LOG_WARNING, + 'info' => LOG_INFO, + 'debug' => LOG_DEBUG); + + public function save(array $messages) + { + // Open the connection to syslog + openlog($this->config['ident'], LOG_CONS, LOG_USER); + + do + { + // Load the next message + list ($date, $type, $text) = array_shift($messages); + + syslog($this->syslog_levels[$type], $text); + } + while ( ! empty($messages)); + + // Close connection to syslog + closelog(); + } +} \ No newline at end of file diff --git a/system/libraries/drivers/Session.php b/system/libraries/drivers/Session.php index fb58c8d3..759ccd84 100644 --- a/system/libraries/drivers/Session.php +++ b/system/libraries/drivers/Session.php @@ -2,12 +2,12 @@ /** * Session driver interface * - * $Id: Session.php 3769 2008-12-15 00:48:56Z zombor $ + * $Id: Session.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ interface Session_Driver { diff --git a/system/libraries/drivers/Session/Cache.php b/system/libraries/drivers/Session/Cache.php index 45e49495..c0d4d0a4 100644 --- a/system/libraries/drivers/Session/Cache.php +++ b/system/libraries/drivers/Session/Cache.php @@ -10,12 +10,12 @@ * Lifetime does not need to be set as it is * overridden by the session expiration setting. * - * $Id: Cache.php 4431 2009-07-01 03:41:41Z kiall $ + * $Id: Cache.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Session_Cache_Driver implements Session_Driver { @@ -30,7 +30,7 @@ class Session_Cache_Driver implements Session_Driver { $this->encrypt = new Encrypt; } - Kohana::log('debug', 'Session Cache Driver Initialized'); + Kohana_Log::add('debug', 'Session Cache Driver Initialized'); } public function open($path, $name) @@ -48,7 +48,7 @@ class Session_Cache_Driver implements Session_Driver { // Test the config group name if (($config = Kohana::config('cache.'.$config)) === NULL) - throw new Kohana_Exception('cache.undefined_group', $name); + throw new Kohana_Exception('The :group: group is not defined in your configuration.', array(':group:' => $name)); } $config['lifetime'] = (Kohana::config('session.expiration') == 0) ? 86400 : Kohana::config('session.expiration'); diff --git a/system/libraries/drivers/Session/Cookie.php b/system/libraries/drivers/Session/Cookie.php index 4cf18fc2..ef575cab 100644 --- a/system/libraries/drivers/Session/Cookie.php +++ b/system/libraries/drivers/Session/Cookie.php @@ -2,12 +2,12 @@ /** * Session cookie driver. * - * $Id: Cookie.php 4431 2009-07-01 03:41:41Z kiall $ + * $Id: Cookie.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Session_Cookie_Driver implements Session_Driver { @@ -23,7 +23,7 @@ class Session_Cookie_Driver implements Session_Driver { $this->encrypt = Encrypt::instance(); } - Kohana::log('debug', 'Session Cookie Driver Initialized'); + Kohana_Log::add('debug', 'Session Cookie Driver Initialized'); } public function open($path, $name) @@ -55,7 +55,7 @@ class Session_Cookie_Driver implements Session_Driver { if (strlen($data) > 4048) { - Kohana::log('error', 'Session ('.$id.') data exceeds the 4KB limit, ignoring write.'); + Kohana_Log::add('error', 'Session ('.$id.') data exceeds the 4KB limit, ignoring write.'); return FALSE; } diff --git a/system/libraries/drivers/Session/Database.php b/system/libraries/drivers/Session/Database.php index 490875a1..cbe76001 100644 --- a/system/libraries/drivers/Session/Database.php +++ b/system/libraries/drivers/Session/Database.php @@ -2,12 +2,12 @@ /** * Session database driver. * - * $Id: Database.php 4431 2009-07-01 03:41:41Z kiall $ + * $Id: Database.php 4679 2009-11-10 01:45:52Z isaiah $ * * @package Core * @author Kohana Team - * @copyright (c) 2007-2008 Kohana Team - * @license http://kohanaphp.com/license.html + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ class Session_Database_Driver implements Session_Driver { @@ -58,10 +58,7 @@ class Session_Database_Driver implements Session_Driver { } } - // Load database - $this->db = Database::instance($this->db); - - Kohana::log('debug', 'Session Database Driver Initialized'); + Kohana_Log::add('debug', 'Session Database Driver Initialized'); } public function open($path, $name) @@ -77,7 +74,11 @@ class Session_Database_Driver implements Session_Driver { public function read($id) { // Load the session - $query = $this->db->from($this->table)->where('session_id', $id)->limit(1)->get()->result(TRUE); + $query = db::select('data') + ->from($this->table) + ->where('session_id', '=', $id) + ->limit(1) + ->execute($this->db); if ($query->count() === 0) { @@ -111,7 +112,8 @@ class Session_Database_Driver implements Session_Driver { if ($this->session_id === NULL) { // Insert a new session - $query = $this->db->insert($this->table, $data); + $query = db::insert($this->table, $data) + ->execute($this->db); } elseif ($id === $this->session_id) { @@ -119,12 +121,18 @@ class Session_Database_Driver implements Session_Driver { unset($data['session_id']); // Update the existing session - $query = $this->db->update($this->table, $data, array('session_id' => $id)); + $query = db::update($this->table) + ->set($data) + ->where('session_id', '=', $id) + ->execute($this->db); } else { // Update the session and id - $query = $this->db->update($this->table, $data, array('session_id' => $this->session_id)); + $query = db::update($this->table) + ->set($data) + ->where('session_id', '=', $this->session_id) + ->execute($this->db); // Set the new session id $this->session_id = $id; @@ -136,7 +144,9 @@ class Session_Database_Driver implements Session_Driver { public function destroy($id) { // Delete the requested session - $this->db->delete($this->table, array('session_id' => $id)); + db::delete($this->table) + ->where('session_id', '=', $id) + ->execute($this->db); // Session id is no longer valid $this->session_id = NULL; @@ -156,9 +166,11 @@ class Session_Database_Driver implements Session_Driver { public function gc($maxlifetime) { // Delete all expired sessions - $query = $this->db->delete($this->table, array('last_activity <' => time() - $maxlifetime)); + $query = db::delete($this->table) + ->where('last_activity', '<', time() - $maxlifetime) + ->execute($this->db); - Kohana::log('debug', 'Session garbage collected: '.$query->count().' row(s) deleted.'); + Kohana_Log::add('debug', 'Session garbage collected: '.$query->count().' row(s) deleted.'); return TRUE; } diff --git a/system/messages/core.php b/system/messages/core.php new file mode 100644 index 00000000..4bf6ee8c --- /dev/null +++ b/system/messages/core.php @@ -0,0 +1,32 @@ + array + ( + E_KOHANA => __('Framework Error'), // __('Please check the Kohana documentation for information about the following error.'), + E_PAGE_NOT_FOUND => __('Page Not Found'), // __('The requested page was not found. It may have moved, been deleted, or archived.'), + E_DATABASE_ERROR => __('Database Error'), // __('A database error occurred while performing the requested procedure. Please review the database error below for more information.'), + E_RECOVERABLE_ERROR => __('Recoverable Error'), // __('An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'), + + E_ERROR => __('Fatal Error'), + E_COMPILE_ERROR => __('Fatal Error'), + E_CORE_ERROR => __('Fatal Error'), + E_USER_ERROR => __('Fatal Error'), + E_PARSE => __('Syntax Error'), + E_WARNING => __('Warning Message'), + E_COMPILE_WARNING => __('Warning Message'), + E_CORE_WARNING => __('Warning Message'), + E_USER_WARNING => __('Warning Message'), + E_STRICT => __('Strict Mode Error'), + E_NOTICE => __('Runtime Message'), + E_USER_NOTICE => __('Runtime Message'), + ), + 'config' => 'config file', + 'controller' => 'controller', + 'helper' => 'helper', + 'library' => 'library', + 'driver' => 'driver', + 'model' => 'model', + 'view' => 'view', +); \ No newline at end of file diff --git a/system/vendor/Markdown.php b/system/vendor/Markdown.php new file mode 100644 index 00000000..b649f6c1 --- /dev/null +++ b/system/vendor/Markdown.php @@ -0,0 +1,2909 @@ + +# +# Original Markdown +# Copyright (c) 2004-2006 John Gruber +# +# + + +define( 'MARKDOWN_VERSION', "1.0.1m" ); # Sat 21 Jun 2008 +define( 'MARKDOWNEXTRA_VERSION', "1.2.3" ); # Wed 31 Dec 2008 + + +# +# Global default settings: +# + +# Change to ">" for HTML output +@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />"); + +# Define the width of a tab for code blocks. +@define( 'MARKDOWN_TAB_WIDTH', 4 ); + +# Optional title attribute for footnote links and backlinks. +@define( 'MARKDOWN_FN_LINK_TITLE', "" ); +@define( 'MARKDOWN_FN_BACKLINK_TITLE', "" ); + +# Optional class attribute for footnote links and backlinks. +@define( 'MARKDOWN_FN_LINK_CLASS', "" ); +@define( 'MARKDOWN_FN_BACKLINK_CLASS', "" ); + + +# +# WordPress settings: +# + +# Change to false to remove Markdown from posts and/or comments. +@define( 'MARKDOWN_WP_POSTS', true ); +@define( 'MARKDOWN_WP_COMMENTS', true ); + + + +### Standard Function Interface ### + +@define( 'MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser' ); + +function Markdown($text) { +# +# Initialize the parser and return the result of its transform method. +# + # Setup static parser variable. + static $parser; + if (!isset($parser)) { + $parser_class = MARKDOWN_PARSER_CLASS; + $parser = new $parser_class; + } + + # Transform text using parser. + return $parser->transform($text); +} + + +### WordPress Plugin Interface ### + +/* +Plugin Name: Markdown Extra +Plugin URI: http://www.michelf.com/projects/php-markdown/ +Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... +Version: 1.2.2 +Author: Michel Fortin +Author URI: http://www.michelf.com/ +*/ + +if (isset($wp_version)) { + # More details about how it works here: + # + + # Post content and excerpts + # - Remove WordPress paragraph generator. + # - Run Markdown on excerpt, then remove all tags. + # - Add paragraph tag around the excerpt, but remove it for the excerpt rss. + if (MARKDOWN_WP_POSTS) { + remove_filter('the_content', 'wpautop'); + remove_filter('the_content_rss', 'wpautop'); + remove_filter('the_excerpt', 'wpautop'); + add_filter('the_content', 'mdwp_MarkdownPost', 6); + add_filter('the_content_rss', 'mdwp_MarkdownPost', 6); + add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6); + add_filter('get_the_excerpt', 'trim', 7); + add_filter('the_excerpt', 'mdwp_add_p'); + add_filter('the_excerpt_rss', 'mdwp_strip_p'); + + remove_filter('content_save_pre', 'balanceTags', 50); + remove_filter('excerpt_save_pre', 'balanceTags', 50); + add_filter('the_content', 'balanceTags', 50); + add_filter('get_the_excerpt', 'balanceTags', 9); + } + + # Add a footnote id prefix to posts when inside a loop. + function mdwp_MarkdownPost($text) { + static $parser; + if (!$parser) { + $parser_class = MARKDOWN_PARSER_CLASS; + $parser = new $parser_class; + } + if (is_single() || is_page() || is_feed()) { + $parser->fn_id_prefix = ""; + } else { + $parser->fn_id_prefix = get_the_ID() . "."; + } + return $parser->transform($text); + } + + # Comments + # - Remove WordPress paragraph generator. + # - Remove WordPress auto-link generator. + # - Scramble important tags before passing them to the kses filter. + # - Run Markdown on excerpt then remove paragraph tags. + if (MARKDOWN_WP_COMMENTS) { + remove_filter('comment_text', 'wpautop', 30); + remove_filter('comment_text', 'make_clickable'); + add_filter('pre_comment_content', 'Markdown', 6); + add_filter('pre_comment_content', 'mdwp_hide_tags', 8); + add_filter('pre_comment_content', 'mdwp_show_tags', 12); + add_filter('get_comment_text', 'Markdown', 6); + add_filter('get_comment_excerpt', 'Markdown', 6); + add_filter('get_comment_excerpt', 'mdwp_strip_p', 7); + + global $mdwp_hidden_tags, $mdwp_placeholders; + $mdwp_hidden_tags = explode(' ', + '
    • '); + $mdwp_placeholders = explode(' ', str_rot13( + 'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '. + 'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli')); + } + + function mdwp_add_p($text) { + if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) { + $text = '

    '.$text.'

    '; + $text = preg_replace('{\n{2,}}', "

    \n\n

    ", $text); + } + return $text; + } + + function mdwp_strip_p($t) { return preg_replace('{}i', '', $t); } + + function mdwp_hide_tags($text) { + global $mdwp_hidden_tags, $mdwp_placeholders; + return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text); + } + function mdwp_show_tags($text) { + global $mdwp_hidden_tags, $mdwp_placeholders; + return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text); + } +} + + +### bBlog Plugin Info ### + +function identify_modifier_markdown() { + return array( + 'name' => 'markdown', + 'type' => 'modifier', + 'nicename' => 'PHP Markdown Extra', + 'description' => 'A text-to-HTML conversion tool for web writers', + 'authors' => 'Michel Fortin and John Gruber', + 'licence' => 'GPL', + 'version' => MARKDOWNEXTRA_VERSION, + 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...', + ); +} + + +### Smarty Modifier Interface ### + +function smarty_modifier_markdown($text) { + return Markdown($text); +} + + +### Textile Compatibility Mode ### + +# Rename this file to "classTextile.php" and it can replace Textile everywhere. + +if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) { + # Try to include PHP SmartyPants. Should be in the same directory. + @include_once 'smartypants.php'; + # Fake Textile class. It calls Markdown instead. + class Textile { + function TextileThis($text, $lite='', $encode='') { + if ($lite == '' && $encode == '') $text = Markdown($text); + if (function_exists('SmartyPants')) $text = SmartyPants($text); + return $text; + } + # Fake restricted version: restrictions are not supported for now. + function TextileRestricted($text, $lite='', $noimage='') { + return $this->TextileThis($text, $lite); + } + # Workaround to ensure compatibility with TextPattern 4.0.3. + function blockLite($text) { return $text; } + } +} + + + +# +# Markdown Parser Class +# + +class Markdown_Parser { + + # Regex to match balanced [brackets]. + # Needed to insert a maximum bracked depth while converting to PHP. + var $nested_brackets_depth = 6; + var $nested_brackets_re; + + var $nested_url_parenthesis_depth = 4; + var $nested_url_parenthesis_re; + + # Table of hash values for escaped characters: + var $escape_chars = '\`*_{}[]()>#+-.!'; + var $escape_chars_re; + + # Change to ">" for HTML output. + var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX; + var $tab_width = MARKDOWN_TAB_WIDTH; + + # Change to `true` to disallow markup or entities. + var $no_markup = false; + var $no_entities = false; + + # Predefined urls and titles for reference links and images. + var $predef_urls = array(); + var $predef_titles = array(); + + + function Markdown_Parser() { + # + # Constructor function. Initialize appropriate member variables. + # + $this->_initDetab(); + $this->prepareItalicsAndBold(); + + $this->nested_brackets_re = + str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth). + str_repeat('\])*', $this->nested_brackets_depth); + + $this->nested_url_parenthesis_re = + str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth). + str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth); + + $this->escape_chars_re = '['.preg_quote($this->escape_chars).']'; + + # Sort document, block, and span gamut in ascendent priority order. + asort($this->document_gamut); + asort($this->block_gamut); + asort($this->span_gamut); + } + + + # Internal hashes used during transformation. + var $urls = array(); + var $titles = array(); + var $html_hashes = array(); + + # Status flag to avoid invalid nesting. + var $in_anchor = false; + + + function setup() { + # + # Called before the transformation process starts to setup parser + # states. + # + # Clear global hashes. + $this->urls = $this->predef_urls; + $this->titles = $this->predef_titles; + $this->html_hashes = array(); + + $in_anchor = false; + } + + function teardown() { + # + # Called after the transformation process to clear any variable + # which may be taking up memory unnecessarly. + # + $this->urls = array(); + $this->titles = array(); + $this->html_hashes = array(); + } + + + function transform($text) { + # + # Main function. Performs some preprocessing on the input text + # and pass it through the document gamut. + # + $this->setup(); + + # Remove UTF-8 BOM and marker character in input, if present. + $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text); + + # Standardize line endings: + # DOS to Unix and Mac to Unix + $text = preg_replace('{\r\n?}', "\n", $text); + + # Make sure $text ends with a couple of newlines: + $text .= "\n\n"; + + # Convert all tabs to spaces. + $text = $this->detab($text); + + # Turn block-level HTML blocks into hash entries + $text = $this->hashHTMLBlocks($text); + + # Strip any lines consisting only of spaces and tabs. + # This makes subsequent regexen easier to write, because we can + # match consecutive blank lines with /\n+/ instead of something + # contorted like /[ ]*\n+/ . + $text = preg_replace('/^[ ]+$/m', '', $text); + + # Run document gamut methods. + foreach ($this->document_gamut as $method => $priority) { + $text = $this->$method($text); + } + + $this->teardown(); + + return $text . "\n"; + } + + var $document_gamut = array( + # Strip link definitions, store in hashes. + "stripLinkDefinitions" => 20, + + "runBasicBlockGamut" => 30, + ); + + + function stripLinkDefinitions($text) { + # + # Strips link definitions from text, stores the URLs and titles in + # hash references. + # + $less_than_tab = $this->tab_width - 1; + + # Link defs are in the form: ^[id]: url "optional title" + $text = preg_replace_callback('{ + ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1 + [ ]* + \n? # maybe *one* newline + [ ]* + ? # url = $2 + [ ]* + \n? # maybe one newline + [ ]* + (?: + (?<=\s) # lookbehind for whitespace + ["(] + (.*?) # title = $3 + [")] + [ ]* + )? # title is optional + (?:\n+|\Z) + }xm', + array(&$this, '_stripLinkDefinitions_callback'), + $text); + return $text; + } + function _stripLinkDefinitions_callback($matches) { + $link_id = strtolower($matches[1]); + $this->urls[$link_id] = $matches[2]; + $this->titles[$link_id] =& $matches[3]; + return ''; # String that will replace the block + } + + + function hashHTMLBlocks($text) { + if ($this->no_markup) return $text; + + $less_than_tab = $this->tab_width - 1; + + # Hashify HTML blocks: + # We only want to do this for block-level HTML tags, such as headers, + # lists, and tables. That's because we still want to wrap

    s around + # "paragraphs" that are wrapped in non-block-level tags, such as anchors, + # phrase emphasis, and spans. The list of tags we're looking for is + # hard-coded: + # + # * List "a" is made of tags which can be both inline or block-level. + # These will be treated block-level when the start tag is alone on + # its line, otherwise they're not matched here and will be taken as + # inline later. + # * List "b" is made of tags which are always block-level; + # + $block_tags_a_re = 'ins|del'; + $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'. + 'script|noscript|form|fieldset|iframe|math'; + + # Regular expression for the content of a block tag. + $nested_tags_level = 4; + $attr = ' + (?> # optional tag attributes + \s # starts with whitespace + (?> + [^>"/]+ # text outside quotes + | + /+(?!>) # slash not followed by ">" + | + "[^"]*" # text inside double quotes (tolerate ">") + | + \'[^\']*\' # text inside single quotes (tolerate ">") + )* + )? + '; + $content = + str_repeat(' + (?> + [^<]+ # content without tag + | + <\2 # nested opening tag + '.$attr.' # attributes + (?> + /> + | + >', $nested_tags_level). # end of opening tag + '.*?'. # last level nested tag content + str_repeat(' + # closing nested tag + ) + | + <(?!/\2\s*> # other tags with a different name + ) + )*', + $nested_tags_level); + $content2 = str_replace('\2', '\3', $content); + + # First, look for nested blocks, e.g.: + #

    + #
    + # tags for inner block must be indented. + #
    + #
    + # + # The outermost tags must start at the left margin for this to match, and + # the inner nested divs must be indented. + # We need to do this before the next, more liberal match, because the next + # match will start at the first `
    ` and stop at the first `
    `. + $text = preg_replace_callback('{(?> + (?> + (?<=\n\n) # Starting after a blank line + | # or + \A\n? # the beginning of the doc + ) + ( # save in $1 + + # Match from `\n` to `\n`, handling nested tags + # in between. + + [ ]{0,'.$less_than_tab.'} + <('.$block_tags_b_re.')# start tag = $2 + '.$attr.'> # attributes followed by > and \n + '.$content.' # content, support nesting + # the matching end tag + [ ]* # trailing spaces/tabs + (?=\n+|\Z) # followed by a newline or end of document + + | # Special version for tags of group a. + + [ ]{0,'.$less_than_tab.'} + <('.$block_tags_a_re.')# start tag = $3 + '.$attr.'>[ ]*\n # attributes followed by > + '.$content2.' # content, support nesting + # the matching end tag + [ ]* # trailing spaces/tabs + (?=\n+|\Z) # followed by a newline or end of document + + | # Special case just for
    . It was easier to make a special + # case than to make the other regex more complicated. + + [ ]{0,'.$less_than_tab.'} + <(hr) # start tag = $2 + '.$attr.' # attributes + /?> # the matching end tag + [ ]* + (?=\n{2,}|\Z) # followed by a blank line or end of document + + | # Special case for standalone HTML comments: + + [ ]{0,'.$less_than_tab.'} + (?s: + + ) + [ ]* + (?=\n{2,}|\Z) # followed by a blank line or end of document + + | # PHP and ASP-style processor instructions ( + ) + [ ]* + (?=\n{2,}|\Z) # followed by a blank line or end of document + + ) + )}Sxmi', + array(&$this, '_hashHTMLBlocks_callback'), + $text); + + return $text; + } + function _hashHTMLBlocks_callback($matches) { + $text = $matches[1]; + $key = $this->hashBlock($text); + return "\n\n$key\n\n"; + } + + + function hashPart($text, $boundary = 'X') { + # + # Called whenever a tag must be hashed when a function insert an atomic + # element in the text stream. Passing $text to through this function gives + # a unique text-token which will be reverted back when calling unhash. + # + # The $boundary argument specify what character should be used to surround + # the token. By convension, "B" is used for block elements that needs not + # to be wrapped into paragraph tags at the end, ":" is used for elements + # that are word separators and "X" is used in the general case. + # + # Swap back any tag hash found in $text so we do not have to `unhash` + # multiple times at the end. + $text = $this->unhash($text); + + # Then hash the block. + static $i = 0; + $key = "$boundary\x1A" . ++$i . $boundary; + $this->html_hashes[$key] = $text; + return $key; # String that will replace the tag. + } + + + function hashBlock($text) { + # + # Shortcut function for hashPart with block-level boundaries. + # + return $this->hashPart($text, 'B'); + } + + + var $block_gamut = array( + # + # These are all the transformations that form block-level + # tags like paragraphs, headers, and list items. + # + "doHeaders" => 10, + "doHorizontalRules" => 20, + + "doLists" => 40, + "doCodeBlocks" => 50, + "doBlockQuotes" => 60, + ); + + function runBlockGamut($text) { + # + # Run block gamut tranformations. + # + # We need to escape raw HTML in Markdown source before doing anything + # else. This need to be done for each block, and not only at the + # begining in the Markdown function since hashed blocks can be part of + # list items and could have been indented. Indented blocks would have + # been seen as a code block in a previous pass of hashHTMLBlocks. + $text = $this->hashHTMLBlocks($text); + + return $this->runBasicBlockGamut($text); + } + + function runBasicBlockGamut($text) { + # + # Run block gamut tranformations, without hashing HTML blocks. This is + # useful when HTML blocks are known to be already hashed, like in the first + # whole-document pass. + # + foreach ($this->block_gamut as $method => $priority) { + $text = $this->$method($text); + } + + # Finally form paragraph and restore hashed blocks. + $text = $this->formParagraphs($text); + + return $text; + } + + + function doHorizontalRules($text) { + # Do Horizontal Rules: + return preg_replace( + '{ + ^[ ]{0,3} # Leading space + ([-*_]) # $1: First marker + (?> # Repeated marker group + [ ]{0,2} # Zero, one, or two spaces. + \1 # Marker character + ){2,} # Group repeated at least twice + [ ]* # Tailing spaces + $ # End of line. + }mx', + "\n".$this->hashBlock("empty_element_suffix")."\n", + $text); + } + + + var $span_gamut = array( + # + # These are all the transformations that occur *within* block-level + # tags like paragraphs, headers, and list items. + # + # Process character escapes, code spans, and inline HTML + # in one shot. + "parseSpan" => -30, + + # Process anchor and image tags. Images must come first, + # because ![foo][f] looks like an anchor. + "doImages" => 10, + "doAnchors" => 20, + + # Make links out of things like `` + # Must come after doAnchors, because you can use < and > + # delimiters in inline links like [this](). + "doAutoLinks" => 30, + "encodeAmpsAndAngles" => 40, + + "doItalicsAndBold" => 50, + "doHardBreaks" => 60, + ); + + function runSpanGamut($text) { + # + # Run span gamut tranformations. + # + foreach ($this->span_gamut as $method => $priority) { + $text = $this->$method($text); + } + + return $text; + } + + + function doHardBreaks($text) { + # Do hard breaks: + return preg_replace_callback('/ {2,}\n/', + array(&$this, '_doHardBreaks_callback'), $text); + } + function _doHardBreaks_callback($matches) { + return $this->hashPart("empty_element_suffix\n"); + } + + + function doAnchors($text) { + # + # Turn Markdown link shortcuts into XHTML tags. + # + if ($this->in_anchor) return $text; + $this->in_anchor = true; + + # + # First, handle reference-style links: [link text] [id] + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + \[ + ('.$this->nested_brackets_re.') # link text = $2 + \] + + [ ]? # one optional space + (?:\n[ ]*)? # one optional newline followed by spaces + + \[ + (.*?) # id = $3 + \] + ) + }xs', + array(&$this, '_doAnchors_reference_callback'), $text); + + # + # Next, inline-style links: [link text](url "optional title") + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + \[ + ('.$this->nested_brackets_re.') # link text = $2 + \] + \( # literal paren + [ ]* + (?: + <(\S*)> # href = $3 + | + ('.$this->nested_url_parenthesis_re.') # href = $4 + ) + [ ]* + ( # $5 + ([\'"]) # quote char = $6 + (.*?) # Title = $7 + \6 # matching quote + [ ]* # ignore any spaces/tabs between closing quote and ) + )? # title is optional + \) + ) + }xs', + array(&$this, '_DoAnchors_inline_callback'), $text); + + # + # Last, handle reference-style shortcuts: [link text] + # These must come last in case you've also got [link test][1] + # or [link test](/foo) + # +// $text = preg_replace_callback('{ +// ( # wrap whole match in $1 +// \[ +// ([^\[\]]+) # link text = $2; can\'t contain [ or ] +// \] +// ) +// }xs', +// array(&$this, '_doAnchors_reference_callback'), $text); + + $this->in_anchor = false; + return $text; + } + function _doAnchors_reference_callback($matches) { + $whole_match = $matches[1]; + $link_text = $matches[2]; + $link_id =& $matches[3]; + + if ($link_id == "") { + # for shortcut links like [this][] or [this]. + $link_id = $link_text; + } + + # lower-case and turn embedded newlines into spaces + $link_id = strtolower($link_id); + $link_id = preg_replace('{[ ]?\n}', ' ', $link_id); + + if (isset($this->urls[$link_id])) { + $url = $this->urls[$link_id]; + $url = $this->encodeAttribute($url); + + $result = "titles[$link_id] ) ) { + $title = $this->titles[$link_id]; + $title = $this->encodeAttribute($title); + $result .= " title=\"$title\""; + } + + $link_text = $this->runSpanGamut($link_text); + $result .= ">$link_text"; + $result = $this->hashPart($result); + } + else { + $result = $whole_match; + } + return $result; + } + function _doAnchors_inline_callback($matches) { + $whole_match = $matches[1]; + $link_text = $this->runSpanGamut($matches[2]); + $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $title =& $matches[7]; + + $url = $this->encodeAttribute($url); + + $result = "encodeAttribute($title); + $result .= " title=\"$title\""; + } + + $link_text = $this->runSpanGamut($link_text); + $result .= ">$link_text"; + + return $this->hashPart($result); + } + + + function doImages($text) { + # + # Turn Markdown image shortcuts into tags. + # + # + # First, handle reference-style labeled images: ![alt text][id] + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + !\[ + ('.$this->nested_brackets_re.') # alt text = $2 + \] + + [ ]? # one optional space + (?:\n[ ]*)? # one optional newline followed by spaces + + \[ + (.*?) # id = $3 + \] + + ) + }xs', + array(&$this, '_doImages_reference_callback'), $text); + + # + # Next, handle inline images: ![alt text](url "optional title") + # Don't forget: encode * and _ + # + $text = preg_replace_callback('{ + ( # wrap whole match in $1 + !\[ + ('.$this->nested_brackets_re.') # alt text = $2 + \] + \s? # One optional whitespace character + \( # literal paren + [ ]* + (?: + <(\S*)> # src url = $3 + | + ('.$this->nested_url_parenthesis_re.') # src url = $4 + ) + [ ]* + ( # $5 + ([\'"]) # quote char = $6 + (.*?) # title = $7 + \6 # matching quote + [ ]* + )? # title is optional + \) + ) + }xs', + array(&$this, '_doImages_inline_callback'), $text); + + return $text; + } + function _doImages_reference_callback($matches) { + $whole_match = $matches[1]; + $alt_text = $matches[2]; + $link_id = strtolower($matches[3]); + + if ($link_id == "") { + $link_id = strtolower($alt_text); # for shortcut links like ![this][]. + } + + $alt_text = $this->encodeAttribute($alt_text); + if (isset($this->urls[$link_id])) { + $url = $this->encodeAttribute($this->urls[$link_id]); + $result = "\"$alt_text\"";titles[$link_id])) { + $title = $this->titles[$link_id]; + $title = $this->encodeAttribute($title); + $result .= " title=\"$title\""; + } + $result .= $this->empty_element_suffix; + $result = $this->hashPart($result); + } + else { + # If there's no such link ID, leave intact: + $result = $whole_match; + } + + return $result; + } + function _doImages_inline_callback($matches) { + $whole_match = $matches[1]; + $alt_text = $matches[2]; + $url = $matches[3] == '' ? $matches[4] : $matches[3]; + $title =& $matches[7]; + + $alt_text = $this->encodeAttribute($alt_text); + $url = $this->encodeAttribute($url); + $result = "\"$alt_text\"";encodeAttribute($title); + $result .= " title=\"$title\""; # $title already quoted + } + $result .= $this->empty_element_suffix; + + return $this->hashPart($result); + } + + + function doHeaders($text) { + # Setext-style headers: + # Header 1 + # ======== + # + # Header 2 + # -------- + # + $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx', + array(&$this, '_doHeaders_callback_setext'), $text); + + # atx-style headers: + # # Header 1 + # ## Header 2 + # ## Header 2 with closing hashes ## + # ... + # ###### Header 6 + # + $text = preg_replace_callback('{ + ^(\#{1,6}) # $1 = string of #\'s + [ ]* + (.+?) # $2 = Header text + [ ]* + \#* # optional closing #\'s (not counted) + \n+ + }xm', + array(&$this, '_doHeaders_callback_atx'), $text); + + return $text; + } + function _doHeaders_callback_setext($matches) { + # Terrible hack to check we haven't found an empty list item. + if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) + return $matches[0]; + + $level = $matches[2]{0} == '=' ? 1 : 2; + $block = "".$this->runSpanGamut($matches[1]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + function _doHeaders_callback_atx($matches) { + $level = strlen($matches[1]); + $block = "".$this->runSpanGamut($matches[2]).""; + return "\n" . $this->hashBlock($block) . "\n\n"; + } + + + function doLists($text) { + # + # Form HTML ordered (numbered) and unordered (bulleted) lists. + # + $less_than_tab = $this->tab_width - 1; + + # Re-usable patterns to match list item bullets and number markers: + $marker_ul_re = '[*+-]'; + $marker_ol_re = '\d+[.]'; + $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)"; + + $markers_relist = array($marker_ul_re, $marker_ol_re); + + foreach ($markers_relist as $marker_re) { + # Re-usable pattern to match any entirel ul or ol list: + $whole_list_re = ' + ( # $1 = whole list + ( # $2 + [ ]{0,'.$less_than_tab.'} + ('.$marker_re.') # $3 = first list item marker + [ ]+ + ) + (?s:.+?) + ( # $4 + \z + | + \n{2,} + (?=\S) + (?! # Negative lookahead for another list item marker + [ ]* + '.$marker_re.'[ ]+ + ) + ) + ) + '; // mx + + # We use a different prefix before nested lists than top-level lists. + # See extended comment in _ProcessListItems(). + + if ($this->list_level) { + $text = preg_replace_callback('{ + ^ + '.$whole_list_re.' + }mx', + array(&$this, '_doLists_callback'), $text); + } + else { + $text = preg_replace_callback('{ + (?:(?<=\n)\n|\A\n?) # Must eat the newline + '.$whole_list_re.' + }mx', + array(&$this, '_doLists_callback'), $text); + } + } + + return $text; + } + function _doLists_callback($matches) { + # Re-usable patterns to match list item bullets and number markers: + $marker_ul_re = '[*+-]'; + $marker_ol_re = '\d+[.]'; + $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)"; + + $list = $matches[1]; + $list_type = preg_match("/$marker_ul_re/", $matches[3]) ? "ul" : "ol"; + + $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re ); + + $list .= "\n"; + $result = $this->processListItems($list, $marker_any_re); + + $result = $this->hashBlock("<$list_type>\n" . $result . ""); + return "\n". $result ."\n\n"; + } + + var $list_level = 0; + + function processListItems($list_str, $marker_any_re) { + # + # Process the contents of a single ordered or unordered list, splitting it + # into individual list items. + # + # The $this->list_level global keeps track of when we're inside a list. + # Each time we enter a list, we increment it; when we leave a list, + # we decrement. If it's zero, we're not in a list anymore. + # + # We do this because when we're not inside a list, we want to treat + # something like this: + # + # I recommend upgrading to version + # 8. Oops, now this line is treated + # as a sub-list. + # + # As a single paragraph, despite the fact that the second line starts + # with a digit-period-space sequence. + # + # Whereas when we're inside a list (or sub-list), that line will be + # treated as the start of a sub-list. What a kludge, huh? This is + # an aspect of Markdown's syntax that's hard to parse perfectly + # without resorting to mind-reading. Perhaps the solution is to + # change the syntax rules such that sub-lists must start with a + # starting cardinal number; e.g. "1." or "a.". + + $this->list_level++; + + # trim trailing blank lines: + $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str); + + $list_str = preg_replace_callback('{ + (\n)? # leading line = $1 + (^[ ]*) # leading whitespace = $2 + ('.$marker_any_re.' # list marker and space = $3 + (?:[ ]+|(?=\n)) # space only required if item is not empty + ) + ((?s:.*?)) # list item text = $4 + (?:(\n+(?=\n))|\n) # tailing blank line = $5 + (?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n)))) + }xm', + array(&$this, '_processListItems_callback'), $list_str); + + $this->list_level--; + return $list_str; + } + function _processListItems_callback($matches) { + $item = $matches[4]; + $leading_line =& $matches[1]; + $leading_space =& $matches[2]; + $marker_space = $matches[3]; + $tailing_blank_line =& $matches[5]; + + if ($leading_line || $tailing_blank_line || + preg_match('/\n{2,}/', $item)) + { + # Replace marker with the appropriate whitespace indentation + $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item; + $item = $this->runBlockGamut($this->outdent($item)."\n"); + } + else { + # Recursion for sub-lists: + $item = $this->doLists($this->outdent($item)); + $item = preg_replace('/\n+$/', '', $item); + $item = $this->runSpanGamut($item); + } + + return "
  • " . $item . "
    • \n"; + } + + + function doCodeBlocks($text) { + # + # Process Markdown `
    ` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A\n?)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?>
+					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array(&$this, '_doCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+		$codeblock = "
    $codeblock\n
    ";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+
+	function makeCodeSpan($code) {
+	#
+	# Create a code span markup for $code. Called from handleSpanToken.
+	#
+		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		return $this->hashPart("$code");
+	}
+
+
+	var $em_relist = array(
+		''  => '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(?em_relist as $em => $em_re) {
+			foreach ($this->strong_relist as $strong => $strong_re) {
+				# Construct list of allowed token expressions.
+				$token_relist = array();
+				if (isset($this->em_strong_relist["$em$strong"])) {
+					$token_relist[] = $this->em_strong_relist["$em$strong"];
+				}
+				$token_relist[] = $em_re;
+				$token_relist[] = $strong_re;
+				
+				# Construct master expression from list.
+				$token_re = '{('. implode('|', $token_relist) .')}';
+				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+			}
+		}
+	}
+	
+	function doItalicsAndBold($text) {
+		$token_stack = array('');
+		$text_stack = array('');
+		$em = '';
+		$strong = '';
+		$tree_char_em = false;
+		
+		while (1) {
+			#
+			# Get prepared regular expression for seraching emphasis tokens
+			# in current context.
+			#
+			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+			
+			#
+			# Each loop iteration seach for the next emphasis token. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			$text_stack[0] .= $parts[0];
+			$token =& $parts[1];
+			$text =& $parts[2];
+			
+			if (empty($token)) {
+				# Reached end of text span: empty stack without emitting.
+				# any more emphasis.
+				while ($token_stack[0]) {
+					$text_stack[1] .= array_shift($token_stack);
+					$text_stack[0] .= array_shift($text_stack);
+				}
+				break;
+			}
+			
+			$token_len = strlen($token);
+			if ($tree_char_em) {
+				# Reached closing marker while inside a three-char emphasis.
+				if ($token_len == 3) {
+					# Three-char closing marker, close em and strong.
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "$span";
+					$text_stack[0] .= $this->hashPart($span);
+					$em = '';
+					$strong = '';
+				} else {
+					# Other closing marker: close one em or strong and
+					# change current token state to match the other
+					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$tag = $token_len == 2 ? "strong" : "em";
+					$span = $text_stack[0];
+					$span = $this->runSpanGamut($span);
+					$span = "<$tag>$span";
+					$text_stack[0] = $this->hashPart($span);
+					$$tag = ''; # $$tag stands for $em or $strong
+				}
+				$tree_char_em = false;
+			} else if ($token_len == 3) {
+				if ($em) {
+					# Reached closing marker for both em and strong.
+					# Closing strong marker:
+					for ($i = 0; $i < 2; ++$i) {
+						$shifted_token = array_shift($token_stack);
+						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<$tag>$span";
+						$text_stack[0] .= $this->hashPart($span);
+						$$tag = ''; # $$tag stands for $em or $strong
+					}
+				} else {
+					# Reached opening three-char emphasis marker. Push on token 
+					# stack; will be handled by the special condition above.
+					$em = $token{0};
+					$strong = "$em$em";
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$tree_char_em = true;
+				}
+			} else if ($token_len == 2) {
+				if ($strong) {
+					# Unwind any dangling emphasis marker:
+					if (strlen($token_stack[0]) == 1) {
+						$text_stack[1] .= array_shift($token_stack);
+						$text_stack[0] .= array_shift($text_stack);
+					}
+					# Closing strong marker:
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "$span";
+					$text_stack[0] .= $this->hashPart($span);
+					$strong = '';
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$strong = $token;
+				}
+			} else {
+				# Here $token_len == 1
+				if ($em) {
+					if (strlen($token_stack[0]) == 1) {
+						# Closing emphasis marker:
+						array_shift($token_stack);
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "$span";
+						$text_stack[0] .= $this->hashPart($span);
+						$em = '';
+					} else {
+						$text_stack[0] .= $token;
+					}
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$em = $token;
+				}
+			}
+		}
+		return $text_stack[0];
+	}
+
+
+	function doBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*>[ ]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array(&$this, '_doBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	function _doBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with 
     content, 
+		# so we need to fix that:
+		$bq = preg_replace_callback('{(\s*
    .+?
    )}sx', 
+			array(&$this, '_DoBlockQuotes_callback2'), $bq);
+
+		return "\n". $this->hashBlock("
    \n$bq\n
    ")."\n\n";
+	}
+	function _doBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html 
     tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap 
     tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+				# Is a paragraph.
+				$value = $this->runSpanGamut($value);
+				$value = preg_replace('/^([ ]*)/', "
    ", $value);
+				$value .= "
    ";
+				$grafs[$key] = $this->unhash($value);
+			}
+			else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf = $value;
+				$block = $this->html_hashes[$graf];
+				$graf = $block;
+//				if (preg_match('{
+//					\A
+//					(							# $1 = 
     tag
+//					  
    ]*
+//					  \b
+//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
+//					  1
+//					  \2
+//					  [^>]*
+//					  >
+//					)
+//					(							# $3 = contents
+//					.*
+//					)
+//					(
    )					# $4 = closing tag
+//					\z
+//					}xs', $block, $matches))
+//				{
+//					list(, $div_open, , $div_content, $div_close) = $matches;
+//
+//					# We can't call Markdown(), because that resets the hash;
+//					# that initialization code should be pulled into its own sub, though.
+//					$div_content = $this->hashHTMLBlocks($div_content);
+//					
+//					# Run document gamut methods on the content.
+//					foreach ($this->document_gamut as $method => $priority) {
+//						$div_content = $this->$method($div_content);
+//					}
+//
+//					$div_open = preg_replace(
+//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+//				}
+				$grafs[$key] = $graf;
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	function encodeAttribute($text) {
+	#
+	# Encode text for a double-quoted HTML attribute. This function
+	# is *not* suitable for attributes enclosed in single quotes.
+	#
+		$text = $this->encodeAmpsAndAngles($text);
+		$text = str_replace('"', '"', $text);
+		return $text;
+	}
+	
+	
+	function encodeAmpsAndAngles($text) {
+	#
+	# Smart processing for ampersands and angle brackets that need to 
+	# be encoded. Valid character entities are left alone unless the
+	# no-entities mode is set.
+	#
+		if ($this->no_entities) {
+			$text = str_replace('&', '&', $text);
+		} else {
+			# Ampersand-encoding based entirely on Nat Irons's Amputator
+			# MT plugin: 
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+								'&', $text);;
+		}
+		# Encode remaining <'s
+		$text = str_replace('<', '<', $text);
+
+		return $text;
+	}
+
+
+	function doAutoLinks($text) {
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
+			array(&$this, '_doAutoLinks_url_callback'), $text);
+
+		# Email addresses: 
+		$text = preg_replace_callback('{
+			<
+			(?:mailto:)?
+			(
+				[-.\w\x80-\xFF]+
+				\@
+				[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
+			)
+			>
+			}xi',
+			array(&$this, '_doAutoLinks_email_callback'), $text);
+
+		return $text;
+	}
+	function _doAutoLinks_url_callback($matches) {
+		$url = $this->encodeAttribute($matches[1]);
+		$link = "$url";
+		return $this->hashPart($link);
+	}
+	function _doAutoLinks_email_callback($matches) {
+		$address = $matches[1];
+		$link = $this->encodeEmailAddress($address);
+		return $this->hashPart($link);
+	}
+
+
+	function encodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  
    foo@exampl
+	#        e.com
    
+	#
+	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	#   With some optimizations by Milian Wolff.
+	#
+		$addr = "mailto:" . $addr;
+		$chars = preg_split('/(? $char) {
+			$ord = ord($char);
+			# Ignore non-ascii chars.
+			if ($ord < 128) {
+				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+				# roughly 10% raw, 45% hex, 45% dec
+				# '@' *must* be encoded. I insist.
+				if ($r > 90 && $char != '@') /* do nothing */;
+				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+				else              $chars[$key] = '&#'.$ord.';';
+			}
+		}
+		
+		$addr = implode('', $chars);
+		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
+		$addr = "$text";
+
+		return $addr;
+	}
+
+
+	function parseSpan($str) {
+	#
+	# Take the string $str and parse it into tokens, hashing embeded HTML,
+	# escaped characters and handling code spans.
+	#
+		$output = '';
+		
+		$span_re = '{
+				(
+					\\\\'.$this->escape_chars_re.'
+				|
+					(?no_markup ? '' : '
+				|
+							# comment
+				|
+					<\?.*?\?> | <%.*?%>		# processing instruction
+				|
+					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					(?>
+						\s
+						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
+					)?
+					>
+			').'
+				)
+				}xs';
+
+		while (1) {
+			#
+			# Each loop iteration seach for either the next tag, the next 
+			# openning code span marker, or the next escaped character. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+			
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			}
+			else {
+				break;
+			}
+		}
+		
+		return $output;
+	}
+	
+	
+	function handleSpanToken($token, &$str) {
+	#
+	# Handle $token provided by parseSpan by determining its nature and 
+	# returning the corresponding value that should replace it.
+	#
+		switch ($token{0}) {
+			case "\\":
+				return $this->hashPart("&#". ord($token{1}). ";");
+			case "`":
+				# Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+					$str, $matches))
+				{
+					$str = $matches[2];
+					$codespan = $this->makeCodeSpan($matches[1]);
+					return $this->hashPart($codespan);
+				}
+				return $token; // return as text since no ending marker found.
+			default:
+				return $this->hashPart($token);
+		}
+	}
+
+
+	function outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+	}
+
+
+	# String length function for detab. `_initDetab` will create a function to 
+	# hanlde UTF-8 if the default function does not exist.
+	var $utf8_strlen = 'mb_strlen';
+	
+	function detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the 
+		# appropriate number of space between each blocks.
+		
+		$text = preg_replace_callback('/^.*\t.*$/m',
+			array(&$this, '_detab_callback'), $text);
+
+		return $text;
+	}
+	function _detab_callback($matches) {
+		$line = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+		
+		# Split in blocks.
+		$blocks = explode("\t", $line);
+		# Add each blocks to the line.
+		$line = $blocks[0];
+		unset($blocks[0]); # Do not add first block twice.
+		foreach ($blocks as $block) {
+			# Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width - 
+				$strlen($line, 'UTF-8') % $this->tab_width;
+			$line .= str_repeat(" ", $amount) . $block;
+		}
+		return $line;
+	}
+	function _initDetab() {
+	#
+	# Check for the availability of the function in the `utf8_strlen` property
+	# (initially `mb_strlen`). If the function is not available, create a 
+	# function that will loosely count the number of UTF-8 characters with a
+	# regular expression.
+	#
+		if (function_exists($this->utf8_strlen)) return;
+		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
+			$text, $m);');
+	}
+
+
+	function unhash($text) {
+	#
+	# Swap back in all the tags hashed by _HashHTMLBlocks.
+	#
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+			array(&$this, '_unhash_callback'), $text);
+	}
+	function _unhash_callback($matches) {
+		return $this->html_hashes[$matches[0]];
+	}
+
+}
+
+
+#
+# Markdown Extra Parser Class
+#
+
+class MarkdownExtra_Parser extends Markdown_Parser {
+
+	# Prefix for footnote ids.
+	var $fn_id_prefix = "";
+	
+	# Optional title attribute for footnote links and backlinks.
+	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+	
+	# Optional class attribute for footnote links and backlinks.
+	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+	
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+
+	function MarkdownExtra_Parser() {
+	#
+	# Constructor function. Initialize the parser object.
+	#
+		# Add extra escapable characters before parent constructor 
+		# initialize the table.
+		$this->escape_chars .= ':|';
+		
+		# Insert extra document, block, and span transformations. 
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+			);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+			);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+			);
+		
+		parent::Markdown_Parser();
+	}
+	
+	
+	# Extra variables used during extra transformations.
+	var $footnotes = array();
+	var $footnotes_ordered = array();
+	var $abbr_desciptions = array();
+	var $abbr_word_re = '';
+	
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+	
+	
+	function setup() {
+	#
+	# Setting up Extra-specific variables.
+	#
+		parent::setup();
+		
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		$this->footnote_counter = 1;
+		
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			if ($this->abbr_word_re)
+				$this->abbr_word_re .= '|';
+			$this->abbr_word_re .= preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+	
+	function teardown() {
+	#
+	# Clearing Extra-specific variables.
+	#
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		
+		parent::teardown();
+	}
+	
+	
+	### HTML Block Parser ###
+	
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+	
+	# Tags treated as block tags only if the opening tag is alone on it's line:
+	var $context_block_tags_re = 'script|noscript|math|ins|del';
+	
+	# Tags where markdown="1" default to span mode:
+	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+	
+	# Tags which must not have their contents modified, no matter where 
+	# they appear:
+	var $clean_tags_re = 'script|math';
+	
+	# Tags that do not need to be closed.
+	var $auto_close_tags_re = 'hr|img';
+	
+
+	function hashHTMLBlocks($text) {
+	#
+	# Hashify HTML Blocks and "clean tags".
+	#
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap 
    s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded.
+	#
+	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
+	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	# These two functions are calling each other. It's recursive!
+	#
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		
+		return $text;
+	}
+	function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
+										$enclosing_tag_re = '', $span = false)
+	{
+	#
+	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	#
+	# *   $indent is the number of space to be ignored when checking for code 
+	#     blocks. This is important because if we don't take the indent into 
+	#     account, something like this (which looks right) won't work as expected:
+	#
+	#     
    
+	#         
    
+	#         Hello World.  <-- Is this a Markdown code block or text?
+	#         
      <-- Is this a Markdown code block or a real tag?
+	#     
    
+	#
+	#     If you don't like this, just don't indent the tag on which
+	#     you apply the markdown="1" attribute.
+	#
+	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
+	#     tag with that name. Nested tags supported.
+	#
+	# *   If $span is true, text inside must treated as span. So any double 
+	#     newline will be replaced by a single newline so that it does not create 
+	#     paragraphs.
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re = 
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+		
+		# Regex to match any tag.
+		$block_tag_re =
+			'{
+				(					# $2: Capture hole tag.
+									# Tag name.
+							'.$this->block_tags_re.'			|
+							'.$this->context_block_tags_re.'	|
+							'.$this->clean_tags_re.'        	|
+							(?!\s)'.$enclosing_tag_re.'
+						)
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+						# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+						# CData Block
+				|
+					# Code span marker
+					`+
+				'. ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?> ^[ ]*\n? | \n[ ]*\n )
+					[ ]{'.($indent+4).'}[^\n]* \n
+					(?>
+						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?> ^ | \n )
+					[ ]{'.($indent).'}~~~+[ ]*\n
+				' : '' ). ' # End (if not is span).
+				)
+			}xs';
+
+		
+		$depth = 0;		# Current depth inside the tag tree.
+		$parsed = "";	# Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($block_tag_re, $text, 2, 
+								PREG_SPLIT_DELIM_CAPTURE);
+			
+			# If in Markdown span mode, add a empty-string span-level hash 
+			# after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "$void\n";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+			
+			$parsed .= $parts[0]; # Text before current tag.
+			
+			# If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+			
+			$tag  = $parts[1]; # Tag to handle.
+			$text = $parts[2]; # Remaining text after current tag.
+			$tag_re = preg_quote($tag); # For use in a regular expression.
+			
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?.*\n)+?'.$tag_re.' *\n}', $text, 
+						$matches)) 
+					{
+						# End marker found: pass text unchanged until marker.
+						$parsed .= $tag . $matches[0];
+						$text = substr($text, strlen($matches[0]));
+					}
+					else {
+						# No end marker: just skip it.
+						$parsed .= $tag;
+					}
+				}
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            Opening Context Block tag (like ins and del) 
+			#               used as a block tag (tag is alone on it's line).
+			#
+			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
+				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+					preg_match($newline_before_re, $parsed) &&
+					preg_match($newline_after_re, $text)	)
+				)
+			{
+				# Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+				
+				# Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Need to parse tag and following text using the HTML parser.
+				# (don't check for markdown attribute)
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+				
+				$parsed .= $block_text;
+			}
+			#
+			# Check for: Tag with same name as enclosing tag.
+			#
+			else if ($enclosing_tag_re !== '' &&
+				# Same name as enclosing tag.
+				preg_match('{^= 0);
+		
+		return array($parsed, $text);
+	}
+	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+	#
+	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	#
+	# *   Calls $hash_method to convert any blocks.
+	# *   Stops when the first opening tag closes.
+	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	#     (it is not inside clean tags)
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+		
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter		
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter	
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+		
+		# Regex to match any tag.
+		$tag_re = '{
+				(					# $2: Capture hole tag.
+					
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+						# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+						# CData Block
+				)
+			}xs';
+		
+		$original_text = $text;		# Save original text in case of faliure.
+		
+		$depth		= 0;	# Current depth inside the tag tree.
+		$block_text	= "";	# Temporary text holder for current text.
+		$parsed		= "";	# Parsed text that will be returned.
+
+		#
+		# Get the name of the starting tag.
+		# (This pattern makes $base_tag_name_re safe without quoting.)
+		#
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+			$base_tag_name_re = $matches[1];
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			if (count($parts) < 3) {
+				#
+				# End of $text reached with unbalenced tag(s).
+				# In that case, we return original text unchanged and pass the
+				# first character as filtered to prevent an infinite loop in the 
+				# parent function.
+				#
+				return array($original_text{0}, substr($original_text, 1));
+			}
+			
+			$block_text .= $parts[0]; # Text before current tag.
+			$tag         = $parts[1]; # Tag to handle.
+			$text        = $parts[2]; # Remaining text after current tag.
+			
+			#
+			# Check for: Auto-close tag (like 
    )
+			#			 Comments and Processing Instructions.
+			#
+			if (preg_match('{^auto_close_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				#
+				# Increase/decrease nested tag count. Only do so if
+				# the tag's name match base tag's.
+				#
+				if (preg_match('{^mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+					
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+					
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+					
+					# Get enclosing tag name for the ParseMarkdown function.
+					# (This pattern makes $tag_name_re safe without quoting.)
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name_re = $matches[1];
+					
+					# Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
+							$tag_name_re, $span_mode);
+					
+					# Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
+													$block_text);
+					}
+					
+					# Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+					
+					# Start over a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+			
+		} while ($depth > 0);
+		
+		#
+		# Hash last block text that wasn't processed inside the loop.
+		#
+		$parsed .= $this->$hash_method($block_text);
+		
+		return array($parsed, $text);
+	}
+
+
+	function hashClean($text) {
+	#
+	# Called whenever a tag must be hashed when a function insert a "clean" tag
+	# in $text, it pass through this function and is automaticaly escaped, 
+	# blocking invalid nested overlap.
+	#
+		return $this->hashPart($text, 'C');
+	}
+
+
+	function doHeaders($text) {
+	#
+	# Redefined to add id attribute support.
+	#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#  
+		#	  Header 2  {#header2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3}
+		#	...
+		#	###### Header 6   {#header2}
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
+				[ ]*
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_attr($attr) {
+		if (empty($attr))  return "";
+		return " id=\"$attr\"";
+	}
+	function _doHeaders_callback_setext($matches) {
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+			return $matches[0];
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$block = "".$this->runSpanGamut($matches[1])."";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$block = "".$this->runSpanGamut($matches[2])."";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doTables($text) {
+	#
+	# Form HTML tables.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_doTable_leadingPipe_callback'), $text);
+		
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+	function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+		
+		# Remove leading pipe for each row.
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+		
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+	function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+		
+		# Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+			else									$attr[$n] = '';
+		}
+		
+		# Parsing span elements, including code spans, character escapes, 
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+		
+		# Write column headers.
+		$text = "\n";
+		$text .= "\n";
+		$text .= "\n";
+		foreach ($headers as $n => $header)
+			$text .= "  ".$this->runSpanGamut(trim($header))."\n";
+		$text .= "\n";
+		$text .= "\n";
+		
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+		
+		$text .= "\n";
+		foreach ($rows as $row) {
+			# Parsing span elements, including code spans, character escapes, 
+			# and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+			
+			# Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+			
+			$text .= "\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  ".$this->runSpanGamut(trim($cell))."\n";
+			$text .= "\n";
+		}
+		$text .= "\n";
+		$text .= "
    ";
+		
+		return $this->hashBlock($text) . "\n";
+	}
+
+	
+	function doDefLists($text) {
+	#
+	# Form HTML definition lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,'.$less_than_tab.'}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,'.$less_than_tab.'}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				'.$whole_list_re.'
+			}mx',
+			array(&$this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+	function _doDefLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "
    \n" . $result . "\n
    ";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+
+	function processDefListItems($list_str) {
+	#
+	#	Process the contents of a single definition list, splitting it
+	#	into individual term and definition list items.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)					# leading line
+			(								# definition terms = $1
+				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				(?![:][ ]|[ ])				# negative lookahead for a definition 
+											#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?				# actual term (not whitespace).	
+			)			
+			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
+											#   with a definition mark.
+			}xm',
+			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+
+		# Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?						# leading line = $1
+			(								# marker space = $2
+				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[:][ ]+						# definition mark (colon)
+			)
+			((?s:.+?))						# definition text = $3
+			(?= \n+ 						# stop at next definition mark,
+				(?:							# next term or end of text
+					[ ]{0,'.$less_than_tab.'} [:][ ]	|
+					
     | \z
+				)						
+			)					
+			}xm',
+			array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+	function _processDefListItems_callback_dt($matches) {
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		foreach ($terms as $term) {
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n
    " . $term . "
    ";
+		}
+		return $text . "\n";
+	}
+	function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			# Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n
    " . $def . "
    \n";
+	}
+
+
+	function doFencedCodeBlocks($text) {
+	#
+	# Adding the fenced code block syntax to regular Markdown:
+	#
+	# ~~~
+	# Code block
+	# ~~~
+	#
+		$less_than_tab = $this->tab_width;
+		
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					~{3,} # Marker: three tilde or more.
+				)
+				[ ]* \n # Whitespace and newline following marker.
+				
+				# 2: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+				
+				# Closing marker.
+				\1 [ ]* \n
+			}xm',
+			array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doFencedCodeBlocks_callback($matches) {
+		$codeblock = $matches[2];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback('/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+		$codeblock = "
    $codeblock
    ";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+	function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("empty_element_suffix", 
+			strlen($matches[0]));
+	}
+
+
+	#
+	# Redefining emphasis markers so that emphasis by underscore does not
+	# work in the middle of a word.
+	#
+	var $em_relist = array(
+		''  => '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+		
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap 
     tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+			
+			# Check if this should be enclosed in a paragraph.
+			# Clean tag hashes & block tag hashes are left alone.
+			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+			
+			if ($is_p) {
+				$value = "
    $value
    ";
+			}
+			$grafs[$key] = $value;
+		}
+		
+		# Join grafs in one text, then unhash HTML tags. 
+		$text = implode("\n\n", $grafs);
+		
+		# Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+		
+		return $text;
+	}
+	
+	
+	### Footnotes
+	
+	function stripFootnotes($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:					
+					.+				# actual text
+				|
+					\n				# newlines but 
+					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+									# by non-indented content
+				)*
+			)		
+			}xm',
+			array(&$this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+	function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; # String that will replace the block
+	}
+
+
+	function doFootnotes($text) {
+	#
+	# Replace footnote references in $text [^id] with a special text-token 
+	# which will be replaced by the actual footnote marker in appendFootnotes.
+	#
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+	
+	function appendFootnotes($text) {
+	#
+	# Append footnote list to text.
+	#
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+			array(&$this, '_appendFootnotes_callback'), $text);
+	
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "
    \n";
+			$text .= "fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$num = 0;
+			
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+				
+				$footnote .= "\n"; # Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");				
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+					array(&$this, '_appendFootnotes_callback'), $footnote);
+				
+				$attr = str_replace("%%", ++$num, $attr);
+				$note_id = $this->encodeAttribute($note_id);
+				
+				# Add backlink to last paragraph; create new paragraph if needed.
+				$backlink = "↩";
+				if (preg_match('{
    $}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . " $backlink
    ";
+				} else {
+					$footnote .= "\n\n
    $backlink
    ";
+				}
+				
+				$text .= "
  • \n";
+				$text .= $footnote . "\n";
+				$text .= "
    • \n\n";
+			}
+			
+			$text .= "\n";
+			$text .= "
    ";
+		}
+		return $text;
+	}
+	function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+		
+		# Create footnote marker only if it has a corresponding footnote *and*
+		# the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			# Transfert footnote content to the ordered list.
+			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+			unset($this->footnotes[$node_id]);
+			
+			$num = $this->footnote_counter++;
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			
+			$attr = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+			
+			return
+				"".
+				"$num".
+				"";
+		}
+		
+		return "[^".$matches[1]."]";
+	}
+		
+	
+	### Abbreviations ###
+	
+	function stripAbbreviations($text) {
+	#
+	# Strips abbreviations from text, stores titles in hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)	
+			}xm',
+			array(&$this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+	function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		if ($this->abbr_word_re)
+			$this->abbr_word_re .= '|';
+		$this->abbr_word_re .= preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; # String that will replace the block
+	}
+	
+	
+	function doAbbreviations($text) {
+	#
+	# Find defined abbreviations in text and wrap them in  elements.
+	#
+		if ($this->abbr_word_re) {
+			// cannot use the /x modifier because abbr_word_re may 
+			// contain significant spaces:
+			$text = preg_replace_callback('{'.
+				'(?abbr_word_re.')'.
+				'(?![\w\x1A])'.
+				'}', 
+				array(&$this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+	function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("$abbr");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("$abbr");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
+
+}
+
+
+/*
+
+PHP Markdown Extra
+==================
+
+Description
+-----------
+
+This is a PHP port of the original Markdown formatter written in Perl 
+by John Gruber. This special "Extra" version of PHP Markdown features 
+further enhancements to the syntax for making additional constructs 
+such as tables and definition list.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like 
     and  as well).
+
+For more information about Markdown's syntax, see:
+
+
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+--------------- 
+
+See the readme file for detailed release notes for this version.
+
+
+Copyright and License
+---------------------
+
+PHP Markdown & Extra
+Copyright (c) 2004-2008 Michel Fortin  
+  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+   
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+*	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+*	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+*	Neither the name "Markdown" nor the names of its contributors may
+	be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+*/
+?>
\ No newline at end of file
diff --git a/system/views/kohana/error.php b/system/views/kohana/error.php
new file mode 100644
index 00000000..b40c0f8a
--- /dev/null
+++ b/system/views/kohana/error.php
@@ -0,0 +1,252 @@
+
+
+
+
    
+	
    
+		
+ [  ]:
+		
+		
+
+		
+	
    
+	
    
+		
    
+			
+[  ]
+			
+		
    
+
+
+		
     $row) : ?>
    
+
+
+
+		
      
+			$step): ?>
+			
    1. 
+				
      
+					
+						
+						
+						[  ]
+						
+						[  ]
+						
+						
+						{}
+						
+					
+					»
+					(
+)
+				
      
+				
+				
    
+						$arg): ?>
+						
+							
+							
+						
+						
+					
    
+								
+
+								
+							
+								
    
+							
    
+				
    
+				
+				
+				
+				
+			
+			
+			
+		
+
+
+	
    
+	
    
+	
+
    
diff --git a/system/views/kohana/error_disabled.php b/system/views/kohana/error_disabled.php
new file mode 100644
index 00000000..1024eb1e
--- /dev/null
+++ b/system/views/kohana/error_disabled.php
@@ -0,0 +1,19 @@
+
+ 
+
+	
+		
+		<?php echo htmlspecialchars(__('Unable to Complete Request'), ENT_QUOTES, Kohana::CHARSET) ?>
+	
+	
+		
    
+			
    
+			
    
+home page or try again.',
+		array('%site%' => htmlspecialchars(url::site(), ENT_QUOTES, Kohana::CHARSET), '%uri%' => htmlspecialchars(url::site(Router::$current_uri), ENT_QUOTES, Kohana::CHARSET)));
+?>
+			
    
+		
    
+	
+
diff --git a/system/views/kohana/template.php b/system/views/kohana/template.php
index b090fd88..84ddbff5 100644
--- a/system/views/kohana/template.php
+++ b/system/views/kohana/template.php
@@ -5,7 +5,7 @@
 
 
 	
-	<?php echo html::specialchars($title) ?>
+	<?php echo html::chars(__($title)) ?>
 
 	
-
-<?php echo $error ?>
-
-
-
    
-
    
-
    
-
    
-
-
\ No newline at end of file
diff --git a/system/views/kohana_error_page.php b/system/views/kohana_error_page.php
deleted file mode 100644
index 944064cc..00000000
--- a/system/views/kohana_error_page.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-<?php echo $error ?>
-
-
-
-
    
-
    
-
    
-
-
    
-
-
    
-
-
    
-
-
-
    
-
    
-
-
\ No newline at end of file
diff --git a/system/views/kohana_errors.css b/system/views/kohana_errors.css
deleted file mode 100644
index 1341f57d..00000000
--- a/system/views/kohana_errors.css
+++ /dev/null
@@ -1,21 +0,0 @@
-div#framework_error { background:#fff; border:solid 1px #ccc; font-family:sans-serif; color:#111; font-size:14px; line-height:130%; }
-div#framework_error h3 { color:#fff; font-size:16px; padding:8px 6px; margin:0 0 8px; background:#f15a00; text-align:center; }
-div#framework_error a { color:#228; text-decoration:none; }
-div#framework_error a:hover { text-decoration:underline; }
-div#framework_error strong { color:#900; }
-div#framework_error p { margin:0; padding:4px 6px 10px; }
-div#framework_error tt,
-div#framework_error pre,
-div#framework_error code { font-family:monospace; padding:2px 4px; font-size:12px; color:#333;
-	white-space:pre-wrap; /* CSS 2.1 */
-	white-space:-moz-pre-wrap; /* For Mozilla */
-	word-wrap:break-word; /* For IE5.5+ */
-}
-div#framework_error tt { font-style:italic; }
-div#framework_error tt:before { content:">"; color:#aaa; }
-div#framework_error code tt:before { content:""; }
-div#framework_error pre,
-div#framework_error code { background:#eaeee5; border:solid 0 #D6D8D1; border-width:0 1px 1px 0; }
-div#framework_error .block { display:block; text-align:left; }
-div#framework_error .stats { padding:4px; background: #eee; border-top:solid 1px #ccc; text-align:center; font-size:10px; color:#888; }
-div#framework_error .backtrace { margin:0; padding:0 6px; list-style:none; line-height:12px; }
\ No newline at end of file
diff --git a/system/views/kohana_profiler.php b/system/views/kohana_profiler.php
deleted file mode 100644
index da77a669..00000000
--- a/system/views/kohana_profiler.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
    
-render();
-}
-?>
-
    Profiler executed in s
    
-
    
\ No newline at end of file
diff --git a/system/views/kohana_profiler_table.css b/system/views/kohana_profiler_table.css
deleted file mode 100644
index 6e7601c9..00000000
--- a/system/views/kohana_profiler_table.css
+++ /dev/null
@@ -1,53 +0,0 @@
-#kohana-profiler .kp-table
-{
-	font-size: 1.0em;
-	color: #4D6171;
-	width: 100%;
-	border-collapse: collapse;
-	border-top: 1px solid #E5EFF8;
-	border-right: 1px solid #E5EFF8;
-	border-left: 1px solid #E5EFF8;
-	margin-bottom: 10px;
-}
-#kohana-profiler .kp-table td
-{
-	background-color: #FFFFFF;
-	border-bottom: 1px solid #E5EFF8;
-	padding: 3px;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-title td
-{
-	font-weight: bold;
-	background-color: inherit;
-}
-#kohana-profiler .kp-table .kp-altrow td
-{
-	background-color: #F7FBFF;
-}
-#kohana-profiler .kp-table .kp-totalrow td
-{
-	background-color: #FAFAFA;
-	border-top: 1px solid #D2DCE5;
-	font-weight: bold;
-}
-#kohana-profiler .kp-table .kp-column
-{
-	width: 100px;
-	border-left: 1px solid #E5EFF8;
-	text-align: center;
-}
-#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
-{
-	background-color: #FAFAFB;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-name
-{
-	width: 200px;
-	border-right: 1px solid #E5EFF8;
-}
-#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
-{
-	background-color: #F6F8FB;
-}
\ No newline at end of file
diff --git a/system/views/kohana_profiler_table.php b/system/views/kohana_profiler_table.php
deleted file mode 100644
index b6b46530..00000000
--- a/system/views/kohana_profiler_table.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	>
-		 $column)
-		{
-			$class = empty($column['class']) ? '' : ' class="'.$column['class'].'"';
-			$style = empty($column['style']) ? '' : ' style="'.$column['style'].'"';
-			$value = $row['data'][$index];
-			$value = (is_array($value) OR is_object($value)) ? '
    '.html::specialchars(print_r($value, TRUE)).'
    ' : html::specialchars($value);
-			echo '', $value, '';
-		}
-		?>
-	
-
-
    
\ No newline at end of file
diff --git a/system/views/profiler/profiler.php b/system/views/profiler/profiler.php
new file mode 100644
index 00000000..7b9ae951
--- /dev/null
+++ b/system/views/profiler/profiler.php
@@ -0,0 +1,37 @@
+
+
+
    
+render();
+}
+?>
+
     number_format($execution_time, 3))) ?>
    
+
    
\ No newline at end of file
diff --git a/system/views/profiler/table.css b/system/views/profiler/table.css
new file mode 100644
index 00000000..41a1c9a3
--- /dev/null
+++ b/system/views/profiler/table.css
@@ -0,0 +1,53 @@
+#kohana-profiler .kp-table
+{
+	font-size: 1.0em;
+	color: #4D6171;
+	width: 100%;
+	border-collapse: collapse;
+	border-top: 1px solid #E5EFF8;
+	border-right: 1px solid #E5EFF8;
+	border-left: 1px solid #E5EFF8;
+	margin-bottom: 10px;
+}
+#kohana-profiler .kp-table td
+{
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #E5EFF8;
+	padding: 3px;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-title td
+{
+	font-weight: bold;
+	background-color: inherit;
+}
+#kohana-profiler .kp-table .kp-altrow td
+{
+	background-color: #F7FBFF;
+}
+#kohana-profiler .kp-table .kp-totalrow td
+{
+	background-color: #FAFAFA;
+	border-top: 1px solid #D2DCE5;
+	font-weight: bold;
+}
+#kohana-profiler .kp-table .kp-column
+{
+	width: 100px;
+	border-left: 1px solid #E5EFF8;
+	text-align: center;
+}
+#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
+{
+	background-color: #FAFAFB;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-name
+{
+	width: 200px;
+	border-right: 1px solid #E5EFF8;
+}
+#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
+{
+	background-color: #F6F8FB;
+}
\ No newline at end of file
diff --git a/system/views/profiler/table.php b/system/views/profiler/table.php
new file mode 100644
index 00000000..7cdf79dd
--- /dev/null
+++ b/system/views/profiler/table.php
@@ -0,0 +1,24 @@
+
+
+
+	>
+		 $column)
+		{
+			$class = empty($column['class']) ? '' : ' class="'.$column['class'].'"';
+			$style = empty($column['style']) ? '' : ' style="'.$column['style'].'"';
+			$value = $row['data'][$index];
+			$value = (is_array($value) OR is_object($value)) ? '
    '.htmlspecialchars(print_r($value, TRUE), ENT_QUOTES, Kohana::CHARSET).'
    ' : htmlspecialchars($value, ENT_QUOTES, Kohana::CHARSET);
+			echo '' . wordwrap($value, 100, '
    ', true) . '';
+		}
+		?>
+	
+
+
    
-- 
cgit v1.2.3


From 3ed7a5af46586f186a4627d8b029aec7c3ff579d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 24 Nov 2009 19:24:02 -0800
Subject: Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4

---
 modules/gallery/controllers/l10n_client.php |   8 +-
 modules/gallery/helpers/l10n_scanner.php    |   2 +-
 modules/gallery/helpers/locales.php         |   6 +-
 modules/gallery/hooks/init_gallery.php      |   2 +-
 modules/gallery/libraries/Gallery_I18n.php  | 430 ++++++++++++++++++++++++++++
 modules/gallery/libraries/I18n.php          | 430 ----------------------------
 modules/gallery/tests/I18n_Test.php         |   6 +-
 7 files changed, 442 insertions(+), 442 deletions(-)
 create mode 100644 modules/gallery/libraries/Gallery_I18n.php
 delete mode 100644 modules/gallery/libraries/I18n.php

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 6db67d3b..3801e6aa 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -24,7 +24,7 @@ class L10n_Client_Controller extends Controller {
       access::forbidden();
     }
 
-    $locale = I18n::instance()->locale();
+    $locale = Gallery_I18n::instance()->locale();
     $input = Input::instance();
     $key = $input->post("l10n-message-key");
 
@@ -36,7 +36,7 @@ class L10n_Client_Controller extends Controller {
     if (!$root_message->loaded) {
       throw new Exception("@todo bad request data / illegal state");
     }
-    $is_plural = I18n::is_plural_message(unserialize($root_message->message));
+    $is_plural = Gallery_I18n::is_plural_message(unserialize($root_message->message));
 
     if ($is_plural) {
       $plural_forms = l10n_client::plural_forms($locale);
@@ -122,9 +122,9 @@ class L10n_Client_Controller extends Controller {
         $calls[$row->key] = array(unserialize($row->message), array());
       }
     } else {
-      $calls = I18n::instance()->call_log();
+      $calls = Gallery_I18n::instance()->call_log();
     }
-    $locale = I18n::instance()->locale();
+    $locale = Gallery_I18n::instance()->locale();
 
     if ($calls) {
       $translations = array();
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index a8059b3a..e36d419d 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -37,7 +37,7 @@ class l10n_scanner_Core {
       }
     }
 
-    $key = I18n::get_message_key($message);
+    $key = Gallery_I18n::get_message_key($message);
     if (array_key_exists($key, $cache)) {
       return $cache[$key];
     }
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 2de029ff..8d76e333 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -125,13 +125,13 @@ class locales_Core {
     if (empty(self::$locales)) {
       self::_init_language_data();
     }
-    $locale or $locale = I18n::instance()->locale();
+    $locale or $locale = Gallery_I18n::instance()->locale();
 
     return self::$locales["$locale"];
   }
 
   static function is_rtl($locale=null) {
-    $locale or $locale = I18n::instance()->locale();
+    $locale or $locale = Gallery_I18n::instance()->locale();
     list ($language, $territory) = explode('_', $locale . "_");
     return in_array($language, array("he", "fa", "ar"));
   }
@@ -233,7 +233,7 @@ class locales_Core {
     }
     // If we have any preference, override the site's default locale
     if ($locale) {
-      I18n::instance()->locale($locale);
+      Gallery_I18n::instance()->locale($locale);
     }
   }
 
diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index b2d9c4de..4ce9bab4 100644
--- a/modules/gallery/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -24,7 +24,7 @@ if (!file_exists(VARPATH . "database.php")) {
   url::redirect(url::abs_file("installer"));
 }
 
-Event::add("system.ready", array("I18n", "instance"));
+Event::add("system.ready", array("Gallery_I18n", "instance"));
 Event::add("system.ready", array("module", "load_modules"));
 Event::add("system.ready", array("gallery", "ready"));
 Event::add("system.post_routing", array("url", "parse_url"));
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
new file mode 100644
index 00000000..0571fe58
--- /dev/null
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -0,0 +1,430 @@
+translate($message, $options);
+}
+
+/**
+ * Translates a localizable message with plural forms.
+ * @param $singular String The message to be translated. E.g. "There is one album."
+ * @param $plural String The plural message to be translated. E.g.
+ *        "There are %count albums."
+ * @param $count Number The number which is inserted for the %count placeholder and
+ *        which is used to select the proper plural form ($singular or $plural).
+ * @param $options array (optional) Options array for key value pairs which are used
+ *        for pluralization and interpolation. Special key: "locale" to override the
+ *        currently configured locale.
+ * @return String The translated message string.
+ */
+function t2($singular, $plural, $count, $options=array()) {
+  return Gallery_I18n::instance()->translate(array("one" => $singular, "other" => $plural),
+                                     array_merge($options, array("count" => $count)));
+}
+
+class Gallery_I18n_Core {
+  private static $_instance;
+  private $_config = array();
+  private $_call_log = array();
+  private $_cache = array();
+
+  private function __construct($config) {
+    $this->_config = $config;
+    $this->locale($config['default_locale']);
+  }
+
+  public static function instance($config=null) {
+    if (self::$_instance == NULL || isset($config)) {
+      $config = isset($config) ? $config : Kohana::config('locale');
+      if (empty($config['default_locale'])) {
+        $config['default_locale'] = module::get_var('gallery', 'default_locale');
+      }
+      self::$_instance = new Gallery_I18n_Core($config);
+    }
+
+    return self::$_instance;
+  }
+
+  public function locale($locale=null) {
+    if ($locale) {
+      $this->_config['default_locale'] = $locale;
+      // Attempt to set PHP's locale as well (for number formatting, collation, etc.)
+      // TODO: See G2 for better fallack code.
+      $locale_prefs = array($locale);
+      $locale_prefs[] = 'en_US';
+      $new_locale = setlocale(LC_ALL, $locale_prefs);
+      if (is_string($new_locale) && strpos($new_locale, 'tr') === 0) {
+        // Make PHP 5 work with Turkish (the localization results are mixed though).
+        // Hack for http://bugs.php.net/18556
+        setlocale(LC_CTYPE, 'C');
+      }
+    }
+    return $this->_config['default_locale'];
+  }
+
+  /**
+   * Translates a localizable message.
+   *
+   * Security:
+   * The returned string is safe for use in HTML (it contains a safe subset of HTML and
+   * interpolation parameters are converted to HTML entities).
+   * For use in JavaScript, please call ->for_js() on it.
+   *
+   * @param $message String|array The message to be translated. E.g. "Hello world"
+   *                 or array("one" => "One album", "other" => "%count albums")
+   * @param $options array (optional) Options array for key value pairs which are used
+   *        for pluralization and interpolation. Special keys are "count" and "locale",
+   *        the latter to override the currently configured locale.
+   * @return String The translated message string.
+   */
+  public function translate($message, $options=array()) {
+    $locale = empty($options['locale']) ? $this->_config['default_locale'] : $options['locale'];
+    $count = isset($options['count']) ? $options['count'] : null;
+    $values = $options;
+    unset($values['locale']);
+    $this->log($message, $options);
+
+    $entry = $this->lookup($locale, $message);
+
+    if (null === $entry) {
+      // Default to the root locale.
+      $entry = $message;
+      $locale = $this->_config['root_locale'];
+    }
+
+    $entry = $this->pluralize($locale, $entry, $count);
+
+    $entry = $this->interpolate($locale, $entry, $values);
+
+    return SafeString::of_safe_html($entry);
+  }
+
+  private function lookup($locale, $message) {
+    if (!isset($this->_cache[$locale])) {
+      $this->_cache[$locale] = array();
+      // TODO: Load data from locale file instead of the DB.
+      foreach (Database::instance()
+               ->select("key", "translation")
+               ->from("incoming_translations")
+               ->where(array("locale" => $locale))
+               ->get()
+               ->as_array() as $row) {
+        $this->_cache[$locale][$row->key] = unserialize($row->translation);
+      }
+
+      // Override incoming with outgoing...
+      foreach (Database::instance()
+               ->select("key", "translation")
+               ->from("outgoing_translations")
+               ->where(array("locale" => $locale))
+               ->get()
+               ->as_array() as $row) {
+        $this->_cache[$locale][$row->key] = unserialize($row->translation);
+      }
+    }
+
+    $key = self::get_message_key($message);
+
+    if (isset($this->_cache[$locale][$key])) {
+      return $this->_cache[$locale][$key];
+    } else {
+      return null;
+    }
+  }
+
+  public function has_translation($message, $options=null) {
+    $locale = empty($options['locale']) ? $this->_config['default_locale'] : $options['locale'];
+
+    $entry = $this->lookup($locale, $message);
+
+    if (null === $entry) {
+      return false;
+    } else if (!is_array($message)) {
+      return $entry !== '';
+    } else {
+      if (!is_array($entry) || empty($entry)) {
+        return false;
+      }
+      // It would be better to verify that all the locale's plural forms have a non-empty
+      // translation, but this is fine for now.
+      foreach ($entry as $value) {
+        if ($value === '') {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+
+  static function get_message_key($message) {
+    $as_string = is_array($message) ? implode('|', $message) : $message;
+    return md5($as_string);
+  }
+
+  static function is_plural_message($message) {
+    return is_array($message);
+  }
+
+  private function interpolate($locale, $string, $key_values) {
+    // TODO: Handle locale specific number formatting.
+
+    // Replace x_y before replacing x.
+    krsort($key_values, SORT_STRING);
+
+    $keys = array();
+    $values = array();
+    foreach ($key_values as $key => $value) {
+      $keys[] = "%$key";
+      $values[] = new SafeString($value);
+    }
+    return str_replace($keys, $values, $string);
+  }
+
+  private function pluralize($locale, $entry, $count) {
+    if (!is_array($entry)) {
+      return $entry;
+    }
+
+    $plural_key = self::get_plural_key($locale, $count);
+    if (!isset($entry[$plural_key])) {
+      // Fallback to the default plural form.
+      $plural_key = 'other';
+    }
+
+    if (isset($entry[$plural_key])) {
+      return $entry[$plural_key];
+    } else {
+      // Fallback to just any plural form.
+      list ($plural_key, $string) = each($entry);
+      return $string;
+    }
+  }
+
+  private function log($message, $options) {
+    $key = self::get_message_key($message);
+    isset($this->_call_log[$key]) or $this->_call_log[$key] = array($message, $options);
+  }
+
+  public function call_log() {
+    return $this->_call_log;
+  }
+
+  private static function get_plural_key($locale, $count) {
+    $parts = explode('_', $locale);
+    $language = $parts[0];
+
+    // Data from CLDR 1.6 (http://unicode.org/cldr/data/common/supplemental/plurals.xml).
+    // Docs: http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html
+    switch ($language) {
+      case 'az':
+      case 'fa':
+      case 'hu':
+      case 'ja':
+      case 'ko':
+      case 'my':
+      case 'to':
+      case 'tr':
+      case 'vi':
+      case 'yo':
+      case 'zh':
+      case 'bo':
+      case 'dz':
+      case 'id':
+      case 'jv':
+      case 'ka':
+      case 'km':
+      case 'kn':
+      case 'ms':
+      case 'th':
+        return 'other';
+
+      case 'ar':
+        if ($count == 0) {
+          return 'zero';
+        } else if ($count == 1) {
+          return 'one';
+        } else if ($count == 2) {
+          return 'two';
+        } else if (is_int($count) && ($i = $count % 100) >= 3 && $i <= 10) {
+          return 'few';
+        } else if (is_int($count) && ($i = $count % 100) >= 11 && $i <= 99) {
+          return 'many';
+        } else {
+          return 'other';
+        }
+
+      case 'pt':
+      case 'am':
+      case 'bh':
+      case 'fil':
+      case 'tl':
+      case 'guw':
+      case 'hi':
+      case 'ln':
+      case 'mg':
+      case 'nso':
+      case 'ti':
+      case 'wa':
+        if ($count == 0 || $count == 1) {
+          return 'one';
+        } else {
+          return 'other';
+        }
+
+      case 'fr':
+        if ($count >= 0 and $count < 2) {
+          return 'one';
+        } else {
+          return 'other';
+        }
+
+      case 'lv':
+        if ($count == 0) {
+          return 'zero';
+        } else if ($count % 10 == 1 && $count % 100 != 11) {
+          return 'one';
+        } else {
+          return 'other';
+        }
+
+      case 'ga':
+      case 'se':
+      case 'sma':
+      case 'smi':
+      case 'smj':
+      case 'smn':
+      case 'sms':
+        if ($count == 1) {
+          return 'one';
+        } else if ($count == 2) {
+          return 'two';
+        } else {
+          return 'other';
+        }
+
+      case 'ro':
+      case 'mo':
+        if ($count == 1) {
+          return 'one';
+        } else if (is_int($count) && $count == 0 && ($i = $count % 100) >= 1 && $i <= 19) {
+          return 'few';
+        } else {
+          return 'other';
+        }
+
+      case 'lt':
+        if (is_int($count) && $count % 10 == 1 && $count % 100 != 11) {
+          return 'one';
+        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 9 && ($i = $count % 100) < 11 && $i > 19) {
+          return 'few';
+        } else {
+          return 'other';
+        }
+
+      case 'hr':
+      case 'ru':
+      case 'sr':
+      case 'uk':
+      case 'be':
+      case 'bs':
+      case 'sh':
+        if (is_int($count) && $count % 10 == 1 && $count % 100 != 11) {
+          return 'one';
+        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 4 && ($i = $count % 100) < 12 && $i > 14) {
+          return 'few';
+        } else if (is_int($count) && ($count % 10 == 0 || (($i = $count % 10) >= 5 && $i <= 9) || (($i = $count % 100) >= 11 && $i <= 14))) {
+          return 'many';
+        } else {
+          return 'other';
+        }
+
+      case 'cs':
+      case 'sk':
+        if ($count == 1) {
+          return 'one';
+        } else if (is_int($count) && $count >= 2 && $count <= 4) {
+          return 'few';
+        } else {
+          return 'other';
+        }
+
+      case 'pl':
+        if ($count == 1) {
+          return 'one';
+        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 4 &&
+                   ($i = $count % 100) < 12 && $i > 14 && ($i = $count % 100) < 22 && $i > 24) {
+          return 'few';
+        } else {
+          return 'other';
+        }
+
+      case 'sl':
+        if ($count % 100 == 1) {
+          return 'one';
+        } else if ($count % 100 == 2) {
+          return 'two';
+        } else if (is_int($count) && ($i = $count % 100) >= 3 && $i <= 4) {
+          return 'few';
+        } else {
+          return 'other';
+        }
+
+      case 'mt':
+        if ($count == 1) {
+          return 'one';
+        } else if ($count == 0 || is_int($count) && ($i = $count % 100) >= 2 && $i <= 10) {
+          return 'few';
+        } else if (is_int($count) && ($i = $count % 100) >= 11 && $i <= 19) {
+          return 'many';
+        } else {
+          return 'other';
+        }
+
+      case 'mk':
+        if ($count % 10 == 1) {
+          return 'one';
+        } else {
+          return 'other';
+        }
+
+      case 'cy':
+        if ($count == 1) {
+          return 'one';
+        } else if ($count == 2) {
+          return 'two';
+        } else if ($count == 8 || $count == 11) {
+          return 'many';
+        } else {
+          return 'other';
+        }
+
+      default: // en, de, etc.
+        return $count == 1 ? 'one' : 'other';
+    }
+  }
+}
diff --git a/modules/gallery/libraries/I18n.php b/modules/gallery/libraries/I18n.php
deleted file mode 100644
index c3336052..00000000
--- a/modules/gallery/libraries/I18n.php
+++ /dev/null
@@ -1,430 +0,0 @@
-translate($message, $options);
-}
-
-/**
- * Translates a localizable message with plural forms.
- * @param $singular String The message to be translated. E.g. "There is one album."
- * @param $plural String The plural message to be translated. E.g.
- *        "There are %count albums."
- * @param $count Number The number which is inserted for the %count placeholder and
- *        which is used to select the proper plural form ($singular or $plural).
- * @param $options array (optional) Options array for key value pairs which are used
- *        for pluralization and interpolation. Special key: "locale" to override the
- *        currently configured locale.
- * @return String The translated message string.
- */
-function t2($singular, $plural, $count, $options=array()) {
-  return I18n::instance()->translate(array("one" => $singular, "other" => $plural),
-                                     array_merge($options, array("count" => $count)));
-}
-
-class I18n_Core {
-  private static $_instance;
-  private $_config = array();
-  private $_call_log = array();
-  private $_cache = array();
-
-  private function __construct($config) {
-    $this->_config = $config;
-    $this->locale($config['default_locale']);
-  }
-
-  public static function instance($config=null) {
-    if (self::$_instance == NULL || isset($config)) {
-      $config = isset($config) ? $config : Kohana::config('locale');
-      if (empty($config['default_locale'])) {
-        $config['default_locale'] = module::get_var('gallery', 'default_locale');
-      }
-      self::$_instance = new I18n_Core($config);
-    }
-
-    return self::$_instance;
-  }
-
-  public function locale($locale=null) {
-    if ($locale) {
-      $this->_config['default_locale'] = $locale;
-      // Attempt to set PHP's locale as well (for number formatting, collation, etc.)
-      // TODO: See G2 for better fallack code.
-      $locale_prefs = array($locale);
-      $locale_prefs[] = 'en_US';
-      $new_locale = setlocale(LC_ALL, $locale_prefs);
-      if (is_string($new_locale) && strpos($new_locale, 'tr') === 0) {
-        // Make PHP 5 work with Turkish (the localization results are mixed though).
-        // Hack for http://bugs.php.net/18556
-        setlocale(LC_CTYPE, 'C');
-      }
-    }
-    return $this->_config['default_locale'];
-  }
-
-  /**
-   * Translates a localizable message.
-   *
-   * Security:
-   * The returned string is safe for use in HTML (it contains a safe subset of HTML and
-   * interpolation parameters are converted to HTML entities).
-   * For use in JavaScript, please call ->for_js() on it.
-   *
-   * @param $message String|array The message to be translated. E.g. "Hello world"
-   *                 or array("one" => "One album", "other" => "%count albums")
-   * @param $options array (optional) Options array for key value pairs which are used
-   *        for pluralization and interpolation. Special keys are "count" and "locale",
-   *        the latter to override the currently configured locale.
-   * @return String The translated message string.
-   */
-  public function translate($message, $options=array()) {
-    $locale = empty($options['locale']) ? $this->_config['default_locale'] : $options['locale'];
-    $count = isset($options['count']) ? $options['count'] : null;
-    $values = $options;
-    unset($values['locale']);
-    $this->log($message, $options);
-
-    $entry = $this->lookup($locale, $message);
-
-    if (null === $entry) {
-      // Default to the root locale.
-      $entry = $message;
-      $locale = $this->_config['root_locale'];
-    }
-
-    $entry = $this->pluralize($locale, $entry, $count);
-
-    $entry = $this->interpolate($locale, $entry, $values);
-
-    return SafeString::of_safe_html($entry);
-  }
-
-  private function lookup($locale, $message) {
-    if (!isset($this->_cache[$locale])) {
-      $this->_cache[$locale] = array();
-      // TODO: Load data from locale file instead of the DB.
-      foreach (Database::instance()
-               ->select("key", "translation")
-               ->from("incoming_translations")
-               ->where(array("locale" => $locale))
-               ->get()
-               ->as_array() as $row) {
-        $this->_cache[$locale][$row->key] = unserialize($row->translation);
-      }
-
-      // Override incoming with outgoing...
-      foreach (Database::instance()
-               ->select("key", "translation")
-               ->from("outgoing_translations")
-               ->where(array("locale" => $locale))
-               ->get()
-               ->as_array() as $row) {
-        $this->_cache[$locale][$row->key] = unserialize($row->translation);
-      }
-    }
-
-    $key = self::get_message_key($message);
-
-    if (isset($this->_cache[$locale][$key])) {
-      return $this->_cache[$locale][$key];
-    } else {
-      return null;
-    }
-  }
-
-  public function has_translation($message, $options=null) {
-    $locale = empty($options['locale']) ? $this->_config['default_locale'] : $options['locale'];
-
-    $entry = $this->lookup($locale, $message);
-
-    if (null === $entry) {
-      return false;
-    } else if (!is_array($message)) {
-      return $entry !== '';
-    } else {
-      if (!is_array($entry) || empty($entry)) {
-        return false;
-      }
-      // It would be better to verify that all the locale's plural forms have a non-empty
-      // translation, but this is fine for now.
-      foreach ($entry as $value) {
-        if ($value === '') {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-
-  static function get_message_key($message) {
-    $as_string = is_array($message) ? implode('|', $message) : $message;
-    return md5($as_string);
-  }
-
-  static function is_plural_message($message) {
-    return is_array($message);
-  }
-
-  private function interpolate($locale, $string, $key_values) {
-    // TODO: Handle locale specific number formatting.
-
-    // Replace x_y before replacing x.
-    krsort($key_values, SORT_STRING);
-
-    $keys = array();
-    $values = array();
-    foreach ($key_values as $key => $value) {
-      $keys[] = "%$key";
-      $values[] = new SafeString($value);
-    }
-    return str_replace($keys, $values, $string);
-  }
-
-  private function pluralize($locale, $entry, $count) {
-    if (!is_array($entry)) {
-      return $entry;
-    }
-
-    $plural_key = self::get_plural_key($locale, $count);
-    if (!isset($entry[$plural_key])) {
-      // Fallback to the default plural form.
-      $plural_key = 'other';
-    }
-
-    if (isset($entry[$plural_key])) {
-      return $entry[$plural_key];
-    } else {
-      // Fallback to just any plural form.
-      list ($plural_key, $string) = each($entry);
-      return $string;
-    }
-  }
-
-  private function log($message, $options) {
-    $key = self::get_message_key($message);
-    isset($this->_call_log[$key]) or $this->_call_log[$key] = array($message, $options);
-  }
-
-  public function call_log() {
-    return $this->_call_log;
-  }
-
-  private static function get_plural_key($locale, $count) {
-    $parts = explode('_', $locale);
-    $language = $parts[0];
-
-    // Data from CLDR 1.6 (http://unicode.org/cldr/data/common/supplemental/plurals.xml).
-    // Docs: http://www.unicode.org/cldr/data/charts/supplemental/language_plural_rules.html
-    switch ($language) {
-      case 'az':
-      case 'fa':
-      case 'hu':
-      case 'ja':
-      case 'ko':
-      case 'my':
-      case 'to':
-      case 'tr':
-      case 'vi':
-      case 'yo':
-      case 'zh':
-      case 'bo':
-      case 'dz':
-      case 'id':
-      case 'jv':
-      case 'ka':
-      case 'km':
-      case 'kn':
-      case 'ms':
-      case 'th':
-        return 'other';
-
-      case 'ar':
-        if ($count == 0) {
-          return 'zero';
-        } else if ($count == 1) {
-          return 'one';
-        } else if ($count == 2) {
-          return 'two';
-        } else if (is_int($count) && ($i = $count % 100) >= 3 && $i <= 10) {
-          return 'few';
-        } else if (is_int($count) && ($i = $count % 100) >= 11 && $i <= 99) {
-          return 'many';
-        } else {
-          return 'other';
-        }
-
-      case 'pt':
-      case 'am':
-      case 'bh':
-      case 'fil':
-      case 'tl':
-      case 'guw':
-      case 'hi':
-      case 'ln':
-      case 'mg':
-      case 'nso':
-      case 'ti':
-      case 'wa':
-        if ($count == 0 || $count == 1) {
-          return 'one';
-        } else {
-          return 'other';
-        }
-
-      case 'fr':
-        if ($count >= 0 and $count < 2) {
-          return 'one';
-        } else {
-          return 'other';
-        }
-
-      case 'lv':
-        if ($count == 0) {
-          return 'zero';
-        } else if ($count % 10 == 1 && $count % 100 != 11) {
-          return 'one';
-        } else {
-          return 'other';
-        }
-
-      case 'ga':
-      case 'se':
-      case 'sma':
-      case 'smi':
-      case 'smj':
-      case 'smn':
-      case 'sms':
-        if ($count == 1) {
-          return 'one';
-        } else if ($count == 2) {
-          return 'two';
-        } else {
-          return 'other';
-        }
-
-      case 'ro':
-      case 'mo':
-        if ($count == 1) {
-          return 'one';
-        } else if (is_int($count) && $count == 0 && ($i = $count % 100) >= 1 && $i <= 19) {
-          return 'few';
-        } else {
-          return 'other';
-        }
-
-      case 'lt':
-        if (is_int($count) && $count % 10 == 1 && $count % 100 != 11) {
-          return 'one';
-        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 9 && ($i = $count % 100) < 11 && $i > 19) {
-          return 'few';
-        } else {
-          return 'other';
-        }
-
-      case 'hr':
-      case 'ru':
-      case 'sr':
-      case 'uk':
-      case 'be':
-      case 'bs':
-      case 'sh':
-        if (is_int($count) && $count % 10 == 1 && $count % 100 != 11) {
-          return 'one';
-        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 4 && ($i = $count % 100) < 12 && $i > 14) {
-          return 'few';
-        } else if (is_int($count) && ($count % 10 == 0 || (($i = $count % 10) >= 5 && $i <= 9) || (($i = $count % 100) >= 11 && $i <= 14))) {
-          return 'many';
-        } else {
-          return 'other';
-        }
-
-      case 'cs':
-      case 'sk':
-        if ($count == 1) {
-          return 'one';
-        } else if (is_int($count) && $count >= 2 && $count <= 4) {
-          return 'few';
-        } else {
-          return 'other';
-        }
-
-      case 'pl':
-        if ($count == 1) {
-          return 'one';
-        } else if (is_int($count) && ($i = $count % 10) >= 2 && $i <= 4 &&
-                   ($i = $count % 100) < 12 && $i > 14 && ($i = $count % 100) < 22 && $i > 24) {
-          return 'few';
-        } else {
-          return 'other';
-        }
-
-      case 'sl':
-        if ($count % 100 == 1) {
-          return 'one';
-        } else if ($count % 100 == 2) {
-          return 'two';
-        } else if (is_int($count) && ($i = $count % 100) >= 3 && $i <= 4) {
-          return 'few';
-        } else {
-          return 'other';
-        }
-
-      case 'mt':
-        if ($count == 1) {
-          return 'one';
-        } else if ($count == 0 || is_int($count) && ($i = $count % 100) >= 2 && $i <= 10) {
-          return 'few';
-        } else if (is_int($count) && ($i = $count % 100) >= 11 && $i <= 19) {
-          return 'many';
-        } else {
-          return 'other';
-        }
-
-      case 'mk':
-        if ($count % 10 == 1) {
-          return 'one';
-        } else {
-          return 'other';
-        }
-
-      case 'cy':
-        if ($count == 1) {
-          return 'one';
-        } else if ($count == 2) {
-          return 'two';
-        } else if ($count == 8 || $count == 11) {
-          return 'many';
-        } else {
-          return 'other';
-        }
-
-      default: // en, de, etc.
-        return $count == 1 ? 'one' : 'other';
-    }
-  }
-}
diff --git a/modules/gallery/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index 9010606a..d0555cbf 100644
--- a/modules/gallery/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class I18n_Test extends Unit_Test_Case {
+class Gallery_I18n_Test extends Unit_Test_Case {
   private $i18n;
 
   public function setup() {
@@ -26,7 +26,7 @@ class I18n_Test extends Unit_Test_Case {
         'root_locale' => 'en',
         'default_locale' => 'te_ST',
         'locale_dir' => VARPATH . 'locale/');
-    $this->i18n = I18n::instance($config);
+    $this->i18n = Gallery_I18n::instance($config);
 
     ORM::factory("incoming_translation")
       ->where("locale", "te_ST")
@@ -43,7 +43,7 @@ class I18n_Test extends Unit_Test_Case {
     foreach ($messages_te_ST as $data) {
       list ($message, $translation) = $data;
       $entry = ORM::factory("incoming_translation");
-      $entry->key = I18n::get_message_key($message);
+      $entry->key = Gallery_I18n::get_message_key($message);
       $entry->message = serialize($message);
       $entry->translation = serialize($translation);
       $entry->locale = 'te_ST';
-- 
cgit v1.2.3


From 01e10d1708c024dcf2471f35cd3fd7625f0ad5c9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 24 Nov 2009 19:24:38 -0800
Subject: K2.4 has its own parentheses support

---
 modules/gallery/libraries/MY_Database.php | 38 +------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index c56f16e8..0f29c09b 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -17,45 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Database extends Database_Core {
+abstract class Database extends Database_Core {
   protected $_table_names;
 
-  public function open_paren() {
-    $this->where[] = "(";
-    return $this;
-  }
-
-  public function close_paren() {
-    // Search backwards for the last opening paren and resolve it
-    $i = count($this->where) - 1;
-    $this->where[$i] .= ")";
-    while (--$i >= 0) {
-      if ($this->where[$i] == "(") {
-        // Remove the paren from the where clauses, and add it to the right of the operator of the
-        // next where clause.  If removing the paren makes the next where clause the first element
-        // in the where list, then the operator shouldn't be there.  It's there because we
-        // calculate whether or not we need an operator based on the number of where clauses, and
-        // the open paren seems like a where clause even though it isn't.
-        array_splice($this->where, $i, 1);
-        $this->where[$i] = preg_replace("/^(AND|OR) /", $i ? "\\1 (" : "(", $this->where[$i]);
-        return $this;
-      }
-    }
-
-    throw new Kohana_Database_Exception('database.missing_open_paren');
-  }
-
-  /**
-   * Parse the query string and convert any strings of the form `\([a-zA-Z0-9_]*?)\]
-   * table prefix . $1
-   */
-  public function query($sql = '') {
-    if (!empty($sql)) {
-      $sql = $this->add_table_prefixes($sql);
-    }
-    return parent::query($sql);
-  }
-
   public function add_table_prefixes($sql) {
     $prefix = $this->config["table_prefix"];
     if (strpos($sql, "SHOW TABLES") === 0) {
-- 
cgit v1.2.3


From 7dbb84bb5450b15154acc2b448ab1979ed072515 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 24 Nov 2009 19:24:51 -0800
Subject: Bootstrap has moved in K24

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index f6285257..8bfbbb54 100644
--- a/index.php
+++ b/index.php
@@ -87,4 +87,4 @@ if (file_exists("local.php")) {
 }
 
 // Initialize.
-require SYSPATH . "core/Bootstrap" . EXT;
+require APPPATH . "Bootstrap" . EXT;
-- 
cgit v1.2.3


From e201536d82d6ed49b7c4832f367a01029de05dd6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 24 Nov 2009 19:25:14 -0800
Subject: K24 has separate log sinks, this configures the file based log sink

---
 modules/gallery/config/log_file.php | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 modules/gallery/config/log_file.php

diff --git a/modules/gallery/config/log_file.php b/modules/gallery/config/log_file.php
new file mode 100644
index 00000000..3d3f8edd
--- /dev/null
+++ b/modules/gallery/config/log_file.php
@@ -0,0 +1,11 @@
+
Date: Wed, 25 Nov 2009 13:22:24 -0800
Subject: Preliminary work to cut over to Kohana 2.4 - Kohana::log() ->
 Kohana_Log::add() - Kohana::config_XXX -> Kohana_Config::instance()->XXX -
 Implement View::set_global in MY_View - Updated Cache_Database_Driver to
 latest APIs - ORM::$loaded -> ORM::loaded() - Updated item::viewable() to use
 K2.4 parenthesization

---
 modules/akismet/helpers/akismet.php                |  4 +-
 modules/comment/controllers/admin_comments.php     |  2 +-
 modules/comment/models/comment.php                 |  2 +-
 modules/comment/tests/Comment_Event_Test.php       |  2 +-
 modules/digibug/controllers/digibug.php            |  2 +-
 modules/exif/helpers/exif.php                      |  4 +-
 modules/g2_import/helpers/g2_import.php            | 14 ++--
 modules/g2_import/helpers/g2_import_task.php       |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  8 +-
 modules/gallery/controllers/albums.php             |  3 +-
 modules/gallery/controllers/file_proxy.php         |  6 +-
 modules/gallery/controllers/l10n_client.php        |  6 +-
 modules/gallery/controllers/permissions.php        |  2 +-
 modules/gallery/controllers/rest.php               |  4 +-
 modules/gallery/controllers/simple_uploader.php    |  2 +-
 modules/gallery/helpers/MY_url.php                 |  4 +-
 modules/gallery/helpers/access.php                 | 18 ++--
 modules/gallery/helpers/album.php                  |  2 +-
 modules/gallery/helpers/auth.php                   |  2 +-
 modules/gallery/helpers/gallery_graphics.php       |  2 +-
 modules/gallery/helpers/gallery_task.php           |  2 +-
 modules/gallery/helpers/graphics.php               |  2 +-
 modules/gallery/helpers/identity.php               |  4 +-
 modules/gallery/helpers/item.php                   | 18 ++--
 modules/gallery/helpers/l10n_client.php            |  2 +-
 modules/gallery/helpers/l10n_scanner.php           |  2 +-
 modules/gallery/helpers/model_cache.php            |  4 +-
 modules/gallery/helpers/module.php                 | 35 ++++----
 modules/gallery/helpers/movie.php                  |  2 +-
 modules/gallery/helpers/photo.php                  |  2 +-
 modules/gallery/helpers/site_status.php            |  4 +-
 modules/gallery/helpers/task.php                   |  8 +-
 modules/gallery/helpers/theme.php                  |  2 +-
 modules/gallery/libraries/Admin_View.php           |  2 +-
 modules/gallery/libraries/Gallery_I18n.php         |  8 +-
 modules/gallery/libraries/Gallery_View.php         |  6 +-
 modules/gallery/libraries/IdentityProvider.php     |  4 +-
 modules/gallery/libraries/MY_ORM.php               | 10 ---
 modules/gallery/libraries/MY_View.php              | 27 +++++-
 modules/gallery/libraries/ORM_MPTT.php             | 56 ++++++++-----
 modules/gallery/libraries/SafeString.php           |  2 +-
 modules/gallery/libraries/Sendmail.php             |  4 +-
 modules/gallery/libraries/Theme_View.php           |  2 +-
 .../gallery/libraries/drivers/Cache/Database.php   | 95 ++++++++++++----------
 modules/gallery/models/item.php                    |  6 +-
 modules/gallery/models/log.php                     |  2 +-
 modules/gallery/tests/Access_Helper_Test.php       |  8 +-
 modules/gallery/views/kohana_error_page.php        |  2 +-
 modules/notification/helpers/notification.php      |  2 +-
 .../notification/helpers/notification_event.php    | 28 +++----
 modules/search/helpers/search.php                  |  2 +-
 modules/server_add/controllers/server_add.php      |  4 +-
 modules/tag/controllers/admin_tags.php             |  8 +-
 modules/tag/helpers/tag.php                        |  2 +-
 modules/tag/helpers/tag_event.php                  |  2 +-
 modules/tag/helpers/tag_rss.php                    |  2 +-
 modules/user/controllers/admin_users.php           |  2 +-
 modules/user/controllers/password.php              |  2 +-
 modules/user/helpers/group.php                     |  4 +-
 modules/user/helpers/user.php                      |  4 +-
 modules/user/models/group.php                      |  2 +-
 modules/user/models/user.php                       |  2 +-
 modules/user/tests/User_Groups_Test.php            |  4 +-
 63 files changed, 257 insertions(+), 225 deletions(-)

diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php
index 43549ffa..46a305b2 100644
--- a/modules/akismet/helpers/akismet.php
+++ b/modules/akismet/helpers/akismet.php
@@ -166,7 +166,7 @@ class akismet_Core {
     }
     $response = "";
 
-    Kohana::log("debug", "Send request\n" . print_r($http_request, 1));
+    Kohana_Log::add("debug", "Send request\n" . print_r($http_request, 1));
     if (false !== ($fs = @fsockopen($host, 80, $errno, $errstr, 5))) {
       fwrite($fs, $http_request);
       while ( !feof($fs) ) {
@@ -181,7 +181,7 @@ class akismet_Core {
     } else {
       throw new Exception("@todo CONNECTION TO SPAM SERVICE FAILED");
     }
-    Kohana::log("debug", "Received response\n" . print_r($response, 1));
+    Kohana_Log::add("debug", "Received response\n" . print_r($response, 1));
 
     return $response;
   }
diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 13532c4e..1a9f0e6a 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -110,7 +110,7 @@ class Admin_Comments_Controller extends Admin_Controller {
 
     $comment = ORM::factory("comment", $id);
     $orig = clone $comment;
-    if ($comment->loaded) {
+    if ($comment->loaded()) {
       $comment->state = $state;
       $comment->save();
     }
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index bb9b8833..59b85233 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -59,7 +59,7 @@ class Comment_Model extends ORM {
   public function save() {
     if (!empty($this->changed)) {
       $this->updated = time();
-      if (!$this->loaded && empty($this->created)) {
+      if (!$this->loaded() && empty($this->created)) {
         $this->created = $this->updated;
         $created = true;
       }
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index f650cabf..ff7f1c26 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -27,6 +27,6 @@ class Comment_Event_Test extends Unit_Test_Case {
     $album->delete();
 
     $deleted_comment = ORM::factory("comment", $comment->id);
-    $this->assert_false($deleted_comment->loaded);
+    $this->assert_false($deleted_comment->loaded());
   }
 }
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 1bb2691b..cef42b2d 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -81,7 +81,7 @@ class Digibug_Controller extends Controller {
     }
 
     $proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
-    if (!$proxy->loaded || !$proxy->item->loaded) {
+    if (!$proxy->loaded() || !$proxy->item->loaded()) {
       Kohana::show_404();
     }
 
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 5ddd09d4..b6a55679 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -74,7 +74,7 @@ class exif_Core {
     $item->save();
 
     $record = ORM::factory("exif_record")->where("item_id", $item->id)->find();
-    if (!$record->loaded) {
+    if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
     $record->data = serialize($keys);
@@ -88,7 +88,7 @@ class exif_Core {
     $record = ORM::factory("exif_record")
       ->where("item_id", $item->id)
       ->find();
-    if (!$record->loaded) {
+    if (!$record->loaded()) {
       return array();
     }
 
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 202a0e92..1e835a59 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -458,7 +458,7 @@ class g2_import_Core {
     switch ($g2_type) {
     case "GalleryPhotoItem":
       if (!in_array($g2_item->getMimeType(), array("image/jpeg", "image/gif", "image/png"))) {
-        Kohana::log("alert", "$g2_path is an unsupported image type; using a placeholder gif");
+        Kohana_Log::add("alert", "$g2_path is an unsupported image type; using a placeholder gif");
         $message[] = t("'%path' is an unsupported image type, using a placeholder",
                      array("path" => $g2_path));
         $g2_path = MODPATH . "g2_import/data/broken-image.gif";
@@ -473,7 +473,7 @@ class g2_import_Core {
           self::_decode_html_special_chars(self::extract_description($g2_item)),
           self::map($g2_item->getOwnerId()));
       } catch (Exception $e) {
-        Kohana::log(
+        Kohana_Log::add(
           "alert", "Corrupt image $g2_path\n" . $e->__toString());
         $message[] = t("Corrupt image '%path'", array("path" => $g2_path));
         $message[] = $e->__toString();
@@ -493,13 +493,13 @@ class g2_import_Core {
             self::_decode_html_special_chars(self::extract_description($g2_item)),
             self::map($g2_item->getOwnerId()));
         } catch (Exception $e) {
-          Kohana::log("alert", "Corrupt movie $g2_path\n" . $e->__toString());
+          Kohana_Log::add("alert", "Corrupt movie $g2_path\n" . $e->__toString());
           $message[] = t("Corrupt movie '%path'", array("path" => $g2_path));
           $message[] = $e->__toString();
           $corrupt = 1;
         }
       } else {
-        Kohana::log("alert", "$g2_path is an unsupported movie type");
+        Kohana_Log::add("alert", "$g2_path is an unsupported movie type");
         $message[] = t("'%path' is an unsupported movie type", array("path" => $g2_path));
         $corrupt = 1;
       }
@@ -868,7 +868,7 @@ class g2_import_Core {
   static function map($g2_id) {
     if (!array_key_exists($g2_id, self::$map)) {
       $g2_map = ORM::factory("g2_map")->where("g2_id", $g2_id)->find();
-      self::$map[$g2_id] = $g2_map->loaded ? $g2_map->g3_id : null;
+      self::$map[$g2_id] = $g2_map->loaded() ? $g2_map->g3_id : null;
     }
 
     return self::$map[$g2_id];
@@ -887,7 +887,7 @@ class g2_import_Core {
 
   static function log($msg) {
     message::warning($msg);
-    Kohana::log("alert", $msg);
+    Kohana_Log::add("alert", $msg);
   }
 }
 
@@ -906,7 +906,7 @@ function g2() {
   $args = func_get_arg(0);
   $ret = array_shift($args);
   if ($ret) {
-    Kohana::log("error", "Gallery 2 call failed with: " . $ret->getAsText());
+    Kohana_Log::add("error", "Gallery 2 call failed with: " . $ret->getAsText());
     throw new Exception("@todo G2_FUNCTION_FAILED");
   }
   if (count($args) == 1) {
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index 47a205bd..fef0d186 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -66,7 +66,7 @@ class g2_import_task_Core {
 
       $root_g2_id = g2(GalleryCoreApi::getDefaultAlbumId());
       $root = ORM::factory("g2_map")->where("g2_id", $root_g2_id)->find();
-      if (!$root->loaded) {
+      if (!$root->loaded()) {
         $root->g2_id = $root_g2_id;
         $root->g3_id = 1;
         $root->save();
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 66bcce55..fe5059e7 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -75,7 +75,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
     $view = new View("admin_maintenance_task.html");
@@ -97,7 +97,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
     $view = new View("admin_maintenance_show_log.html");
@@ -114,7 +114,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
 
@@ -184,7 +184,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     try {
       $task = task::run($task_id);
     } catch (Exception $e) {
-      Kohana::log(
+      Kohana_Log::add(
         "error",
         sprintf(
           "%s in %s at line %s:\n%s", $e->getMessage(), $e->getFile(),
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index e67df6f6..cc63d43f 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -66,6 +66,7 @@ class Albums_Controller extends Items_Controller {
 
     $template = new Theme_View("page.html", "collection", "album");
     $template->set_global("page", $page);
+    $template->set_global("page_title", null);
     $template->set_global("max_pages", $max_pages);
     $template->set_global("page_size", $page_size);
     $template->set_global("item", $album);
@@ -76,7 +77,7 @@ class Albums_Controller extends Items_Controller {
 
     // We can't use math in ORM or the query builder, so do this by hand.  It's important
     // that we do this with math, otherwise concurrent accesses will damage accuracy.
-    Database::instance()->query(
+    db::query(
       "UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $album->id");
 
     print $template;
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index acfd6eb9..11d858c0 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -58,7 +58,7 @@ class File_Proxy_Controller extends Controller {
 
     // We now have the relative path to the item.  Search for it in the path cache
     $item = ORM::factory("item")->where("relative_path_cache", $path)->find();
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       // We didn't turn it up.  It's possible that the relative_path_cache is out of date here.
       // There was fallback code, but bharat deleted it in 8f1bca74.  If it turns out to be
       // necessary, it's easily resurrected.
@@ -70,14 +70,14 @@ class File_Proxy_Controller extends Controller {
         foreach (array("flv", "mp4") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $path);
           $item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
-          if ($item->loaded) {
+          if ($item->loaded()) {
             break;
           }
         }
       }
     }
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       kohana::show_404();
     }
 
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 3801e6aa..2eda741c 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -33,7 +33,7 @@ class L10n_Client_Controller extends Controller {
                       "locale" => "root"))
         ->find();
 
-    if (!$root_message->loaded) {
+    if (!$root_message->loaded()) {
       throw new Exception("@todo bad request data / illegal state");
     }
     $is_plural = Gallery_I18n::is_plural_message(unserialize($root_message->message));
@@ -60,7 +60,7 @@ class L10n_Client_Controller extends Controller {
                     "locale" => $locale))
       ->find();
 
-    if (!$entry->loaded) {
+    if (!$entry->loaded()) {
       $entry->key = $key;
       $entry->locale = $locale;
       $entry->message = $root_message->message;
@@ -74,7 +74,7 @@ class L10n_Client_Controller extends Controller {
                     "locale" => $locale))
       ->find();
 
-    if (!$entry_from_incoming->loaded) {
+    if (!$entry_from_incoming->loaded()) {
       $entry->base_revision = $entry_from_incoming->revision;
     }
 
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 99943fbb..e03f41a9 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -57,7 +57,7 @@ class Permissions_Controller extends Controller {
     access::required("view", $item);
     access::required("edit", $item);
 
-    if (!empty($group) && $perm->loaded && $item->loaded) {
+    if (!empty($group) && $perm->loaded() && $item->loaded()) {
       switch($command) {
       case "allow":
         access::allow($group, $perm->name, $item);
diff --git a/modules/gallery/controllers/rest.php b/modules/gallery/controllers/rest.php
index 2edf079f..087f2c29 100644
--- a/modules/gallery/controllers/rest.php
+++ b/modules/gallery/controllers/rest.php
@@ -82,7 +82,7 @@ class REST_Controller extends Controller {
     }
 
     $resource = ORM::factory($this->resource_type, (int)$function);
-    if (!$resource->loaded && $request_method != "post") {
+    if (!$resource->loaded() && $request_method != "post") {
       return Kohana::show_404();
     }
 
@@ -111,7 +111,7 @@ class REST_Controller extends Controller {
     }
 
     $resource = ORM::factory($this->resource_type, $resource_id);
-    if (!$resource->loaded) {
+    if (!$resource->loaded()) {
       return Kohana::show_404();
     }
 
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index 37753ff3..5d32e35f 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -72,7 +72,7 @@ class Simple_Uploader_Controller extends Controller {
           module::event("add_photos_form_completed", $item, $form);
         }
       } catch (Exception $e) {
-        Kohana::log("alert", $e->__toString());
+        Kohana_Log::add("alert", $e->__toString());
         if (file_exists($temp_filename)) {
           unlink($temp_filename);
         }
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 368c947e..e5eefad7 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -32,7 +32,7 @@ class url extends url_Core {
     }
 
     $item = self::get_item_from_uri(Router::$current_uri);
-    if ($item && $item->loaded) {
+    if ($item && $item->loaded()) {
       Router::$controller = "{$item->type}s";
       Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
       Router::$method = $item->id;
@@ -51,7 +51,7 @@ class url extends url_Core {
     // but failing that, walk down the tree until we find it.  The fallback code will fix caches
     // as it goes, so it'll never be run frequently.
     $item = ORM::factory("item")->where("relative_url_cache", $current_uri)->find();
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       $count = count(Router::$segments);
       foreach (ORM::factory("item")
                ->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index c1c1f9d1..9d27181a 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -91,7 +91,7 @@ class access_Core {
    * @return boolean
    */
   static function user_can($user, $perm_name, $item) {
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return false;
     }
 
@@ -101,7 +101,7 @@ class access_Core {
 
     $resource = $perm_name == "view" ?
       $item : model_cache::get("access_cache", $item->id, "item_id");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups->find_all() as $group) {
       if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
       }
@@ -175,7 +175,7 @@ class access_Core {
       ->limit(1)
       ->find();
 
-    if ($lock->loaded) {
+    if ($lock->loaded()) {
       return $lock;
     } else {
       return null;
@@ -201,7 +201,7 @@ class access_Core {
     if (!($group instanceof Group_Definition)) {
       throw new Exception("@todo PERMISSIONS_ONLY_WORK_ON_GROUPS");
     }
-    if (!$album->loaded) {
+    if (!$album->loaded()) {
       throw new Exception("@todo INVALID_ALBUM $album->id");
     }
     if (!$album->is_album()) {
@@ -282,7 +282,7 @@ class access_Core {
   */
   static function register_permission($name, $display_name) {
     $permission = ORM::factory("permission", $name);
-    if ($permission->loaded) {
+    if ($permission->loaded()) {
       throw new Exception("@todo PERMISSION_ALREADY_EXISTS $name");
     }
     $permission->name = $name;
@@ -305,7 +305,7 @@ class access_Core {
       self::_drop_columns($name, $group);
     }
     $permission = ORM::factory("permission")->where("name", $name)->find();
-    if ($permission->loaded) {
+    if ($permission->loaded()) {
       $permission->delete();
     }
   }
@@ -342,7 +342,7 @@ class access_Core {
    */
   static function add_item($item) {
     $access_intent = ORM::factory("access_intent", $item->id);
-    if ($access_intent->loaded) {
+    if ($access_intent->loaded()) {
       throw new Exception("@todo ITEM_ALREADY_ADDED $item->id");
     }
     $access_intent = ORM::factory("access_intent");
@@ -497,7 +497,7 @@ class access_Core {
         ->orderby("left_ptr", "DESC")
         ->limit(1)
         ->find();
-      if ($tmp_item->loaded) {
+      if ($tmp_item->loaded()) {
         $item = $tmp_item;
       }
     }
@@ -568,7 +568,7 @@ class access_Core {
         ->orderby("left_ptr", "DESC")
         ->limit(1)
         ->find();
-      if ($tmp_item->loaded) {
+      if ($tmp_item->loaded()) {
         $item = $tmp_item;
       }
     }
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 72a79a75..c82a5509 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -34,7 +34,7 @@ class album_Core {
    * @return Item_Model
    */
   static function create($parent, $name, $title, $description=null, $owner_id=null, $slug=null) {
-    if (!$parent->loaded || !$parent->is_album()) {
+    if (!$parent->loaded() || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
 
diff --git a/modules/gallery/helpers/auth.php b/modules/gallery/helpers/auth.php
index 9c69cecd..21a39bfb 100644
--- a/modules/gallery/helpers/auth.php
+++ b/modules/gallery/helpers/auth.php
@@ -46,7 +46,7 @@ class auth_Core {
       try {
         Session::instance()->destroy();
       } catch (Exception $e) {
-        Kohana::log("error", $e);
+        Kohana_Log::add("error", $e);
       }
       module::event("user_logout", $user);
     }
diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index c24d2bde..ce08bbd7 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -123,7 +123,7 @@ class gallery_graphics_Core {
 
       module::event("graphics_composite_completed", $input_file, $output_file, $options);
     } catch (ErrorException $e) {
-      Kohana::log("error", $e->get_message());
+      Kohana_Log::add("error", $e->get_message());
     }
   }
 }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index e0b03682..4d6de3ba 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -66,7 +66,7 @@ class gallery_task_Core {
         }
 
         $item = ORM::factory("item", $row->id);
-        if ($item->loaded) {
+        if ($item->loaded()) {
           try {
             graphics::generate($item);
             $completed++;
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index d6a2f00c..a78cadd0 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -171,7 +171,7 @@ class graphics_Core {
     } catch (Exception $e) {
       // Something went wrong rebuilding the image.  Leave it dirty and move on.
       // @todo we should handle this better.
-      Kohana::log("error", "Caught exception rebuilding image: {$item->title}\n" .
+      Kohana_Log::add("error", "Caught exception rebuilding image: {$item->title}\n" .
                   $e->getMessage() . "\n" . $e->getTraceAsString());
       throw $e;
     }
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 72e3312d..05614559 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -75,14 +75,14 @@ class identity_Core {
 
       if (!$session->get("group_ids")) {
         $ids = array();
-        foreach ($user->groups as $group) {
+        foreach ($user->groups->find_all() as $group) {
           $ids[] = $group->id;
         }
         $session->set("group_ids", $ids);
       }
     } catch (Exception $e) {
       // Log it, so we at least have so notification that we swallowed the exception.
-      Kohana::log("error", "Load_user Exception: " . $e->__toString());
+      Kohana_Log::add("error", "Load_user Exception: " . $e->__toString());
       try {
         Session::instance()->destroy();
       } catch (Exception $e) {
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 8f96c3d9..109fa6f8 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -156,13 +156,7 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        // Separate the first restriction from the rest to make it easier for us to formulate
-        // our where clause below
-        if (empty($view_restrictions)) {
-          $view_restrictions[0] = "items.view_$id";
-        } else {
-          $view_restrictions[1]["items.view_$id"] = access::ALLOW;
-        }
+        $view_restrictions[] = "items.view_$id";
       }
     }
     switch (count($view_restrictions)) {
@@ -170,14 +164,14 @@ class item_Core {
       break;
 
     case 1:
-      $model->where($view_restrictions[0], access::ALLOW);
+      $model->where($view_restrictions[0], "=", access::ALLOW);
       break;
 
     default:
-      $model->open_paren();
-      $model->where($view_restrictions[0], access::ALLOW);
-      $model->orwhere($view_restrictions[1]);
-      $model->close_paren();
+      $model
+        ->and_open()
+        ->or_where($view_restrictions, "=", access::ALLOW)
+        ->close();
       break;
     }
 
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 3460cc65..aaf6ff46 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -136,7 +136,7 @@ class l10n_client_Core {
       $entry = ORM::factory("incoming_translation")
         ->where(array("key" => $key, "locale" => $locale))
         ->find();
-      if (!$entry->loaded) {
+      if (!$entry->loaded()) {
         // @todo Load a message key -> message (text) dict into memory outside of this loop
         $root_entry = ORM::factory("incoming_translation")
           ->where(array("key" => $key, "locale" => "root"))
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index e36d419d..6c09a686 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -43,7 +43,7 @@ class l10n_scanner_Core {
     }
 
     $entry = ORM::factory("incoming_translation", array("key" => $key));
-    if (!$entry->loaded) {
+    if (!$entry->loaded()) {
       $entry->key = $key;
       $entry->message = serialize($message);
       $entry->locale = "root";
diff --git a/modules/gallery/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index a3e09862..302e42d9 100644
--- a/modules/gallery/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
@@ -22,8 +22,8 @@ class model_cache_Core {
 
   static function get($model_name, $id, $field_name="id") {
     if (TEST_MODE || empty(self::$cache->$model_name->$field_name->$id)) {
-      $model = ORM::factory($model_name)->where($field_name, $id)->find();
-      if (!$model->loaded) {
+      $model = ORM::factory($model_name)->where($field_name, "=", $id)->find();
+      if (!$model->loaded()) {
         throw new Exception("@todo MISSING_MODEL $model_name:$id");
       }
       self::$cache->$model_name->$field_name->$id = $model;
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e6c196ce..e54a4352 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -36,13 +36,13 @@ class module_Core {
    */
   static function set_version($module_name, $version) {
     $module = self::get($module_name);
-    if (!$module->loaded) {
+    if (!$module->loaded()) {
       $module->name = $module_name;
       $module->active = $module_name == "gallery";  // only gallery is active by default
     }
     $module->version = $version;
     $module->save();
-    Kohana::log("debug", "$module_name: version is now $version");
+    Kohana_Log::add("debug", "$module_name: version is now $version");
   }
 
   /**
@@ -126,9 +126,10 @@ class module_Core {
    * @param string $module_name
    */
   static function install($module_name) {
-    $kohana_modules = Kohana::config("core.modules");
+    $config = Kohana_Config::instance();
+    $kohana_modules = $config->get("core.modules");
     array_unshift($kohana_modules, MODPATH . $module_name);
-    Kohana::config_set("core.modules",  $kohana_modules);
+    $config->set("core.modules",  $kohana_modules);
 
     // Rebuild the include path so the module installer can benefit from auto loading
     Kohana::include_paths(true);
@@ -142,7 +143,7 @@ class module_Core {
 
     // Now the module is installed but inactive, so don't leave it in the active path
     array_shift($kohana_modules);
-    Kohana::config_set("core.modules",  $kohana_modules);
+    $config->set("core.modules",  $kohana_modules);
 
     log::success(
       "module", t("Installed module %module_name", array("module_name" => $module_name)));
@@ -193,9 +194,10 @@ class module_Core {
    * @param string $module_name
    */
   static function activate($module_name) {
-    $kohana_modules = Kohana::config("core.modules");
+    $config = Kohana_Config::instance();
+    $kohana_modules = $config->get("core.modules");
     array_unshift($kohana_modules, MODPATH . $module_name);
-    Kohana::config_set("core.modules",  $kohana_modules);
+    $config->set("core.modules",  $kohana_modules);
 
     $installer_class = "{$module_name}_installer";
     if (method_exists($installer_class, "activate")) {
@@ -203,7 +205,7 @@ class module_Core {
     }
 
     $module = self::get($module_name);
-    if ($module->loaded) {
+    if ($module->loaded()) {
       $module->active = true;
       $module->save();
     }
@@ -230,7 +232,7 @@ class module_Core {
     }
 
     $module = self::get($module_name);
-    if ($module->loaded) {
+    if ($module->loaded()) {
       $module->active = false;
       $module->save();
     }
@@ -257,7 +259,7 @@ class module_Core {
 
     graphics::remove_rules($module_name);
     $module = self::get($module_name);
-    if ($module->loaded) {
+    if ($module->loaded()) {
       $module->delete();
     }
     module::load_modules();
@@ -290,8 +292,9 @@ class module_Core {
       }
     }
     self::$active[] = $gallery;  // put gallery last in the module list to match core.modules
-    Kohana::config_set(
-      "core.modules", array_merge($kohana_modules, Kohana::config("core.modules")));
+    $config = Kohana_Config::instance();
+    $config->set(
+      "core.modules", array_merge($kohana_modules, $config->get("core.modules")));
   }
 
   /**
@@ -348,11 +351,11 @@ class module_Core {
     // We cache all vars in gallery._cache so that we can load all vars at once for
     // performance.
     if (empty(self::$var_cache)) {
-      $row = Database::instance()
+      $row = db::build()
         ->select("value")
         ->from("vars")
         ->where(array("module_name" => "gallery", "name" => "_cache"))
-        ->get()
+        ->execute()
         ->current();
       if ($row) {
         self::$var_cache = unserialize($row->value);
@@ -395,7 +398,7 @@ class module_Core {
       ->where("module_name", $module_name)
       ->where("name", $name)
       ->find();
-    if (!$var->loaded) {
+    if (!$var->loaded()) {
       $var->module_name = $module_name;
       $var->name = $name;
     }
@@ -432,7 +435,7 @@ class module_Core {
       ->where("module_name", $module_name)
       ->where("name", $name)
       ->find();
-    if ($var->loaded) {
+    if ($var->loaded()) {
       $var->delete();
     }
 
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index e84e8ea6..a319471d 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -36,7 +36,7 @@ class movie_Core {
    */
   static function create($parent, $filename, $name, $title,
                          $description=null, $owner_id=null, $slug=null) {
-    if (!$parent->loaded || !$parent->is_album()) {
+    if (!$parent->loaded() || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
 
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 01cf5278..90cb108f 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -36,7 +36,7 @@ class photo_Core {
    */
   static function create($parent, $filename, $name, $title,
                          $description=null, $owner_id=null, $slug=null) {
-    if (!$parent->loaded || !$parent->is_album()) {
+    if (!$parent->loaded() || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
 
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 2b090776..d58b935d 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -69,7 +69,7 @@ class site_status_Core {
     $message = ORM::factory("message")
       ->where("key", $permanent_key)
       ->find();
-    if (!$message->loaded) {
+    if (!$message->loaded()) {
       $message->key = $permanent_key;
     }
     $message->severity = $severity;
@@ -83,7 +83,7 @@ class site_status_Core {
    */
   static function clear($permanent_key) {
     $message = ORM::factory("message")->where("key", $permanent_key)->find();
-    if ($message->loaded) {
+    if ($message->loaded()) {
       $message->delete();
     }
   }
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index dac5f9d3..4aa95f33 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -51,7 +51,7 @@ class task_Core {
 
   static function cancel($task_id) {
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
     $task->done = 1;
@@ -65,14 +65,14 @@ class task_Core {
 
   static function remove($task_id) {
     $task = ORM::factory("task", $task_id);
-    if ($task->loaded) {
+    if ($task->loaded()) {
       $task->delete();
     }
   }
 
   static function run($task_id) {
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
 
@@ -84,7 +84,7 @@ class task_Core {
       }
       $task->save();
     } catch (Exception $e) {
-      Kohana::log("error", $e->__toString());
+      Kohana_Log::add("error", $e->__toString());
       $task->log($e->__toString());
       $task->state = "error";
       $task->done = true;
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 16ed104e..c7a9b49a 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -43,7 +43,7 @@ class theme_Core {
     }
     $modules = Kohana::config("core.modules");
     array_unshift($modules, THEMEPATH . $theme_name);
-    Kohana::config_set("core.modules", $modules);
+    Kohana_Config::instance()->set("core.modules", $modules);
   }
 
   static function get_edit_form_admin() {
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index cbb781a1..c190f110 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -31,7 +31,7 @@ class Admin_View_Core extends Gallery_View {
     if (!file_exists(THEMEPATH . $theme_name)) {
       module::set_var("gallery", "active_admin_theme", "admin_wind");
       theme::load_themes();
-      Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
+      Kohana_Log::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
     }
     parent::__construct($name);
 
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index 0571fe58..42fae266 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -128,21 +128,21 @@ class Gallery_I18n_Core {
     if (!isset($this->_cache[$locale])) {
       $this->_cache[$locale] = array();
       // TODO: Load data from locale file instead of the DB.
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key", "translation")
                ->from("incoming_translations")
                ->where(array("locale" => $locale))
-               ->get()
+               ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
       }
 
       // Override incoming with outgoing...
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key", "translation")
                ->from("outgoing_translations")
                ->where(array("locale" => $locale))
-               ->get()
+               ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
       }
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 3bf56d0f..940c5321 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -32,7 +32,7 @@ class Gallery_View_Core extends View {
     if (($path = gallery::find_file("js", $file, false))) {
       $this->scripts[$path] = 1;
     } else {
-      Kohana::log("error", "Can't find script file: $file");
+      Kohana_Log::add("error", "Can't find script file: $file");
     }
   }
 
@@ -55,7 +55,7 @@ class Gallery_View_Core extends View {
     if (($path = gallery::find_file("css", $file, false))) {
       $this->css[$path] = 1;
     } else {
-      Kohana::log("error", "Can't find css file: $file");
+      Kohana_Log::add("error", "Can't find css file: $file");
     }
   }
 
@@ -130,7 +130,7 @@ class Gallery_View_Core extends View {
           $search[] = $match[0];
           $replace[] = "url('" . url::abs_file($relative) . "')";
         } else {
-          Kohana::log("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'");
+          Kohana_Log::add("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'");
         }
       }
       $replace = str_replace(DIRECTORY_SEPARATOR, "/", $replace);
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index e213ae97..bcb3056a 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -54,7 +54,7 @@ class IdentityProvider_Core {
    */
   static function reset() {
     self::$instance = null;
-    Kohana::config_clear("identity");
+    Kohana_Config::instance()->clear("identity");
   }
 
   /**
@@ -90,7 +90,7 @@ class IdentityProvider_Core {
                                  get_class($this), "IdentityProvider_Driver");
     }
 
-    Kohana::log("debug", "Identity Library initialized");
+    Kohana_Log::add("debug", "Identity Library initialized");
   }
 
   /**
diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 2c9ad1d7..56c776aa 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -21,16 +21,6 @@ class ORM extends ORM_Core {
   // Track the original value of this ORM so that we can look it up in ORM::original()
   protected $original = null;
 
-  public function open_paren() {
-    $this->db->open_paren();
-    return $this;
-  }
-
-  public function close_paren() {
-    $this->db->close_paren();
-    return $this;
-  }
-
   public function save() {
     model_cache::clear();
     $result = parent::save();
diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index eb55aca6..0311f2dd 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -18,6 +18,31 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class View extends View_Core {
+  static $global_data;
+
+  /**
+   * Reimplement Kohana 2.3's View::set_global() functionality.
+   */
+  public function set_global($key, $value) {
+    View::$global_data->$key = $value;
+    $this->$key = $value;
+  }
+
+  public function __isset($key) {
+    if (isset(View::$global_data->$key)) {
+      return true;
+    }
+    return parent::__isset($key);
+  }
+
+  public function &__get($key) {
+    Kohana_Log::add("error",print_r("__get($key)",1));
+    if (isset(View::$global_data->$key)) {
+      return View::$global_data->$key;
+    }
+    return parent::__get($key);
+  }
+
   /**
    * Override View_Core::__construct so that we can set the csrf value into all views.
    *
@@ -38,7 +63,7 @@ class View extends View_Core {
     try {
       return parent::render($print, $renderer);
     } catch (Exception $e) {
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
       return "";
     }
   }
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 83d2445c..01b2d7b7 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -133,10 +133,10 @@ class ORM_MPTT_Core extends ORM {
    */
   function parents() {
     return $this
-      ->where("`left_ptr` <= {$this->left_ptr}")
-      ->where("`right_ptr` >= {$this->right_ptr}")
-      ->where("id <> {$this->id}")
-      ->orderby("left_ptr", "ASC")
+      ->where("left_ptr", "<=", $this->left_ptr)
+      ->where("right_ptr", ">=", $this->right_ptr)
+      ->where("id", "<>", $this->id)
+      ->order_by("left_ptr", "ASC")
       ->find_all();
   }
 
@@ -147,14 +147,17 @@ class ORM_MPTT_Core extends ORM {
    * @param   integer  SQL limit
    * @param   integer  SQL offset
    * @param   array    additional where clauses
-   * @param   array    orderby
+   * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
+  function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
+    if ($where) {
+      $this->where($where);
+    }
+
     return $this
-      ->where("parent_id", $this->id)
-      ->where($where)
-      ->orderby($orderby)
+      ->where("parent_id", "=", $this->id)
+      ->order_by($order_by)
       ->find_all($limit, $offset);
   }
 
@@ -165,10 +168,13 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    additional where clauses
    * @return array ORM
    */
-  function children_count($where=array()) {
+  function children_count($where=null) {
+    if ($where) {
+      $this->where($where);
+    }
+
     return $this
-      ->where($where)
-      ->where("parent_id", $this->id)
+      ->where("parent_id", "=", $this->id)
       ->count_all();
   }
 
@@ -178,15 +184,18 @@ class ORM_MPTT_Core extends ORM {
    * @param   integer  SQL limit
    * @param   integer  SQL offset
    * @param   array    additional where clauses
-   * @param   array    orderby
+   * @param   array    order_by
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
+  function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
+    if ($where) {
+      $this->where($where);
+    }
+
     return $this
-      ->where("left_ptr >", $this->left_ptr)
-      ->where("right_ptr <=", $this->right_ptr)
-      ->where($where)
-      ->orderby($orderby)
+      ->where("left_ptr", ">", $this->left_ptr)
+      ->where("right_ptr", "<=", $this->right_ptr)
+      ->order_by($order_by)
       ->find_all($limit, $offset);
   }
 
@@ -196,11 +205,14 @@ class ORM_MPTT_Core extends ORM {
    * @param    array    additional where clauses
    * @return   integer  child count
    */
-  function descendants_count($where=array()) {
+  function descendants_count($where=null) {
+    if ($where) {
+      $this->where($where);
+    }
+
     return $this
-      ->where("left_ptr >", $this->left_ptr)
-      ->where("right_ptr <=", $this->right_ptr)
-      ->where($where)
+      ->where("left_ptr", ">", $this->left_ptr)
+      ->where("right_ptr", "<=", $this->right_ptr)
       ->count_all();
   }
 
diff --git a/modules/gallery/libraries/SafeString.php b/modules/gallery/libraries/SafeString.php
index ba3a8ffd..cc63f3a7 100644
--- a/modules/gallery/libraries/SafeString.php
+++ b/modules/gallery/libraries/SafeString.php
@@ -146,7 +146,7 @@ class SafeString_Core {
    * Escape special HTML chars ("<", ">", "&", etc.) to HTML entities.
    */
   private static function _escape_for_html($dirty_html) {
-    return html::specialchars($dirty_html);
+    return html::chars($dirty_html);
   }
 
   /**
diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 7bc21a67..aa2b51a9 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -52,7 +52,7 @@ class Sendmail_Core {
       break;
     case  "header":
       if (count($value) != 2) {
-        Kohana::log("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
+        Kohana_Log::add("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
         throw new Exception("@todo INVALID_HEADER_PARAMETERS");
       }
       $this->headers[$value[0]] = $value[1];
@@ -71,7 +71,7 @@ class Sendmail_Core {
 
   public function send() {
     if (empty($this->to)) {
-      Kohana::log("error", wordwrap("Sending mail failed:\nNo to address specified"));
+      Kohana_Log::add("error", wordwrap("Sending mail failed:\nNo to address specified"));
       throw new Exception("@todo TO_IS_REQUIRED_FOR_MAIL");
     }
     $to = implode(", ", $this->to);
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index b64deab9..03f67671 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -33,7 +33,7 @@ class Theme_View_Core extends Gallery_View {
     if (!file_exists(THEMEPATH . $theme_name)) {
       module::set_var("gallery", "active_site_theme", "wind");
       theme::load_themes();
-      Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme.");
+      Kohana_Log::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
     }
     parent::__construct($name);
 
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 7e2aeabc..d27bcc32 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -20,22 +20,10 @@
 /*
  * Based on the Cache_Sqlite_Driver developed by the Kohana Team
  */
-class Cache_Database_Driver implements Cache_Driver {
+class Cache_Database_Driver extends Cache_Driver {
   // Kohana database instance
   protected $db;
 
-  /**
-   * Tests that the storage location is a directory and is writable.
-   */
-  public function __construct() {
-    // Open up an instance of the database
-    $this->db = Database::instance();
-
-    if (!$this->db->table_exists("caches")) {
-      throw new Exception("@todo Cache table is not defined");
-    }
-  }
-
   /**
    * Checks if a cache id is already set.
    *
@@ -43,20 +31,22 @@ class Cache_Database_Driver implements Cache_Driver {
    * @return boolean
    */
   public function exists($id) {
-    $count = $this->db->count_records("caches", array("key" => $id, "expiration >=" => time()));
+    $count = db::build()
+      ->where("key", "=", $id)
+      ->where("expiration", ">=", "time()")
+      ->count_records("caches");
     return $count > 0;
   }
 
   /**
    * Sets a cache item to the given data, tags, and lifetime.
    *
-   * @param   string   cache id to set
-   * @param   string   data in the cache
+   * @param   array    assoc array of key => value pairs
    * @param   array    cache tags
    * @param   integer  lifetime
    * @return  bool
    */
-  public function set($id, $data, array $tags = NULL, $lifetime) {
+  public function set($items, $tags=null, $lifetime=null) {
     if (!empty($tags)) {
       // Escape the tags, adding brackets so the tag can be explicitly matched
       $tags = "<" . implode(">,<", $tags) . ">";
@@ -69,46 +59,46 @@ class Cache_Database_Driver implements Cache_Driver {
       $lifetime += time();
     }
 
-    if ($this->exists($id)) {
-      $status = $this->db->update(
-        "caches",
-        array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)), array("key" => $id));
-    } else {
-      $status = $this->db->insert(
-        "caches",
-        array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)));
+    foreach ($items as $id => $data) {
+      if ($this->exists($id)) {
+        $status = db::build()->update(
+          "caches",
+          array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)),
+          array("key", "=", $id));
+      } else {
+        $status = db::build()->insert(
+          "caches",
+          array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)));
+      }
     }
 
-    return count($status) > 0;
+    return true;
   }
 
   /**
-   * Finds an array of ids for a given tag.
-   *
-   * @param  string  tag name
-   * @return array   of ids that match the tag
+   * Get cache items by tag
+   * @param   array    cache tags
+   * @return  array    cached data
    */
-  public function find($tag) {
-    $db_result = $this->db->from("caches")
-      ->like("tags", "<$tag>")
-      ->get()
-      ->result(true);
+  public function get_tag($tags) {
+    $db = db::build()->from("caches");
+    foreach ($tags as $tag) {
+      $db->where("tags", "like", "<$tag>");
+    }
+    $db_result = $db->execute()->as_array();
 
     // An array will always be returned
     $result = array();
 
+    // Disable notices for unserializing
+    $ER = error_reporting(~E_NOTICE);
     if ($db_result->count() > 0) {
-      // Disable notices for unserializing
-      $ER = error_reporting(~E_NOTICE);
-
       foreach ($db_result as $row) {
         // Add each cache to the array
         $result[$row->key] = unserialize($row->cache);
       }
-
-      // Turn notices back on
-      error_reporting($ER);
     }
+    error_reporting($ER);
 
     return $result;
   }
@@ -120,9 +110,13 @@ class Cache_Database_Driver implements Cache_Driver {
    * @param  string  cache id
    * @return mixed|NULL
    */
-  public function get($id) {
+  public function get($keys, $single=false) {
     $data = null;
-    $result = $this->db->getwhere("caches", array("key" => $id));
+    $result = db::build()
+      ->from("caches")
+      ->where("key", "IN", $keys)
+      ->select()
+      ->execute();
 
     if (count($result) > 0) {
       $cache = $result->current();
@@ -168,6 +162,13 @@ class Cache_Database_Driver implements Cache_Driver {
     return count($status) > 0;
   }
 
+  /**
+   * Delete cache items by tag
+   */
+  public function delete_tag($tags) {
+    return $this->delete($tags, true);
+  }
+
   /**
    * Deletes all cache files that are older than the current time.
    */
@@ -180,4 +181,10 @@ class Cache_Database_Driver implements Cache_Driver {
     return count($status) > 0;
   }
 
-} // End Cache Database Driver
\ No newline at end of file
+  /**
+   * Empty the cache
+   */
+  public function delete_all() {
+    db::build()->query("TRUNCATE {caches}");
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index d27e331b..bd1f9af5 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -309,7 +309,7 @@ class Item_Model extends ORM_MPTT {
    * @return string
    */
   public function relative_path() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
       return;
     }
 
@@ -324,7 +324,7 @@ class Item_Model extends ORM_MPTT {
    * @return string
    */
   public function relative_url() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
       return;
     }
 
@@ -383,7 +383,7 @@ class Item_Model extends ORM_MPTT {
 
     if (!empty($this->changed) && $significant_changes) {
       $this->updated = time();
-      if (!$this->loaded) {
+      if (!$this->loaded()) {
         $this->created = $this->updated;
         $this->weight = item::get_max_weight();
       } else {
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index c816a4a7..a2044325 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -28,7 +28,7 @@ class Log_Model extends ORM {
       try {
         return identity::lookup_user($this->user_id);
       } catch (Exception $e) {
-        Kohana::log("alert", "Unable to load user with id $this->user_id");
+        Kohana_Log::add("alert", "Unable to load user with id $this->user_id");
         return null;
       }
     } else {
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index e9e5cb26..d90d7ed6 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -106,15 +106,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $item = album::create($root,  rand(), "test album");
 
     // New rows exist
-    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
-    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
+    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
 
     // Delete the item
     $item->delete();
 
     // Rows are gone
-    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
-    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
+    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
   }
 
   public function new_photos_inherit_parent_permissions_test() {
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index 0d8801e5..b9fdcc19 100644
--- a/modules/gallery/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
@@ -120,7 +120,7 @@
       
       getTraceAsString(); ?>
       
-      
+      
       
       
   
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 9a40b0b9..d525e03e 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -38,7 +38,7 @@ class notification {
       ->where("item_id", $item->id)
       ->where("user_id", $user->id)
       ->find()
-      ->loaded;
+      ->loaded();
   }
 
   static function add_watch($item, $user=null) {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 6b2df574..e6d09d74 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -25,8 +25,8 @@ class notification_event_Core {
     try {
       notification::send_item_updated($new);
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::item_updated() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::item_updated() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -34,8 +34,8 @@ class notification_event_Core {
     try {
       notification::send_item_add($item);
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::item_created() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::item_created() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -47,8 +47,8 @@ class notification_event_Core {
         notification::remove_watch($item);
       }
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::item_deleted() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::item_deleted() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -69,8 +69,8 @@ class notification_event_Core {
         notification::send_comment_published($comment);
       }
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::comment_created() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::comment_created() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -80,8 +80,8 @@ class notification_event_Core {
         notification::send_comment_published($new);
       }
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::comment_updated() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::comment_updated() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -91,8 +91,8 @@ class notification_event_Core {
         ->where("user_id", $user->id)
         ->delete_all();
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::user_before_delete() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::user_before_delete() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
@@ -100,8 +100,8 @@ class notification_event_Core {
     try {
       notification::send_pending_notifications();
     } catch (Exception $e) {
-      Kohana::log("error", "@todo notification_event::batch_complete() failed");
-      Kohana::Log("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+      Kohana_Log::add("error", "@todo notification_event::batch_complete() failed");
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
     }
   }
 
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 8c3bd3ab..9d732c11 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -61,7 +61,7 @@ class search_Core {
   static function update($item) {
     $data = new ArrayObject();
     $record = ORM::factory("search_record")->where("item_id", $item->id)->find();
-    if (!$record->loaded) {
+    if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
 
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 53a3d091..25961129 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -103,7 +103,7 @@ class Server_Add_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != identity::active_user()->id) {
+    if (!$task->loaded() || $task->owner_id != identity::active_user()->id) {
       access::forbidden();
     }
 
@@ -216,7 +216,7 @@ class Server_Add_Controller extends Admin_Controller {
         // Look up the parent item for this entry.  By now it should exist, but if none was
         // specified, then this belongs as a child of the current item.
         $parent_entry = ORM::factory("server_add_file", $entry->parent_id);
-        if (!$parent_entry->loaded) {
+        if (!$parent_entry->loaded()) {
           $parent = ORM::factory("item", $task->get("item_id"));
         } else {
           $parent = ORM::factory("item", $parent_entry->item_id);
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 67587c2e..93b51814 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -35,7 +35,7 @@ class Admin_Tags_Controller extends Admin_Controller {
 
   public function form_delete($id) {
     $tag = ORM::factory("tag", $id);
-    if ($tag->loaded) {
+    if ($tag->loaded()) {
       print tag::get_delete_form($tag);
     }
   }
@@ -44,7 +44,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $tag = ORM::factory("tag", $id);
-    if (!$tag->loaded) {
+    if (!$tag->loaded()) {
       kohana::show_404();
     }
 
@@ -68,7 +68,7 @@ class Admin_Tags_Controller extends Admin_Controller {
 
   public function form_rename($id) {
     $tag = ORM::factory("tag", $id);
-    if ($tag->loaded) {
+    if ($tag->loaded()) {
       print InPlaceEdit::factory($tag->name)
         ->action("admin/tags/rename/$id")
         ->render();
@@ -79,7 +79,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $tag = ORM::factory("tag", $id);
-    if (!$tag->loaded) {
+    if (!$tag->loaded()) {
       kohana::show_404();
     }
 
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index feaf40c5..6ce18625 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -34,7 +34,7 @@ class tag_Core {
     }
 
     $tag = ORM::factory("tag")->where("name", $tag_name)->find();
-    if (!$tag->loaded) {
+    if (!$tag->loaded()) {
       $tag->name = $tag_name;
       $tag->count = 0;
       $tag->save();
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index a857a99d..6ee8e708 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -51,7 +51,7 @@ class tag_event_Core {
       try {
         tag::add($photo, $tag);
       } catch (Exception $e) {
-        Kohana::log("error", "Error adding tag: $tag\n" .
+        Kohana_Log::add("error", "Error adding tag: $tag\n" .
                     $e->getMessage() . "\n" . $e->getTraceAsString());
       }
     }
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index de5d6c72..03017dc3 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -31,7 +31,7 @@ class tag_rss_Core {
   static function feed($feed_id, $offset, $limit, $id) {
     if ($feed_id == "tag") {
       $tag = ORM::factory("tag", $id);
-      if (!$tag->loaded) {
+      if (!$tag->loaded()) {
         Kohana::show_404();
       }
       $feed->children = $tag->items($limit, $offset, "photo");
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b3284385..619e6e18 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -265,7 +265,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if ($valid) {
       $new_name = $form->edit_group->inputs["name"]->value;
       $group = group::lookup_by_name($name);
-      if ($group->loaded) {
+      if ($group->loaded()) {
         $form->edit_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       }
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index e18e76b6..8309d2cc 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -47,7 +47,7 @@ class Password_Controller extends Controller {
     $valid = $form->validate();
     if ($valid) {
       $user = user::lookup_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
+      if (!$user->loaded() || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
       }
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 3aaf1b11..1beaa1c2 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -32,7 +32,7 @@ class group_Core {
    */
   static function create($name) {
     $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
+    if ($group->loaded()) {
       throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
     }
 
@@ -86,7 +86,7 @@ class group_Core {
   private static function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded) {
+      if ($user->loaded()) {
         return $user;
       }
     } catch (Exception $e) {
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f9f16da5..4ed9daee 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -45,7 +45,7 @@ class user_Core {
    */
   static function create($name, $full_name, $password) {
     $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
+    if ($user->loaded()) {
       throw new Exception("@todo USER_ALREADY_EXISTS $name");
     }
 
@@ -163,7 +163,7 @@ class user_Core {
   private static function _lookup_user_by_field($field_name, $value) {
     try {
       $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
+      if ($user->loaded()) {
         return $user;
       }
     } catch (Exception $e) {
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 4432fc69..81f779cf 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -34,7 +34,7 @@ class Group_Model extends ORM implements Group_Definition {
   }
 
   public function save() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
         $created = 1;
     }
     parent::save();
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index bd61def8..0d5a2bcd 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -62,7 +62,7 @@ class User_Model extends ORM implements User_Definition {
   }
 
   public function save() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
         $created = 1;
     }
     parent::save();
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 3da8dd34..6aedfde5 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -22,14 +22,14 @@ class User_Groups_Test extends Unit_Test_Case {
   public function teardown() {
     try {
       $group = ORM::factory("group")->where("name", "user_groups_test")->find();
-      if ($group->loaded) {
+      if ($group->loaded()) {
         $group->delete();
       }
     } catch (Exception $e) { }
 
     try {
       $user = ORM::factory("user")->where("name", "user_groups_test")->find();
-      if ($user->loaded) {
+      if ($user->loaded()) {
         $user->delete();
       }
     } catch (Exception $e) { }
-- 
cgit v1.2.3


From 33b1d4b7efa8c6b825908f48c7e744578e7f9ae6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 13:41:53 -0800
Subject: Convert one more instance of ORM::$loaded to ORM::loaded()

---
 modules/gallery/controllers/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index ec3681a3..bf1f80d4 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -20,7 +20,7 @@
 class Items_Controller extends Controller {
   public function __call($function, $args) {
     $item = ORM::factory("item", (int)$function);
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return Kohana::show_404();
     }
     // Redirect to the more specific resource type, since it will render
-- 
cgit v1.2.3


From 4a417708f00b1ebd5865c8075bb36b7fc0f14756 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 13:49:40 -0800
Subject: Kohana::show_404() -> throw new Kohana_404_Exception()

---
 modules/digibug/controllers/digibug.php                     | 6 +++---
 modules/gallery/controllers/combined.php                    | 4 ++--
 modules/gallery/controllers/items.php                       | 2 +-
 modules/gallery_unit_test/controllers/gallery_unit_test.php | 2 +-
 modules/rss/controllers/rss.php                             | 2 +-
 modules/tag/helpers/tag_rss.php                             | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index cef42b2d..25f1ca3e 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -61,7 +61,7 @@ class Digibug_Controller extends Controller {
     if ($type == "full") {
       $remote_addr = ip2long($this->input->server("REMOTE_ADDR"));
       if ($remote_addr === false) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
       $config = Kohana::config("digibug");
 
@@ -76,13 +76,13 @@ class Digibug_Controller extends Controller {
         }
       }
       if (!$authorized) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
     }
 
     $proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
     if (!$proxy->loaded() || !$proxy->item->loaded()) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $file = $type == "full" ? $proxy->item->file_path() : $proxy->item->thumb_path();
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index c1f42bfe..8132fc41 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -56,7 +56,7 @@ class Combined_Controller extends Controller {
     }
 
     if (empty($key)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $cache = Cache::instance();
@@ -71,7 +71,7 @@ class Combined_Controller extends Controller {
       $content = $cache->get($key);
     }
     if (empty($content)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // $type is either 'javascript' or 'css'
diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index bf1f80d4..86782469 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -21,7 +21,7 @@ class Items_Controller extends Controller {
   public function __call($function, $args) {
     $item = ORM::factory("item", (int)$function);
     if (!$item->loaded()) {
-      return Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
     // Redirect to the more specific resource type, since it will render
     // differently.  We could also just delegate here, but it feels more appropriate
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 58e0d9c5..391ad029 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -20,7 +20,7 @@
 class Gallery_Unit_Test_Controller extends Controller {
   function Index() {
     if (!TEST_MODE) {
-      print Kohana::show_404();
+      print throw new Kohana_404_Exception();
     }
 
     // Jump through some hoops to satisfy the way that we check for the site_domain in
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index ed2acef8..a963a1dc 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -39,7 +39,7 @@ class Rss_Controller extends Controller {
       }
     }
     if (empty($feed)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     if ($feed->max_pages && $page > $feed->max_pages) {
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index 03017dc3..f09a4530 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -32,7 +32,7 @@ class tag_rss_Core {
     if ($feed_id == "tag") {
       $tag = ORM::factory("tag", $id);
       if (!$tag->loaded()) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
       $feed->children = $tag->items($limit, $offset, "photo");
       $feed->max_pages = ceil($tag->count / $limit);
-- 
cgit v1.2.3


From 7c9bd9e8e8c4d2e57c4f08f526e5464236fa90e3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 13:59:01 -0800
Subject: Call execute() after upate() and insert().

---
 modules/gallery/libraries/drivers/Cache/Database.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index d27bcc32..eda445b6 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -64,11 +64,14 @@ class Cache_Database_Driver extends Cache_Driver {
         $status = db::build()->update(
           "caches",
           array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)),
-          array("key", "=", $id));
+          array("key", "=", $id))
+          ->execute();
       } else {
         $status = db::build()->insert(
           "caches",
-          array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)));
+          array("key" => $id, "tags" => $tags,
+                "expiration" => $lifetime, "cache" => serialize($data)))
+          ->execute();
       }
     }
 
@@ -185,6 +188,6 @@ class Cache_Database_Driver extends Cache_Driver {
    * Empty the cache
    */
   public function delete_all() {
-    db::build()->query("TRUNCATE {caches}");
+    db::build()->query("TRUNCATE {caches}")->execute();
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From daedadda751a188c20f032b09c1ca32e39279360 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 14:27:06 -0800
Subject: Switch from stdClass to arrays for global data.

---
 modules/gallery/libraries/MY_View.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 0311f2dd..d1ec6684 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -18,27 +18,26 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class View extends View_Core {
-  static $global_data;
+  static $global_data = array();
 
   /**
    * Reimplement Kohana 2.3's View::set_global() functionality.
    */
   public function set_global($key, $value) {
-    View::$global_data->$key = $value;
+    View::$global_data[$key] = $value;
     $this->$key = $value;
   }
 
   public function __isset($key) {
-    if (isset(View::$global_data->$key)) {
+    if (array_key_exists($key, View::$global_data)) {
       return true;
     }
     return parent::__isset($key);
   }
 
   public function &__get($key) {
-    Kohana_Log::add("error",print_r("__get($key)",1));
-    if (isset(View::$global_data->$key)) {
-      return View::$global_data->$key;
+    if (array_key_exists($key, View::$global_data)) {
+      return View::$global_data[$key];
     }
     return parent::__get($key);
   }
-- 
cgit v1.2.3


From 8b7ef660650e3711442972aabcd545959ee9bc94 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 14:50:04 -0800
Subject: Don't show the breadcrumb if we have no item

---
 themes/wind/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 9c440412..2dcc5d70 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -96,7 +96,7 @@
           header_bottom() ?>
         
    
 
-        
+        item() && !empty($parents)): ?>
         
      
           
           
-- 
cgit v1.2.3


From 7eacc465d53d08ced85114b0a4ddc26b3fed848e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 14:50:29 -0800
Subject: Fix set_global() to be more elegant and preserve local trumping

---
 modules/gallery/libraries/MY_View.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index d1ec6684..45aae188 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -25,21 +25,6 @@ class View extends View_Core {
    */
   public function set_global($key, $value) {
     View::$global_data[$key] = $value;
-    $this->$key = $value;
-  }
-
-  public function __isset($key) {
-    if (array_key_exists($key, View::$global_data)) {
-      return true;
-    }
-    return parent::__isset($key);
-  }
-
-  public function &__get($key) {
-    if (array_key_exists($key, View::$global_data)) {
-      return View::$global_data[$key];
-    }
-    return parent::__get($key);
   }
 
   /**
@@ -58,9 +43,10 @@ class View extends View_Core {
    *
    * @see View_Core::render
    */
-  public function render($print=false, $renderer=false) {
+  public function render($print=false, $renderer=false, $modifier=false) {
     try {
-      return parent::render($print, $renderer);
+      $this->kohana_local_data = array_merge(View::$global_data, $this->kohana_local_data);
+      return parent::render($print, $renderer, $modifier);
     } catch (Exception $e) {
       Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
       return "";
-- 
cgit v1.2.3


From 60c20b0045ade2ceeff648c6b97180df5b3a1dbc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 16:26:10 -0800
Subject: The html helpers no longer forces .js and .css suffixes to urls it
 generates (yay!)

---
 modules/gallery/controllers/combined.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 8132fc41..e90a2f1a 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -22,7 +22,6 @@ class Combined_Controller extends Controller {
    * Return the combined Javascript bundle associated with the given key.
    */
   public function javascript($key) {
-    $key = substr($key, 0, strlen($key) - 3);  // strip off the trailing .js
     return $this->_emit("javascript", $key);
   }
 
@@ -30,7 +29,6 @@ class Combined_Controller extends Controller {
    * Return the combined CSS bundle associated with the given key.
    */
   public function css($key) {
-    $key = substr($key, 0, strlen($key) - 4);  // strip off the trailing .css
     return $this->_emit("css", $key);
   }
 
-- 
cgit v1.2.3


From 5f521014f68803bb0bbab5fe30e1e2c5f61d1b37 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 19:24:30 -0800
Subject: form::close() went away in Kohana 2.4

---
 modules/forge/libraries/Forge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/forge/libraries/Forge.php b/modules/forge/libraries/Forge.php
index d9da4c7d..e607ec29 100644
--- a/modules/forge/libraries/Forge.php
+++ b/modules/forge/libraries/Forge.php
@@ -299,7 +299,7 @@ class Forge_Core {
 
 			// Set the form open and close
 			$form->open  = form::$form_type(arr::remove('action', $this->attr), $this->attr, $hidden);
-			$form->close = form::close();
+			$form->close = "";
 
 			// Set the inputs
 			$form->inputs = $this->inputs;
-- 
cgit v1.2.3


From ccb0ea3d30a114c069240453d7d85f18328db6e5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 19:24:50 -0800
Subject: Make globals work if you access the the variables directly with
 $v->foo instead of doing it in a rendered template.

---
 modules/gallery/libraries/MY_View.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 45aae188..cec59ec1 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -27,6 +27,26 @@ class View extends View_Core {
     View::$global_data[$key] = $value;
   }
 
+  public function is_set($key) {
+    return parent::is_set($key) ? true : array_key_exists($key, View::$global_data);
+  }
+
+  /**
+   * Completely replace View_Core::__get() so that local data trumps global data, trumps members.
+   * This simulates the Kohana 2.3 behavior.
+   */
+  public function &__get($key) {
+    if (isset($this->kohana_local_data[$key])) {
+      return $this->kohana_local_data[$key];
+    } else if (isset(View::$global_data[$key])) {
+      return View::$global_data[$key];
+    } else if (isset($this->$key)) {
+      return $this->$key;
+    } else {
+      throw new Kohana_Exception('Undefined view variable: :var', array(':var' => $key));
+    }
+  }
+
   /**
    * Override View_Core::__construct so that we can set the csrf value into all views.
    *
-- 
cgit v1.2.3


From 0ef6994f23300f3c6bfb83193b4101202dbc16f8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 19:25:34 -0800
Subject: ORM::orderby -> ORM::order_by

---
 modules/image_block/helpers/image_block_block.php | 12 ++++++------
 modules/tag/helpers/tag.php                       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
index 79bd92ba..f591e8d1 100644
--- a/modules/image_block/helpers/image_block_block.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -35,18 +35,18 @@ class image_block_block_Core {
 
       $items = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
-        ->where("rand_key < ", $random)
-        ->orderby(array("rand_key" => "DESC"))
+        ->where("type", "!=", "album")
+        ->where("rand_key", "<", $random)
+        ->order_by(array("rand_key" => "DESC"))
         ->find_all(1);
 
       if ($items->count() == 0) {
         // Try once more.  If this fails, just ditch the block altogether
         $items = ORM::factory("item")
           ->viewable()
-          ->where("type !=", "album")
-          ->where("rand_key >= ", $random)
-          ->orderby(array("rand_key" => "DESC"))
+          ->where("type", "!=", "album")
+          ->where("rand_key", ">=", $random)
+          ->order_by(array("rand_key" => "DESC"))
           ->find_all(1);
       }
 
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 8558ac30..8694bcec 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -57,7 +57,7 @@ class tag_Core {
    */
   static function popular_tags($count) {
     return ORM::factory("tag")
-      ->orderby("count", "DESC")
+      ->order_by("count", "DESC")
       ->limit($count)
       ->find_all();
   }
-- 
cgit v1.2.3


From 0121bfd5850bdc59bf0cd656c61c953421a85890 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 19:26:52 -0800
Subject: ORM::orderby -> ORM::order_by

---
 modules/comment/controllers/admin_comments.php     |  2 +-
 modules/comment/helpers/comment_block.php          |  2 +-
 modules/comment/helpers/comment_rss.php            |  2 +-
 modules/comment/helpers/comment_theme.php          |  2 +-
 .../controllers/admin_advanced_settings.php        |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  4 +--
 modules/gallery/helpers/access.php                 | 10 +++----
 modules/gallery/helpers/gallery_block.php          |  4 +--
 modules/gallery/helpers/gallery_rss.php            |  4 +--
 modules/gallery/helpers/graphics.php               |  2 +-
 modules/gallery/helpers/item.php                   |  2 +-
 modules/gallery/helpers/module.php                 |  2 +-
 modules/gallery/models/item.php                    | 32 +++++++++++-----------
 modules/server_add/controllers/server_add.php      |  2 +-
 modules/tag/controllers/admin_tags.php             |  2 +-
 modules/tag/controllers/tags.php                   |  2 +-
 modules/user/controllers/admin_users.php           |  4 +--
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 1a9f0e6a..039956d7 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -48,7 +48,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     $view->content->menu = $this->_menu($view->content->counts);
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
-      ->orderby("created", "DESC")
+      ->order_by("created", "DESC")
       ->where("state", $state)
       ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
       ->find_all();
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index 7cd5d429..ab86b90a 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -30,7 +30,7 @@ class comment_block_Core {
       $block->title = t("Recent comments");
       $block->content = new View("admin_block_recent_comments.html");
       $block->content->comments =
-        ORM::factory("comment")->orderby("created", "DESC")->limit(5)->find_all();
+        ORM::factory("comment")->order_by("created", "DESC")->limit(5)->find_all();
       break;
     }
 
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 3692a30d..d0bb7859 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -36,7 +36,7 @@ class comment_rss_Core {
     $comments = ORM::factory("comment")
       ->viewable()
       ->where("state", "published")
-      ->orderby("created", "DESC");
+      ->order_by("created", "DESC");
 
     if ($feed_id == "item") {
       $comments->where("item_id", $id);
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index af0e1ca4..2f12192b 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -39,7 +39,7 @@ class comment_theme_Core {
     $view->comments = ORM::factory("comment")
       ->where("item_id", $theme->item()->id)
       ->where("state", "published")
-      ->orderby("created", "ASC")
+      ->order_by("created", "ASC")
       ->find_all();
 
     $block->content = $view;
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..c9de7e57 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
-      ->orderby("module_name", "name")
+      ->order_by("module_name", "name")
       ->find_all();
     print $view;
   }
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index fe5059e7..3b896553 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view->content = new View("admin_maintenance.html");
     $view->content->task_definitions = task::get_definitions();
     $view->content->running_tasks = ORM::factory("task")
-      ->where("done", 0)->orderby("updated", "DESC")->find_all();
+      ->where("done", 0)->order_by("updated", "DESC")->find_all();
     $view->content->finished_tasks = ORM::factory("task")
-      ->where("done", 1)->orderby("updated", "DESC")->find_all();
+      ->where("done", 1)->order_by("updated", "DESC")->find_all();
     print $view;
   }
 
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 9d27181a..d0200a73 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -171,7 +171,7 @@ class access_Core {
       ->where("items.id <> $item->id")
       ->join("access_intents", "items.id", "access_intents.item_id")
       ->where("access_intents.view_$group->id", self::DENY)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->limit(1)
       ->find();
 
@@ -494,7 +494,7 @@ class access_Core {
         ->where("right_ptr >", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
         ->where("access_intents.$field", self::DENY)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -516,7 +516,7 @@ class access_Core {
       ->where("right_ptr <=", $item->right_ptr)
       ->where("type", "album")
       ->where("access_intents.$field IS NOT", self::INHERIT)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
       if ($row->$field == self::ALLOW) {
@@ -565,7 +565,7 @@ class access_Core {
         ->where("left_ptr <", $item->left_ptr)
         ->where("right_ptr >", $item->right_ptr)
         ->where("$field IS NOT", self::UNKNOWN)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -581,7 +581,7 @@ class access_Core {
       ->where("left_ptr >=", $item->left_ptr)
       ->where("right_ptr <=", $item->right_ptr)
       ->where("$field IS NOT", self::INHERIT)
-      ->orderby("level", "ASC")
+      ->order_by("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
       $value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b5c32ad2..d09f1c80 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -46,7 +46,7 @@ class gallery_block_Core {
       $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
-        ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
+        ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
@@ -54,7 +54,7 @@ class gallery_block_Core {
       $block->title = t("Log entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
-        ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
+        ->order_by(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
       break;
 
     case "stats":
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 155edfb5..e195be8d 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -30,13 +30,13 @@ class gallery_rss_Core {
       $feed->children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC")
+        ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC");
+        ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
       $feed->title = t("Recent updates");
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a78cadd0..aef09003 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -183,7 +183,7 @@ class graphics_Core {
       foreach (ORM::factory("graphics_rule")
                ->where("target", $target)
                ->where("active", true)
-               ->orderby("priority", "asc")
+               ->order_by("priority", "asc")
                ->find_all() as $rule) {
         $rules[] = (object)$rule->as_array();
       }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 109fa6f8..7496d368 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -142,7 +142,7 @@ class item_Core {
     // @todo: figure out a better way to bootstrap the weight.
     $result = Database::instance()
       ->select("weight")->from("items")
-      ->orderby("weight", "desc")->limit(1)
+      ->order_by("weight", "desc")->limit(1)
       ->get()->current();
     return ($result ? $result->weight : 0) + 1;
   }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e54a4352..b7e13b9a 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -364,7 +364,7 @@ class module_Core {
         foreach (Database::instance()
                  ->select("module_name", "name", "value")
                  ->from("vars")
-                 ->orderby("module_name", "name")
+                 ->order_by("module_name", "name")
                  ->get() as $row) {
           if ($row->module_name == "gallery" && $row->name == "_cache") {
             // This could happen if there's a race condition
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index bd1f9af5..1efac37f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -291,7 +291,7 @@ class Item_Model extends ORM_MPTT {
              ->where("left_ptr <=", $this->left_ptr)
              ->where("right_ptr >=", $this->right_ptr)
              ->where("id <>", 1)
-             ->orderby("left_ptr", "ASC")
+             ->order_by("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
       $names[] = rawurlencode($row->name);
@@ -460,7 +460,7 @@ class Item_Model extends ORM_MPTT {
                ->where("parent_id", $this->id)
                ->where($sort_column, $child->$sort_column)
                ->where($where)
-               ->orderby(array("id" => "ASC"))
+               ->order_by(array("id" => "ASC"))
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -475,10 +475,10 @@ class Item_Model extends ORM_MPTT {
       //
       // Reproduce the children() functionality here using Database directly to avoid loading the
       // whole ORM for each row.
-      $orderby = array($this->sort_column => $this->sort_order);
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
 
       $position = 0;
@@ -486,7 +486,7 @@ class Item_Model extends ORM_MPTT {
                ->from("items")
                ->where("parent_id", $this->id)
                ->where($where)
-               ->orderby($orderby)
+               ->order_by($order_by)
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -592,18 +592,18 @@ class Item_Model extends ORM_MPTT {
    * @param   integer  SQL limit
    * @param   integer  SQL offset
    * @param   array    additional where clauses
-   * @param   array    orderby
+   * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::children($limit, $offset, $where, $orderby);
+    return parent::children($limit, $offset, $where, $order_by);
   }
 
   /**
@@ -617,14 +617,14 @@ class Item_Model extends ORM_MPTT {
    * @param   array    additional where clauses
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function descendants($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::descendants($limit, $offset, $where, $orderby);
+    return parent::descendants($limit, $offset, $where, $order_by);
   }
 }
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 25961129..053a1891 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -199,7 +199,7 @@ class Server_Add_Controller extends Admin_Controller {
       $entries = ORM::factory("server_add_file")
         ->where("task_id", $task->id)
         ->where("item_id", null)
-        ->orderby("id", "ASC")
+        ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
       if ($entries->count() == 0) {
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 93b51814..aff44803 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -29,7 +29,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     if ($filter) {
       $query->like("name", $filter);
     }
-    $view->content->tags = $query->orderby("name", "ASC")->find_all();
+    $view->content->tags = $query->order_by("name", "ASC")->find_all();
     print $view;
   }
 
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 9f9e45d9..dfa3a9b3 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -84,7 +84,7 @@ class Tags_Controller extends Controller {
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
       ->like("name", "{$tag_part}%", false)
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->limit($limit)
       ->find_all();
     foreach ($tag_list as $tag) {
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 619e6e18..ee65efd2 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,10 +22,10 @@ class Admin_Users_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
     $view->content->users = ORM::factory("user")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     $view->content->groups = ORM::factory("group")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     print $view;
   }
-- 
cgit v1.2.3


From 9d9e4bdb675154c1046b25dcb3777be61b410e4e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 20:05:12 -0800
Subject: Update hidden field format to match Kohana 2.4's form::open() API.

---
 modules/forge/libraries/Forge.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/forge/libraries/Forge.php b/modules/forge/libraries/Forge.php
index e607ec29..5807c849 100644
--- a/modules/forge/libraries/Forge.php
+++ b/modules/forge/libraries/Forge.php
@@ -277,7 +277,8 @@ class Forge_Core {
 			{
 				foreach ($this->hidden as $input)
 				{
-					$hidden[$input->name] = $input->value;
+					$hidden['name'] = $input->name;
+					$hidden['value'] = $input->value;
 				}
 			}
 
-- 
cgit v1.2.3


From 4b2e1344b4e4d110a9f61d09b8756d9948de24ac Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 25 Nov 2009 20:05:38 -0800
Subject: Move the CSRF initialization into the constructor, I don't see why we
 need it also in render().

---
 modules/gallery/libraries/MY_Forge.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/gallery/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
index b40d067d..6bdadea3 100644
--- a/modules/gallery/libraries/MY_Forge.php
+++ b/modules/gallery/libraries/MY_Forge.php
@@ -24,14 +24,13 @@ class Forge extends Forge_Core {
    */
   public function __construct($action=null, $title='', $method=null, $attr=array()) {
     parent::__construct($action, $title, $method, $attr);
-    $this->hidden("csrf")->value("");
+    $this->hidden("csrf")->value(access::csrf_token());
   }
 
   /**
    * Use our own template
    */
   public function render($template="form.html", $custom=false) {
-    $this->hidden["csrf"]->value(access::csrf_token());
     return parent::render($template, $custom);
   }
 
-- 
cgit v1.2.3


From 2ee38b3d8e7c2789c776c6665e2595bb6561acc6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 11:36:09 -0800
Subject: ORM::$rules now has a special meaning.  Use $form_rules for our
 internal rules code.

---
 modules/gallery/libraries/MY_Forge.php | 4 ++--
 modules/gallery/models/item.php        | 2 +-
 modules/user/models/group.php          | 2 +-
 modules/user/models/user.php           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
index 6bdadea3..9564f941 100644
--- a/modules/gallery/libraries/MY_Forge.php
+++ b/modules/gallery/libraries/MY_Forge.php
@@ -42,8 +42,8 @@ class Forge extends Forge_Core {
       if (isset($input->inputs)) {
         $input->add_rules_from($model);
       }
-      if (isset($model->rules[$name])) {
-        $input->rules($model->rules[$name]);
+      if (isset($model->form_rules[$name])) {
+        $input->rules($model->form_rules[$name]);
       }
     }
   }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 1efac37f..c8386b1c 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -21,7 +21,7 @@ class Item_Model extends ORM_MPTT {
   protected $children = 'items';
   protected $sorting = array();
 
-  var $rules = array(
+  var $form_rules = array(
     "name" => "required|length[0,255]",
     "title" => "required|length[0,255]",
     "description" => "length[0,65535]",
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 81f779cf..3a084684 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -20,7 +20,7 @@
 class Group_Model extends ORM implements Group_Definition {
   protected $has_and_belongs_to_many = array("users");
 
-  var $rules = array(
+  var $form_rules = array(
     "name" => "required|length[4,255]");
 
   /**
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 0d5a2bcd..e14d9b31 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -20,7 +20,7 @@
 class User_Model extends ORM implements User_Definition {
   protected $has_and_belongs_to_many = array("groups");
 
-  var $rules = array(
+  var $form_rules = array(
     "name" => "required|length[1,32]",
     "full_name" => "length[0,255]",
     "email" => "required|valid_email|length[1,255]",
-- 
cgit v1.2.3


From 22823df22098ed1a69d88c2e5fdc30cd90f72c30 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 11:43:20 -0800
Subject: Update ORM::where() calls to take 3 args.

---
 modules/notification/helpers/notification.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index d525e03e..7e935614 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -24,8 +24,8 @@ class notification {
     }
 
     return ORM::factory("subscription")
-      ->where("item_id", $item_id)
-      ->where("user_id", $user->id)
+      ->where("item_id", "=", $item_id)
+      ->where("user_id", "=", $user->id)
       ->find();
   }
 
@@ -35,8 +35,8 @@ class notification {
     }
 
     return ORM::factory("subscription")
-      ->where("item_id", $item->id)
-      ->where("user_id", $user->id)
+      ->where("item_id", "=", $item->id)
+      ->where("user_id", "=", $user->id)
       ->find()
       ->loaded();
   }
@@ -60,8 +60,8 @@ class notification {
       }
 
       $subscription = ORM::factory("subscription")
-        ->where("item_id", $item->id)
-        ->where("user_id", $user->id)
+        ->where("item_id", "=", $item->id)
+        ->where("user_id", "=", $user->id)
         ->find()->delete();
     }
   }
@@ -71,8 +71,8 @@ class notification {
     foreach (ORM::factory("subscription")
              ->select("user_id")
              ->join("items", "subscriptions.item_id", "items.id")
-             ->where("items.left_ptr <=", $item->left_ptr)
-             ->where("items.right_ptr >", $item->right_ptr)
+             ->where("items.left_ptr", "<=", $item->left_ptr)
+             ->where("items.right_ptr", ">", $item->right_ptr)
              ->find_all()
              ->as_array() as $subscriber) {
       $subscriber_ids[] = $subscriber->user_id;
@@ -176,7 +176,7 @@ class notification {
              ->get() as $row) {
       $email = $row->email;
       $result = ORM::factory("pending_notification")
-        ->where("email", $email)
+        ->where("email", "=", $email)
         ->find_all();
       if ($result->count() == 1) {
         $pending = $result->current();
-- 
cgit v1.2.3


From 1fd0e14359a7c7164573e4aa897c07680339e713 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 12:09:04 -0800
Subject: Convert all DB where() calls to take 3 arguments. Convert all
 open_paren() calls to and_open() or or_open() as appropriate.

---
 modules/comment/controllers/admin_comments.php     |  4 +-
 modules/comment/helpers/comment_event.php          |  6 +--
 modules/comment/helpers/comment_rss.php            |  4 +-
 modules/comment/helpers/comment_theme.php          |  4 +-
 modules/comment/tests/Comment_Model_Test.php       |  4 +-
 modules/exif/helpers/exif.php                      | 14 +++----
 modules/exif/helpers/exif_task.php                 | 10 ++---
 modules/exif/helpers/exif_theme.php                |  2 +-
 modules/g2_import/helpers/g2_import.php            |  2 +-
 modules/g2_import/helpers/g2_import_task.php       |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  6 +--
 modules/gallery/controllers/albums.php             | 12 +++---
 modules/gallery/controllers/file_proxy.php         |  4 +-
 modules/gallery/controllers/l10n_client.php        |  6 +--
 modules/gallery/controllers/move.php               |  4 +-
 modules/gallery/controllers/movies.php             | 10 ++---
 modules/gallery/controllers/photos.php             | 12 +++---
 modules/gallery/helpers/MY_url.php                 |  6 +--
 modules/gallery/helpers/access.php                 | 46 ++++++++++----------
 modules/gallery/helpers/album.php                  | 10 ++---
 modules/gallery/helpers/gallery_block.php          |  8 ++--
 modules/gallery/helpers/gallery_event.php          | 12 +++---
 modules/gallery/helpers/gallery_rss.php            |  4 +-
 modules/gallery/helpers/graphics.php               | 10 ++---
 modules/gallery/helpers/l10n_client.php            |  6 ++-
 modules/gallery/helpers/l10n_scanner.php           |  2 +-
 modules/gallery/helpers/module.php                 | 11 ++---
 modules/gallery/helpers/movie.php                  | 10 ++---
 modules/gallery/helpers/photo.php                  | 10 ++---
 modules/gallery/helpers/site_status.php            |  4 +-
 modules/gallery/libraries/Gallery_I18n.php         |  4 +-
 .../gallery/libraries/drivers/Cache/Database.php   |  9 ++--
 modules/gallery/models/item.php                    | 20 ++++-----
 modules/gallery/tests/Access_Helper_Test.php       | 16 +++----
 modules/gallery/tests/Cache_Test.php               |  2 +-
 modules/gallery/tests/Database_Test.php            | 49 +++++++++++-----------
 modules/gallery/tests/Gallery_Installer_Test.php   |  2 +-
 modules/gallery/tests/I18n_Test.php                |  4 +-
 modules/gallery/tests/Item_Helper_Test.php         |  4 +-
 .../notification/helpers/notification_event.php    |  4 +-
 modules/search/helpers/search.php                  | 10 ++---
 modules/search/helpers/search_event.php            |  2 +-
 modules/search/helpers/search_task.php             |  4 +-
 modules/server_add/controllers/server_add.php      |  8 ++--
 modules/tag/controllers/admin_tags.php             |  2 +-
 modules/tag/helpers/tag.php                        |  4 +-
 modules/tag/models/tag.php                         |  8 ++--
 modules/tag/tests/Tag_Test.php                     |  6 +--
 modules/user/helpers/group.php                     |  2 +-
 modules/user/helpers/user.php                      |  2 +-
 modules/user/tests/User_Groups_Test.php            |  4 +-
 51 files changed, 208 insertions(+), 203 deletions(-)

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 039956d7..271c7d51 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -49,7 +49,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
       ->order_by("created", "DESC")
-      ->where("state", $state)
+      ->where("state", "=", $state)
       ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
       ->find_all();
     $view->content->pager = new Pagination();
@@ -120,7 +120,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     access::verify_csrf();
 
     ORM::factory("comment")
-      ->where("state", "spam")
+      ->where("state", "=", "spam")
       ->delete_all();
     url::redirect("admin/comments/queue/spam");
   }
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index a72102b9..cf5d0a60 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -29,7 +29,7 @@ class comment_event_Core {
                   "guest_email" => null,
                   "guest_name" => "guest",
                   "guest_url" => null))
-      ->where(array("author_id" => $user->id))
+      ->where("author_id", "=", $user->id)
       ->update();
   }
 
@@ -40,7 +40,7 @@ class comment_event_Core {
                   "guest_email" => null,
                   "guest_name" => "guest",
                   "guest_url" => null))
-      ->where("1 = 1")
+      ->where("1", "=", "1")  // @todo: why do we do this?
       ->update();
   }
 
@@ -65,7 +65,7 @@ class comment_event_Core {
     foreach (Database::instance()
              ->select("text")
              ->from("comments")
-             ->where("item_id", $item->id)
+             ->where("item_id", "=", $item->id)
              ->get()
              ->as_array() as $row) {
       $data[] = $row->text;
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index d0bb7859..77044884 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -35,11 +35,11 @@ class comment_rss_Core {
 
     $comments = ORM::factory("comment")
       ->viewable()
-      ->where("state", "published")
+      ->where("state", "=", "published")
       ->order_by("created", "DESC");
 
     if ($feed_id == "item") {
-      $comments->where("item_id", $id);
+      $comments->where("item_id", "=", $id);
     }
 
     $feed->view = "comment.mrss";
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index 2f12192b..ebcc1c42 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -37,8 +37,8 @@ class comment_theme_Core {
 
     $view = new View("comments.html");
     $view->comments = ORM::factory("comment")
-      ->where("item_id", $theme->item()->id)
-      ->where("state", "published")
+      ->where("item_id", "=", $theme->item()->id)
+      ->where("state", "=", "published")
       ->order_by("created", "ASC")
       ->find_all();
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index de19648d..aa91d6f2 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -29,12 +29,12 @@ class Comment_Model_Test extends Unit_Test_Case {
     access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
     access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
   }
 }
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b6a55679..b4241e89 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -73,7 +73,7 @@ class exif_Core {
     }
     $item->save();
 
-    $record = ORM::factory("exif_record")->where("item_id", $item->id)->find();
+    $record = ORM::factory("exif_record")->where("item_id", "=", $item->id)->find();
     if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
@@ -86,7 +86,7 @@ class exif_Core {
   static function get($item) {
     $exif = array();
     $record = ORM::factory("exif_record")
-      ->where("item_id", $item->id)
+      ->where("item_id", "=", $item->id)
       ->find();
     if (!$record->loaded()) {
       return array();
@@ -143,11 +143,11 @@ class exif_Core {
       ->select("items.id")
       ->from("items")
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
-      ->where("type", "photo")
-      ->open_paren()
-      ->where("exif_records.item_id", null)
-      ->orwhere("exif_records.dirty", 1)
-      ->close_paren()
+      ->where("type", "=", "photo")
+      ->and_open()
+      ->where("exif_records.item_id", "=", null)
+      ->orwhere("exif_records.dirty", "=", 1)
+      ->close()
       ->get()
       ->count();
 
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 7c4c97c4..1a449fc7 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -44,11 +44,11 @@ class exif_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
-               ->where("type", "photo")
-               ->open_paren()
-               ->where("exif_records.item_id", null)
-               ->orwhere("exif_records.dirty", 1)
-               ->close_paren()
+               ->where("type", "=", "photo")
+               ->and_open()
+               ->where("exif_records.item_id", "=", null)
+               ->orwhere("exif_records.dirty", "=", 1)
+               ->close()
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
diff --git a/modules/exif/helpers/exif_theme.php b/modules/exif/helpers/exif_theme.php
index bb6926d3..db51f305 100644
--- a/modules/exif/helpers/exif_theme.php
+++ b/modules/exif/helpers/exif_theme.php
@@ -24,7 +24,7 @@ class exif_theme_Core {
       $record = Database::instance()
         ->select("key_count")
         ->from("exif_records")
-        ->where("item_id", $item->id)
+        ->where("item_id", "=", $item->id)
         ->get()
         ->current();
       if ($record && $record->key_count) {
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 1e835a59..3cf7eb80 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -867,7 +867,7 @@ class g2_import_Core {
    */
   static function map($g2_id) {
     if (!array_key_exists($g2_id, self::$map)) {
-      $g2_map = ORM::factory("g2_map")->where("g2_id", $g2_id)->find();
+      $g2_map = ORM::factory("g2_map")->where("g2_id", "=", $g2_id)->find();
       self::$map[$g2_id] = $g2_map->loaded() ? $g2_map->g3_id : null;
     }
 
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index fef0d186..e80b88b9 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -65,7 +65,7 @@ class g2_import_task_Core {
       $task->set("done", $done);
 
       $root_g2_id = g2(GalleryCoreApi::getDefaultAlbumId());
-      $root = ORM::factory("g2_map")->where("g2_id", $root_g2_id)->find();
+      $root = ORM::factory("g2_map")->where("g2_id", "=", $root_g2_id)->find();
       if (!$root->loaded()) {
         $root->g2_id = $root_g2_id;
         $root->g3_id = 1;
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 3b896553..6377f40f 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view->content = new View("admin_maintenance.html");
     $view->content->task_definitions = task::get_definitions();
     $view->content->running_tasks = ORM::factory("task")
-      ->where("done", 0)->order_by("updated", "DESC")->find_all();
+      ->where("done", "=", 0)->order_by("updated", "DESC")->find_all();
     $view->content->finished_tasks = ORM::factory("task")
-      ->where("done", 1)->order_by("updated", "DESC")->find_all();
+      ->where("done", "=", 1)->order_by("updated", "DESC")->find_all();
     print $view;
   }
 
@@ -164,7 +164,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
 
     // Do it the long way so we can call delete and remove the cache.
     $finished = ORM::factory("task")
-      ->where(array("done" => 1))
+      ->where("done", "=", 1)
       ->find_all();
     foreach ($finished as $task) {
       task::remove($task->id);
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 19140891..431d98a0 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -126,12 +126,12 @@ class Albums_Controller extends Items_Controller {
         if ($row = Database::instance()
             ->select(array("name", "slug"))
             ->from("items")
-            ->where("parent_id", $album->parent_id)
-            ->where("id <>", $album->id)
-            ->open_paren()
-            ->where("name", $form->edit_item->dirname->value)
-            ->orwhere("slug", $form->edit_item->slug->value)
-            ->close_paren()
+            ->where("parent_id", "=", $album->parent_id)
+            ->where("id", "<>", $album->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->dirname->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->dirname->value) {
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 11d858c0..53afe0e4 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -57,7 +57,7 @@ class File_Proxy_Controller extends Controller {
     $path = preg_replace("|/.album.jpg$|", "", $path);
 
     // We now have the relative path to the item.  Search for it in the path cache
-    $item = ORM::factory("item")->where("relative_path_cache", $path)->find();
+    $item = ORM::factory("item")->where("relative_path_cache", "=", $path)->find();
     if (!$item->loaded()) {
       // We didn't turn it up.  It's possible that the relative_path_cache is out of date here.
       // There was fallback code, but bharat deleted it in 8f1bca74.  If it turns out to be
@@ -69,7 +69,7 @@ class File_Proxy_Controller extends Controller {
       if (preg_match('/.jpg$/', $path)) {
         foreach (array("flv", "mp4") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $path);
-          $item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
+          $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
           if ($item->loaded()) {
             break;
           }
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 2eda741c..30a18631 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -116,7 +116,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "message")
                ->from("incoming_translations")
-               ->where(array("locale" => 'root'))
+               ->where("locale", "=", "root"))
                ->get()
                ->as_array() as $row) {
         $calls[$row->key] = array(unserialize($row->message), array());
@@ -131,7 +131,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "translation")
                ->from("incoming_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->get()
                ->as_array() as $row) {
         $translations[$row->key] = unserialize($row->translation);
@@ -140,7 +140,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "translation")
                ->from("outgoing_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->get()
                ->as_array() as $row) {
         $translations[$row->key] = unserialize($row->translation);
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 87b73436..863b13bb 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -64,8 +64,8 @@ class Move_Controller extends Controller {
     $view->parent = $target;
     $view->children = ORM::factory("item")
       ->viewable()
-      ->where("type", "album")
-      ->where("parent_id", $target->id)
+      ->where("type", "=", "album")
+      ->where("parent_id", "=", $target->id)
       ->find_all();
     return $view;
   }
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 3d5eac32..7ceeefdf 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -74,12 +74,12 @@ class Movies_Controller extends Items_Controller {
         if ($row = Database::instance()
             ->select(array("name", "slug"))
             ->from("items")
-            ->where("parent_id", $movie->parent_id)
+            ->where("parent_id", "=", $movie->parent_id)
             ->where("id <>", $movie->id)
-            ->open_paren()
-            ->where("name", $form->edit_item->filename->value)
-            ->orwhere("slug", $form->edit_item->slug->value)
-            ->close_paren()
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f052eccd..0d7daac4 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -74,12 +74,12 @@ class Photos_Controller extends Items_Controller {
         if ($row = Database::instance()
             ->select(array("name", "slug"))
             ->from("items")
-            ->where("parent_id", $photo->parent_id)
-            ->where("id <>", $photo->id)
-            ->open_paren()
-            ->where("name", $form->edit_item->filename->value)
-            ->orwhere("slug", $form->edit_item->slug->value)
-            ->close_paren()
+            ->where("parent_id", "=", $photo->parent_id)
+            ->where("id", "<>", $photo->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index e5eefad7..a2b2e461 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -50,12 +50,12 @@ class url extends url_Core {
     // In most cases, we'll have an exact match in the relative_url_cache item field.
     // but failing that, walk down the tree until we find it.  The fallback code will fix caches
     // as it goes, so it'll never be run frequently.
-    $item = ORM::factory("item")->where("relative_url_cache", $current_uri)->find();
+    $item = ORM::factory("item")->where("relative_url_cache", "=", $current_uri)->find();
     if (!$item->loaded()) {
       $count = count(Router::$segments);
       foreach (ORM::factory("item")
-               ->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
-               ->where("level", $count + 1)
+               ->where("slug", "=", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
+               ->where("level", "=", $count + 1)
                ->find_all() as $match) {
         if ($match->relative_url() == $current_uri) {
           $item = $match;
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index d0200a73..445f9b86 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -166,11 +166,11 @@ class access_Core {
     // For view permissions, if any parent is self::DENY, then those parents lock this one.
     // Return
     $lock = ORM::factory("item")
-      ->where("`left_ptr` <= $item->left_ptr")
-      ->where("`right_ptr` >= $item->right_ptr")
-      ->where("items.id <> $item->id")
+      ->where("left_ptr", "<=", $item->left_ptr)
+      ->where("right_ptr", ">=", $item->right_ptr)
+      ->where("items.id", "<>", $item->id)
       ->join("access_intents", "items.id", "access_intents.item_id")
-      ->where("access_intents.view_$group->id", self::DENY)
+      ->where("access_intents.view_$group->id", "=", self::DENY)
       ->order_by("level", "DESC")
       ->limit(1)
       ->find();
@@ -304,7 +304,7 @@ class access_Core {
     foreach (self::_get_all_groups() as $group) {
       self::_drop_columns($name, $group);
     }
-    $permission = ORM::factory("permission")->where("name", $name)->find();
+    $permission = ORM::factory("permission")->where("name", "=", $name)->find();
     if ($permission->loaded()) {
       $permission->delete();
     }
@@ -354,7 +354,7 @@ class access_Core {
     $access_cache->item_id = $item->id;
     if ($item->id != 1) {
       $parent_access_cache =
-        ORM::factory("access_cache")->where("item_id", $item->parent()->id)->find();
+        ORM::factory("access_cache")->where("item_id", "=", $item->parent()->id)->find();
       foreach (self::_get_all_groups() as $group) {
         foreach (ORM::factory("permission")->find_all() as $perm) {
           $field = "{$perm->name}_{$group->id}";
@@ -377,8 +377,8 @@ class access_Core {
    * @return void
    */
   static function delete_item($item) {
-    ORM::factory("access_intent")->where("item_id", $item->id)->find()->delete();
-    ORM::factory("access_cache")->where("item_id", $item->id)->find()->delete();
+    ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->delete();
+    ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->delete();
   }
 
   /**
@@ -475,7 +475,7 @@ class access_Core {
    * @return void
    */
   private static function _update_access_view_cache($group, $item) {
-    $access = ORM::factory("access_intent")->where("item_id", $item->id)->find();
+    $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
 
     $db = Database::instance();
     $field = "view_{$group->id}";
@@ -490,10 +490,10 @@ class access_Core {
     // item, then its safe to propagate from here.
     if ($access->$field !== self::DENY) {
       $tmp_item = ORM::factory("item")
-        ->where("left_ptr <", $item->left_ptr)
-        ->where("right_ptr >", $item->right_ptr)
+        ->where("left_ptr", "<", $item->left_ptr)
+        ->where("right_ptr", ">", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
-        ->where("access_intents.$field", self::DENY)
+        ->where("access_intents.$field", "=", self::DENY)
         ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
@@ -512,10 +512,10 @@ class access_Core {
     $query = ORM::factory("access_intent")
       ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr", "items.id"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left_ptr >=", $item->left_ptr)
-      ->where("right_ptr <=", $item->right_ptr)
-      ->where("type", "album")
-      ->where("access_intents.$field IS NOT", self::INHERIT)
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->where("type", "=", "album")
+      ->where("access_intents.$field", "IS NOT", self::INHERIT)
       ->order_by("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
@@ -549,7 +549,7 @@ class access_Core {
    * @return void
    */
   private static function _update_access_non_view_cache($group, $perm_name, $item) {
-    $access = ORM::factory("access_intent")->where("item_id", $item->id)->find();
+    $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
 
     $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
@@ -562,9 +562,9 @@ class access_Core {
     if ($access->$field === self::INHERIT) {
       $tmp_item = ORM::factory("item")
         ->join("access_intents", "items.id", "access_intents.item_id")
-        ->where("left_ptr <", $item->left_ptr)
-        ->where("right_ptr >", $item->right_ptr)
-        ->where("$field IS NOT", self::UNKNOWN)
+        ->where("left_ptr", "<", $item->left_ptr)
+        ->where("right_ptr", ">", $item->right_ptr)
+        ->where($field, "IS NOT", self::UNKNOWN)
         ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
@@ -578,9 +578,9 @@ class access_Core {
     $query = ORM::factory("access_intent")
       ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left_ptr >=", $item->left_ptr)
-      ->where("right_ptr <=", $item->right_ptr)
-      ->where("$field IS NOT", self::INHERIT)
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->where($field, "IS NOT", self::INHERIT)
       ->order_by("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 84a60f83..cd8777e2 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -68,11 +68,11 @@ class album_Core {
     // Randomize the name or slug if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $album->name)
-           ->orwhere("slug", $album->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $album->name)
+           ->orwhere("slug", "=", $album->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $album->name = "{$name}-$rand";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index d09f1c80..40660874 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -45,8 +45,8 @@ class gallery_block_Core {
       $block->css_id = "g-photo-stream";
       $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
-      $block->content->photos =
-        ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
+      $block->content->photos = ORM::factory("item")
+        ->where("type", "=", "photo")->order_by("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
@@ -62,8 +62,8 @@ class gallery_block_Core {
       $block->title = t("Gallery stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count =
-        ORM::factory("item")->where("type", "album")->where("id <>", 1)->count_all();
-      $block->content->photo_count = ORM::factory("item")->where("type", "photo")->count_all();
+        ORM::factory("item")->where("type", "=", "album")->where("id", "<>", 1)->count_all();
+      $block->content->photo_count = ORM::factory("item")->where("type", "=", "photo")->count_all();
       break;
 
     case "platform_info":
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 02bfdf28..fa4db317 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -33,15 +33,15 @@ class gallery_event_Core {
     $db = Database::instance();
     $db->from("tasks")
       ->set(array("owner_id" => $admin->id))
-      ->where(array("owner_id" => $user->id))
+      ->where("owner_id", "=", $user->id)
       ->update();
     $db->from("items")
       ->set(array("owner_id" => $admin->id))
-      ->where(array("owner_id" => $user->id))
+      ->where("owner_id", "=", $user->id)
       ->update();
     $db->from("logs")
       ->set(array("user_id" => $admin->id))
-      ->where(array("user_id" => $user->id))
+      ->where("user_id", "=", $user->id)
       ->update();
   }
 
@@ -50,15 +50,15 @@ class gallery_event_Core {
     $db = Database::instance();
     $db->from("tasks")
       ->set(array("owner_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
     $db->from("items")
       ->set(array("owner_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
     $db->from("logs")
       ->set(array("user_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
   }
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index e195be8d..93ace10b 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -29,13 +29,13 @@ class gallery_rss_Core {
     case "latest":
       $feed->children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
+        ->where("type", "<>", "album")
         ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
+        ->where("type", "<>", "album")
         ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index aef09003..e45a5125 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -61,9 +61,9 @@ class graphics_Core {
    */
   static function remove_rule($module_name, $target, $operation) {
     ORM::factory("graphics_rule")
-      ->where("module_name", $module_name)
-      ->where("target", $target)
-      ->where("operation", $operation)
+      ->where("module_name", "=", $module_name)
+      ->where("target", "=", $target)
+      ->where("operation", "=", $operation)
       ->delete_all();
 
     self::mark_dirty($target == "thumb", $target == "resize");
@@ -181,8 +181,8 @@ class graphics_Core {
     if (empty(self::$_rules_cache[$target])) {
       $rules = array();
       foreach (ORM::factory("graphics_rule")
-               ->where("target", $target)
-               ->where("active", true)
+               ->where("target", "=", $target)
+               ->where("active", "=", true)
                ->order_by("priority", "asc")
                ->find_all() as $rule) {
         $rules[] = (object)$rule->as_array();
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index aaf6ff46..14ab5a85 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -134,12 +134,14 @@ class l10n_client_Core {
       // incoming_translations.message to be NULL?
       $locale = $message_data->locale;
       $entry = ORM::factory("incoming_translation")
-        ->where(array("key" => $key, "locale" => $locale))
+        ->where("key", "=", $key)
+        ->where("locale", "=", $locale)
         ->find();
       if (!$entry->loaded()) {
         // @todo Load a message key -> message (text) dict into memory outside of this loop
         $root_entry = ORM::factory("incoming_translation")
-          ->where(array("key" => $key, "locale" => "root"))
+          ->where("key", "=", $key)
+          ->where("locale", "=", "root")
           ->find();
         $entry->key = $key;
         $entry->message = $root_entry->message;
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 6c09a686..a7ce2c59 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -31,7 +31,7 @@ class l10n_scanner_Core {
       foreach (Database::instance()
                ->select("key")
                ->from("incoming_translations")
-               ->where("locale", "root")
+               ->where("locale", "=", "root")
                ->get() as $row) {
         $cache[$row->key] = true;
       }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index b7e13b9a..d89b8401 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -354,7 +354,8 @@ class module_Core {
       $row = db::build()
         ->select("value")
         ->from("vars")
-        ->where(array("module_name" => "gallery", "name" => "_cache"))
+        ->where("module_name", "=", "gallery")
+        ->where("name", "=", "_cache")
         ->execute()
         ->current();
       if ($row) {
@@ -395,8 +396,8 @@ class module_Core {
    */
   static function set_var($module_name, $name, $value) {
     $var = ORM::factory("var")
-      ->where("module_name", $module_name)
-      ->where("name", $name)
+      ->where("module_name", "=", $module_name)
+      ->where("name", "=", $name)
       ->find();
     if (!$var->loaded()) {
       $var->module_name = $module_name;
@@ -432,8 +433,8 @@ class module_Core {
    */
   static function clear_var($module_name, $name) {
     $var = ORM::factory("var")
-      ->where("module_name", $module_name)
-      ->where("name", $name)
+      ->where("module_name", "=", $module_name)
+      ->where("name", "=", $name)
       ->find();
     if ($var->loaded()) {
       $var->delete();
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index ff86403a..82247eb0 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -90,11 +90,11 @@ class movie_Core {
     // Randomize the name if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $movie->name)
-           ->orwhere("slug", $movie->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $movie->name)
+           ->orwhere("slug", "=", $movie->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $movie->name = "{$name}.$rand.{$pi['extension']}";
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 21cb13a0..2a563043 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -89,11 +89,11 @@ class photo_Core {
     // Randomize the name or slug if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $photo->name)
-           ->orwhere("slug", $photo->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $photo->name)
+           ->orwhere("slug", "=", $photo->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $photo->name = "{$name}.$rand.{$pi['extension']}";
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index d58b935d..04316fff 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -67,7 +67,7 @@ class site_status_Core {
    */
   private static function _add($msg, $severity, $permanent_key) {
     $message = ORM::factory("message")
-      ->where("key", $permanent_key)
+      ->where("key", "=", $permanent_key)
       ->find();
     if (!$message->loaded()) {
       $message->key = $permanent_key;
@@ -82,7 +82,7 @@ class site_status_Core {
    * @param string $permanent_key
    */
   static function clear($permanent_key) {
-    $message = ORM::factory("message")->where("key", $permanent_key)->find();
+    $message = ORM::factory("message")->where("key", "=", $permanent_key)->find();
     if ($message->loaded()) {
       $message->delete();
     }
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index 42fae266..9a5e7dc1 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -131,7 +131,7 @@ class Gallery_I18n_Core {
       foreach (db::build()
                ->select("key", "translation")
                ->from("incoming_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
@@ -141,7 +141,7 @@ class Gallery_I18n_Core {
       foreach (db::build()
                ->select("key", "translation")
                ->from("outgoing_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index eda445b6..a317798e 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -86,7 +86,7 @@ class Cache_Database_Driver extends Cache_Driver {
   public function get_tag($tags) {
     $db = db::build()->from("caches");
     foreach ($tags as $tag) {
-      $db->where("tags", "like", "<$tag>");
+      $db->where("tags", "LIKE", "<$tag>");
     }
     $db_result = $db->execute()->as_array();
 
@@ -152,12 +152,12 @@ class Cache_Database_Driver extends Cache_Driver {
   public function delete($id, $tag = false) {
     $this->db->from("caches");
     if ($id === true) {
-      $this->db->where(1);
       // Delete all caches
+      $this->db->where("1", "=", "1");
     } else if ($tag === true) {
       $this->db->like("tags", "<$id>");
     } else {
-      $this->db->where("key", $id);
+      $this->db->where("key", "=", $id);
     }
 
     $status = $this->db->delete();
@@ -178,7 +178,8 @@ class Cache_Database_Driver extends Cache_Driver {
   public function delete_expired() {
     // Delete all expired caches
     $status = $this->db->from("caches")
-      ->where(array("expiration !=" => 0, "expiration <=" => time()))
+      ->where("expiration", "<>", 0)
+      ->where("expiration", "<=", time())
       ->delete();
 
     return count($status) > 0;
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c8386b1c..c8d25cc5 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -288,9 +288,9 @@ class Item_Model extends ORM_MPTT {
     foreach (Database::instance()
              ->select(array("name", "slug"))
              ->from("items")
-             ->where("left_ptr <=", $this->left_ptr)
-             ->where("right_ptr >=", $this->right_ptr)
-             ->where("id <>", 1)
+             ->where("left_ptr", "<=", $this->left_ptr)
+             ->where("right_ptr", ">=", $this->right_ptr)
+             ->where("id", "<>", 1)
              ->order_by("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
@@ -433,8 +433,8 @@ class Item_Model extends ORM_MPTT {
     // If the comparison column has NULLs in it, we can't use comparators on it and will have to
     // deal with it the hard way.
     $count = $db->from("items")
-      ->where("parent_id", $this->id)
-      ->where($this->sort_column, NULL)
+      ->where("parent_id", "=", $this->id)
+      ->where($this->sort_column, "=", NULL)
       ->where($where)
       ->count_records();
 
@@ -443,8 +443,8 @@ class Item_Model extends ORM_MPTT {
       $sort_column = $this->sort_column;
 
       $position = $db->from("items")
-        ->where("parent_id", $this->id)
-        ->where("$sort_column $comp ", $child->$sort_column)
+        ->where("parent_id", "=", $this->id)
+        ->where($sort_column, $comp, $child->$sort_column)
         ->where($where)
         ->count_records();
 
@@ -457,8 +457,8 @@ class Item_Model extends ORM_MPTT {
       // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
       // our base value.
       foreach ($db->from("items")
-               ->where("parent_id", $this->id)
-               ->where($sort_column, $child->$sort_column)
+               ->where("parent_id", "=", $this->id)
+               ->where($sort_column, "=", $child->$sort_column)
                ->where($where)
                ->order_by(array("id" => "ASC"))
                ->get() as $row) {
@@ -484,7 +484,7 @@ class Item_Model extends ORM_MPTT {
       $position = 0;
       foreach ($db->select("id")
                ->from("items")
-               ->where("parent_id", $this->id)
+               ->where("parent_id", "=", $this->id)
                ->where($where)
                ->order_by($order_by)
                ->get() as $row) {
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index d90d7ed6..771c6a85 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -106,15 +106,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $item = album::create($root,  rand(), "test album");
 
     // New rows exist
-    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
-    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->loaded());
 
     // Delete the item
     $item->delete();
 
     // Rows are gone
-    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
-    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->loaded());
   }
 
   public function new_photos_inherit_parent_permissions_test() {
@@ -131,7 +131,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   public function can_allow_deny_and_reset_intent_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
-    $intent = ORM::factory("access_intent")->where("item_id", $album)->find();
+    $intent = ORM::factory("access_intent")->where("item_id", "=", $album)->find();
 
     // Allow
     access::allow(identity::everybody(), "view", $album);
@@ -141,19 +141,19 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::everybody(), "view", $album);
     $this->assert_same(
       access::DENY,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
     access::allow(identity::everybody(), "view", $album);
     $this->assert_same(
       access::ALLOW,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
 
     access::reset(identity::everybody(), "view", $album);
     $this->assert_same(
       null,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
   }
 
   public function cant_reset_root_item_test() {
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index 6b525265..776c6625 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -20,7 +20,7 @@
 class Cache_Test extends Unit_Test_Case {
   private $_driver;
   public function setup() {
-    Database::instance()->from("caches")->where(1)->delete();
+    Database::instance()->from("caches")->where("1", "=", "1")->delete();
     $this->_driver = new Cache_Database_Driver();
   }
 
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 98bd4046..4f5a1da2 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -20,8 +20,8 @@
 class Database_Test extends Unit_Test_Case {
   function simple_where_test() {
     $sql = Database::instance()
-      ->where("a", 1)
-      ->where("b", 2)
+      ->where("a", "=", 1)
+      ->where("b", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
@@ -29,12 +29,12 @@ class Database_Test extends Unit_Test_Case {
 
   function compound_where_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer2", 2)
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -44,12 +44,12 @@ class Database_Test extends Unit_Test_Case {
 
   function group_first_test() {
     $sql = Database::instance()
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer1", 1)
-      ->where("outer2", 2)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer1", "=", 1)
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -59,11 +59,12 @@ class Database_Test extends Unit_Test_Case {
 
   function where_array_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere(array("inner2" => 2, "inner3" => 3))
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->orwhere("inner3", "=", 3))
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -73,10 +74,10 @@ class Database_Test extends Unit_Test_Case {
 
   function notlike_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->ornotlike("inner1", 1)
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->or_open()
+      ->where("inner1", "NOT LIKE", 1)
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -118,7 +119,7 @@ class Database_Test extends Unit_Test_Case {
 
   function prefix_no_replacement_test() {
     $update = Database_For_Test::instance()->from("test_tables")
-      ->where("1 = 1")
+      ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
       ->update();
 
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 36ced2bb..f36f638f 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -29,7 +29,7 @@ class Gallery_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_registers_gallery_module_test() {
-    $gallery = ORM::factory("module")->where("name", "gallery")->find();
+    $gallery = ORM::factory("module")->where("name", "=", "gallery")->find();
     $this->assert_equal("gallery", $gallery->name);
   }
 
diff --git a/modules/gallery/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index d0555cbf..895e3051 100644
--- a/modules/gallery/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
@@ -29,7 +29,7 @@ class Gallery_I18n_Test extends Unit_Test_Case {
     $this->i18n = Gallery_I18n::instance($config);
 
     ORM::factory("incoming_translation")
-      ->where("locale", "te_ST")
+      ->where("locale", "=", "te_ST")
       ->delete_all();
 
     $messages_te_ST = array(
@@ -62,7 +62,7 @@ class Gallery_I18n_Test extends Unit_Test_Case {
     $locale = $this->i18n->locale();
     $this->assert_equal("de_DE", $locale);
   }
-  
+
   public function translate_simple_test() {
     $result = $this->i18n->translate('Hello world');
     $this->assert_equal('Hallo Welt', $result);
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index a364423a..f0c653c0 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -29,13 +29,13 @@ class Item_Helper_Test extends Unit_Test_Case {
     access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
-      ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
+      ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
 
     // We can't see the item when permissions are denied
     access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
-      ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
+      ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
   }
 
   public function validate_url_safe_test() {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index e6d09d74..951e6e52 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -54,7 +54,7 @@ class notification_event_Core {
 
   static function user_deleted($user) {
     ORM::factory("subscriptions")
-      ->where(array("user_id", $user->id))
+      ->where("user_id", "=", $user->id)
       ->delete_all();
   }
 
@@ -88,7 +88,7 @@ class notification_event_Core {
   static function user_before_delete($user) {
     try {
       ORM::factory("subscription")
-        ->where("user_id", $user->id)
+        ->where("user_id", "=", $user->id)
         ->delete_all();
     } catch (Exception $e) {
       Kohana_Log::add("error", "@todo notification_event::user_before_delete() failed");
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 9d732c11..c0bb1b32 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -60,7 +60,7 @@ class search_Core {
 
   static function update($item) {
     $data = new ArrayObject();
-    $record = ORM::factory("search_record")->where("item_id", $item->id)->find();
+    $record = ORM::factory("search_record")->where("item_id", "=", $item->id)->find();
     if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
@@ -76,10 +76,10 @@ class search_Core {
       ->select("items.id")
       ->from("items")
       ->join("search_records", "items.id", "search_records.item_id", "left")
-      ->open_paren()
-      ->where("search_records.item_id", null)
-      ->orwhere("search_records.dirty", 1)
-      ->close_paren()
+      ->and_open()
+      ->where("search_records.item_id", "=", null)
+      ->orwhere("search_records.dirty", "=", 1)
+      ->close()
       ->get()
       ->count();
 
diff --git a/modules/search/helpers/search_event.php b/modules/search/helpers/search_event.php
index 836bbe15..1add6e5f 100644
--- a/modules/search/helpers/search_event.php
+++ b/modules/search/helpers/search_event.php
@@ -28,7 +28,7 @@ class search_event_Core {
 
   static function item_deleted($item) {
     ORM::factory("search_record")
-      ->where("item_id", $item->id)
+      ->where("item_id", "=", $item->id)
       ->delete_all();
   }
 
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 9508f420..061f4084 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -45,8 +45,8 @@ class search_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
-               ->where("search_records.item_id", null)
-               ->orwhere("search_records.dirty", 1)
+               ->where("search_records.item_id", "=", null)
+               ->orwhere("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 053a1891..3c3a6c2b 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -177,7 +177,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->percent_complete = min($task->percent_complete + 0.1, 10);
       $task->status = t2("Found one file", "Found %count files",
                          Database::instance()
-                         ->where("task_id", $task->id)
+                         ->where("task_id", "=", $task->id)
                          ->count_records("server_add_files"));
 
       if (!$queue) {
@@ -197,8 +197,8 @@ class Server_Add_Controller extends Admin_Controller {
       // will create albums first.  Ignore entries which already have an Item_Model attached,
       // they're done.
       $entries = ORM::factory("server_add_file")
-        ->where("task_id", $task->id)
-        ->where("item_id", null)
+        ->where("task_id", "=", $task->id)
+        ->where("item_id", "=", null)
         ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
@@ -265,7 +265,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->done = true;
       $task->state = "success";
       $task->percent_complete = 100;
-      ORM::factory("server_add_file")->where("task_id", $task->id)->delete_all();
+      ORM::factory("server_add_file")->where("task_id", "=", $task->id)->delete_all();
       message::info(t2("Successfully added one photo / album",
                        "Successfully added %count photos / albums",
                        $task->get("completed_files")));
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index aff44803..6cd2f337 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
   }
 
   public function check_for_duplicate(Validation $post_data, $field) {
-    $tag_exists = ORM::factory("tag")->where("name", $post_data[$field])->count_all();
+    $tag_exists = ORM::factory("tag")->where("name", "=", $post_data[$field])->count_all();
     if ($tag_exists) {
       $post_data->add_error($field, "in_use");
     }
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 8694bcec..c4c4ba15 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -33,7 +33,7 @@ class tag_Core {
       throw new exception("@todo MISSING_TAG_NAME");
     }
 
-    $tag = ORM::factory("tag")->where("name", $tag_name)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
     if (!$tag->loaded()) {
       $tag->name = $tag_name;
       $tag->count = 0;
@@ -93,7 +93,7 @@ class tag_Core {
              ->select("name")
              ->from("tags")
              ->join("items_tags", "tags.id", "items_tags.tag_id", "left")
-             ->where("items_tags.item_id", $item->id)
+             ->where("items_tags.item_id", "=", $item->id)
              ->get() as $row) {
       $tags[] = $row->name;
     }
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index be020f5f..f9a453be 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -31,9 +31,9 @@ class Tag_Model extends ORM {
     $model = ORM::factory("item")
       ->viewable()
       ->join("items_tags", "items.id", "items_tags.item_id")
-      ->where("items_tags.tag_id", $this->id);
+      ->where("items_tags.tag_id", "=", $this->id);
     if ($type) {
-      $model->where("items.type", $type);
+      $model->where("items.type", "=", $type);
     }
     return $model->find_all($limit, $offset);
   }
@@ -47,10 +47,10 @@ class Tag_Model extends ORM {
     $model = ORM::factory("item")
       ->viewable()
       ->join("items_tags", "items.id", "items_tags.item_id")
-      ->where("items_tags.tag_id", $this->id);
+      ->where("items_tags.tag_id", "=", $this->id);
 
     if ($type) {
-      $model->where("items.type", $type);
+      $model->where("items.type", "=", $type);
     }
     return $model->count_all();
   }
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c9a96286..c96e7f2b 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -25,18 +25,18 @@ class Tag_Test extends Unit_Test_Case {
     $tag1 = "tag1";
 
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     // Make sure adding the tag again doesn't increase the count
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     $rand = rand();
     $album = album::create($root, $rand, $rand, $rand);
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(2, $tag->count);
   }
 }
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 1beaa1c2..2ada0ac1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -31,7 +31,7 @@ class group_Core {
    * @return Group_Definition the group object
    */
   static function create($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
+    $group = ORM::factory("group")->where("name", "=", $name)->find();
     if ($group->loaded()) {
       throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
     }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 4ed9daee..5027580c 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -44,7 +44,7 @@ class user_Core {
    * @return User_Model
    */
   static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
+    $user = ORM::factory("user")->where("name", "=", $name)->find();
     if ($user->loaded()) {
       throw new Exception("@todo USER_ALREADY_EXISTS $name");
     }
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 6aedfde5..163b7d79 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -21,14 +21,14 @@
 class User_Groups_Test extends Unit_Test_Case {
   public function teardown() {
     try {
-      $group = ORM::factory("group")->where("name", "user_groups_test")->find();
+      $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
       if ($group->loaded()) {
         $group->delete();
       }
     } catch (Exception $e) { }
 
     try {
-      $user = ORM::factory("user")->where("name", "user_groups_test")->find();
+      $user = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
       if ($user->loaded()) {
         $user->delete();
       }
-- 
cgit v1.2.3


From dd2bca022479f5971ca3afd3d8284474c6c5e87a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 12:54:07 -0800
Subject: Modify the expiration code to work with db::build()

---
 modules/comment/controllers/admin_comments.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 271c7d51..c67fc4a4 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -22,10 +22,11 @@ class Admin_Comments_Controller extends Admin_Controller {
 
   public function index() {
     // Get rid of old deleted/spam comments once in a while
-    Database::instance()->query(
-      "DELETE FROM {comments} " .
-      "WHERE state IN ('deleted', 'spam') " .
-      "AND unix_timestamp(now()) - updated > 86400 * 7");
+    db::build()
+      ->delete("comments")
+      ->where("state", "IN", array("deleted", "spam"))
+      ->where("updated", "<", "UNIX_TIMESTAMP() - 86400 * 7")
+      ->execute();
 
     // Redirect to the appropriate queue
     url::redirect("admin/comments/queue/unpublished");
-- 
cgit v1.2.3


From d036e2fc49a41771fb16decb0ce699245d40cff0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 13:18:10 -0800
Subject: Convert another Database::instance() query over to using db::build()

---
 modules/comment/controllers/admin_comments.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index c67fc4a4..880c33a7 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -96,11 +96,12 @@ class Admin_Comments_Controller extends Admin_Controller {
     $counts->published = 0;
     $counts->spam = 0;
     $counts->deleted = 0;
-    foreach (Database::instance()
-             ->select("state", "count(*) as c")
+    foreach (db::build()
+             ->select("state")
+             ->select(array("c" => 'COUNT("*")'))
              ->from("comments")
-             ->groupby("state")
-             ->get() as $row) {
+             ->group_by("state")
+             ->execute() as $row) {
       $counts->{$row->state} = $row->c;
     }
     return $counts;
-- 
cgit v1.2.3


From f77b26e988048bfd31d1e59695fe7ca015696a24 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 14:38:01 -0800
Subject: Add kohana23_compat module to bring along functionality that got
 deleted, but we still want.  Start off with the Pagination library.

---
 application/config/config.php                    |   1 +
 modules/kohana23_compat/config/pagination.php    |  25 +++
 modules/kohana23_compat/libraries/Pagination.php | 234 +++++++++++++++++++++++
 3 files changed, 260 insertions(+)
 create mode 100644 modules/kohana23_compat/config/pagination.php
 create mode 100644 modules/kohana23_compat/libraries/Pagination.php

diff --git a/application/config/config.php b/application/config/config.php
index ad485266..aecc400c 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -142,6 +142,7 @@ $config['config_drivers'] = array();
  */
 $config["modules"] = array(
   MODPATH . "forge",
+  MODPATH . "kohana23_compat",
   MODPATH . "gallery",  // gallery must be *last* in the order
 );
 
diff --git a/modules/kohana23_compat/config/pagination.php b/modules/kohana23_compat/config/pagination.php
new file mode 100644
index 00000000..808fc315
--- /dev/null
+++ b/modules/kohana23_compat/config/pagination.php
@@ -0,0 +1,25 @@
+ 'pagination',
+	'style'          => 'classic',
+	'uri_segment'    => 3,
+	'query_string'   => '',
+	'items_per_page' => 20,
+	'auto_hide'      => FALSE,
+);
diff --git a/modules/kohana23_compat/libraries/Pagination.php b/modules/kohana23_compat/libraries/Pagination.php
new file mode 100644
index 00000000..8ff8bf94
--- /dev/null
+++ b/modules/kohana23_compat/libraries/Pagination.php
@@ -0,0 +1,234 @@
+initialize($config);
+	}
+
+	/**
+	 * Sets config values.
+	 *
+	 * @throws  Kohana_Exception
+	 * @param   array  configuration settings
+	 * @return  void
+	 */
+	public function initialize($config = array())
+	{
+		// Load config group
+		if (isset($config['group']))
+		{
+			// Load and validate config group
+			if ( ! is_array($group_config = Kohana::config('pagination.'.$config['group'])))
+				throw new Kohana_Exception('pagination.undefined_group: ' . $config['group']);
+
+			// All pagination config groups inherit default config group
+			if ($config['group'] !== 'default')
+			{
+				// Load and validate default config group
+				if ( ! is_array($default_config = Kohana::config('pagination.default')))
+					throw new Kohana_Exception('pagination.undefined_group: default');
+
+				// Merge config group with default config group
+				$group_config += $default_config;
+			}
+
+			// Merge custom config items with config group
+			$config += $group_config;
+		}
+
+		// Assign config values to the object
+		foreach ($config as $key => $value)
+		{
+			if (property_exists($this, $key))
+			{
+				$this->$key = $value;
+			}
+		}
+
+		// Clean view directory
+		$this->directory = trim($this->directory, '/').'/';
+
+		// Build generic URL with page in query string
+		if ($this->query_string !== '')
+		{
+			// Extract current page
+			$this->current_page = isset($_GET[$this->query_string]) ? (int) $_GET[$this->query_string] : 1;
+
+			// Insert {page} placeholder
+			$_GET[$this->query_string] = '{page}';
+
+			// Create full URL
+			$base_url = ($this->base_url === '') ? Router::$current_uri : $this->base_url;
+			$this->url = url::site($base_url).'?'.str_replace('%7Bpage%7D', '{page}', http_build_query($_GET));
+
+			// Reset page number
+			$_GET[$this->query_string] = $this->current_page;
+		}
+
+		// Build generic URL with page as URI segment
+		else
+		{
+			// Use current URI if no base_url set
+			$this->url = ($this->base_url === '') ? Router::$segments : explode('/', trim($this->base_url, '/'));
+
+			// Convert uri 'label' to corresponding integer if needed
+			if (is_string($this->uri_segment))
+			{
+				if (($key = array_search($this->uri_segment, $this->url)) === FALSE)
+				{
+					// If uri 'label' is not found, auto add it to base_url
+					$this->url[] = $this->uri_segment;
+					$this->uri_segment = count($this->url) + 1;
+				}
+				else
+				{
+					$this->uri_segment = $key + 2;
+				}
+			}
+
+			// Insert {page} placeholder
+			$this->url[$this->uri_segment - 1] = '{page}';
+
+			// Create full URL
+			$this->url = url::site(implode('/', $this->url)).Router::$query_string;
+
+			// Extract current page
+			$this->current_page = URI::instance()->segment($this->uri_segment);
+		}
+
+		// Core pagination values
+		$this->total_items        = (int) max(0, $this->total_items);
+		$this->items_per_page     = (int) max(1, $this->items_per_page);
+		$this->total_pages        = (int) ceil($this->total_items / $this->items_per_page);
+		$this->current_page       = (int) min(max(1, $this->current_page), max(1, $this->total_pages));
+		$this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items);
+		$this->current_last_item  = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items);
+
+		// If there is no first/last/previous/next page, relative to the
+		// current page, value is set to FALSE. Valid page number otherwise.
+		$this->first_page         = ($this->current_page === 1) ? FALSE : 1;
+		$this->last_page          = ($this->current_page >= $this->total_pages) ? FALSE : $this->total_pages;
+		$this->previous_page      = ($this->current_page > 1) ? $this->current_page - 1 : FALSE;
+		$this->next_page          = ($this->current_page < $this->total_pages) ? $this->current_page + 1 : FALSE;
+
+		// SQL values
+		$this->sql_offset         = (int) ($this->current_page - 1) * $this->items_per_page;
+		$this->sql_limit          = sprintf(' LIMIT %d OFFSET %d ', $this->items_per_page, $this->sql_offset);
+	}
+
+	/**
+	 * Generates the HTML for the chosen pagination style.
+	 *
+	 * @param   string  pagination style
+	 * @return  string  pagination html
+	 */
+	public function render($style = NULL)
+	{
+		// Hide single page pagination
+		if ($this->auto_hide === TRUE AND $this->total_pages <= 1)
+			return '';
+
+		if ($style === NULL)
+		{
+			// Use default style
+			$style = $this->style;
+		}
+
+		// Return rendered pagination view
+		return View::factory($this->directory.$style, get_object_vars($this))->render();
+	}
+
+	/**
+	 * Magically converts Pagination object to string.
+	 *
+	 * @return  string  pagination html
+	 */
+	public function __toString()
+	{
+		return $this->render();
+	}
+
+	/**
+	 * Magically gets a pagination variable.
+	 *
+	 * @param   string  variable key
+	 * @return  mixed   variable value if the key is found
+	 * @return  void    if the key is not found
+	 */
+	public function __get($key)
+	{
+		if (isset($this->$key))
+			return $this->$key;
+	}
+
+	/**
+	 * Adds a secondary interface for accessing properties, e.g. $pagination->total_pages().
+	 * Note that $pagination->total_pages is the recommended way to access properties.
+	 *
+	 * @param   string  function name
+	 * @return  string
+	 */
+	public function __call($func, $args = NULL)
+	{
+		return $this->__get($func);
+	}
+
+} // End Pagination Class
\ No newline at end of file
-- 
cgit v1.2.3


From 54be15191b983e72b4643f3559303b35b7c48795 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 18:47:40 -0800
Subject: Overload Database_Builder to add merge_where() which takes predefined
 where clauses and adds them to the existing query.  Update all existing
 queries that take an additional where clause to use it.

---
 modules/gallery/controllers/movies.php             |  2 +-
 modules/gallery/controllers/photos.php             |  2 +-
 modules/gallery/libraries/ORM_MPTT.php             |  8 +++---
 modules/gallery/models/item.php                    | 16 ++++++-----
 .../libraries/MY_Database_Builder.php              | 31 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 modules/kohana23_compat/libraries/MY_Database_Builder.php

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 7ceeefdf..157c388f 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -21,7 +21,7 @@ class Movies_Controller extends Items_Controller {
   public function _show($movie) {
     access::required("view", $movie);
 
-    $where = array("type != " => "album");
+    $where = array(array("type", "!=", "album"));
     $position = $movie->parent()->get_position($movie, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 0d7daac4..478447b1 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -21,7 +21,7 @@ class Photos_Controller extends Items_Controller {
   public function _show($photo) {
     access::required("view", $photo);
 
-    $where = array("type != " => "album");
+    $where = array(array("type", "!=", "album"));
     $position = $photo->parent()->get_position($photo, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 01b2d7b7..90b9d38a 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -152,7 +152,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -170,7 +170,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function children_count($where=null) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -189,7 +189,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -207,7 +207,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function descendants_count($where=null) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c8d25cc5..acc4e96f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -428,14 +428,14 @@ class Item_Model extends ORM_MPTT {
     } else {
       $comp = "<";
     }
-    $db = Database::instance();
+    $db = db::build();
 
     // If the comparison column has NULLs in it, we can't use comparators on it and will have to
     // deal with it the hard way.
     $count = $db->from("items")
       ->where("parent_id", "=", $this->id)
       ->where($this->sort_column, "=", NULL)
-      ->where($where)
+      ->merge_where($where)
       ->count_records();
 
     if (empty($count)) {
@@ -445,7 +445,7 @@ class Item_Model extends ORM_MPTT {
       $position = $db->from("items")
         ->where("parent_id", "=", $this->id)
         ->where($sort_column, $comp, $child->$sort_column)
-        ->where($where)
+        ->merge_where($where)
         ->count_records();
 
       // We stopped short of our target value in the sort (notice that we're using a < comparator
@@ -456,12 +456,14 @@ class Item_Model extends ORM_MPTT {
       //
       // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
       // our base value.
-      foreach ($db->from("items")
+      foreach ($db
+               ->select("id")
+               ->from("items")
                ->where("parent_id", "=", $this->id)
                ->where($sort_column, "=", $child->$sort_column)
-               ->where($where)
+               ->merge_where($where)
                ->order_by(array("id" => "ASC"))
-               ->get() as $row) {
+               ->execute() as $row) {
         $position++;
         if ($row->id == $child->id) {
           break;
@@ -485,7 +487,7 @@ class Item_Model extends ORM_MPTT {
       foreach ($db->select("id")
                ->from("items")
                ->where("parent_id", "=", $this->id)
-               ->where($where)
+               ->merge_where($where)
                ->order_by($order_by)
                ->get() as $row) {
         $position++;
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
new file mode 100644
index 00000000..974f9c6d
--- /dev/null
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -0,0 +1,31 @@
+where($tuple[0], $tuple[1], $tuple[2]);
+    }
+    return $this;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9fd6a0a63e95f1fd73e0ebb224c1c1dd30686858 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 19:23:36 -0800
Subject: Convert Database::instance() -> db::build()

---
 modules/exif/helpers/exif_theme.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/exif/helpers/exif_theme.php b/modules/exif/helpers/exif_theme.php
index db51f305..23dc95c2 100644
--- a/modules/exif/helpers/exif_theme.php
+++ b/modules/exif/helpers/exif_theme.php
@@ -21,11 +21,11 @@ class exif_theme_Core {
   static function sidebar_bottom($theme) {
     $item = $theme->item();
     if ($item && $item->is_photo()) {
-      $record = Database::instance()
+      $record = db::build()
         ->select("key_count")
         ->from("exif_records")
         ->where("item_id", "=", $item->id)
-        ->get()
+        ->execute()
         ->current();
       if ($record && $record->key_count) {
         $view = new View("exif_sidebar.html");
-- 
cgit v1.2.3


From e0e882baabe9d4436c12bd57f903159c3b0274d9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 19:25:09 -0800
Subject: Fix the arguments to Item_Model::descendants_count()

---
 modules/slideshow/helpers/slideshow_event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index 0afe8126..9b77dd42 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -32,7 +32,7 @@ class slideshow_event_Core {
 
   static function album_menu($menu, $theme) {
     $descendants_count = ORM::factory("item", $theme->item()->id)
-      ->descendants_count(array("type" => "photo"));
+      ->descendants_count(array(array("type", "=", "photo")));
     if ($descendants_count > 1) {
       $menu->append(Menu::factory("link")
                     ->id("slideshow")
-- 
cgit v1.2.3


From e8fb773b68335e955602c0d912e13c0f5ba23d58 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 19:33:03 -0800
Subject: Update all portable where clauses to the new Kohana 2.4 format.

---
 modules/gallery/helpers/gallery_rss.php       | 4 ++--
 modules/gallery/tests/ORM_MPTT_Test.php       | 4 ++--
 modules/organize/views/organize_tree.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 93ace10b..4aef27ad 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -49,9 +49,9 @@ class gallery_rss_Core {
 
       $feed->children = $item
         ->viewable()
-        ->descendants($limit, $offset, array("type" => "photo"));
+        ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
-        $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
+        $item->viewable()->descendants_count(array("type", "=", "photo")) / $limit);
       $feed->title = html::purify($item->title);
       $feed->description = nl2br(html::purify($item->description));
 
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index a749542b..36a81d2c 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -228,7 +228,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent->reload();
 
     $this->assert_equal(3, $parent->descendants_count());
-    $this->assert_equal(2, $parent->descendants_count(array("type" => "photo")));
-    $this->assert_equal(1, $parent->descendants_count(array("type" => "album")));
+    $this->assert_equal(2, $parent->descendants_count(array(array("type", "=", "photo"))));
+    $this->assert_equal(1, $parent->descendants_count(array(array("type", "=", "album"))));
   }
 }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 740c2521..1ccb942c 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -8,7 +8,7 @@
     title) ?>
   
   
        
-    children(null, 0, array("type" => "album")) as $child): ?>
+    children(null, 0, array(array("type", "=", "album"))) as $child): ?>
     contains($selected)): ?>
      $selected, "album" => $child)); ?>
     
-- 
cgit v1.2.3


From a3d904bcbab7cb153c2b617fc4389175ed00a4fc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 19:36:57 -0800
Subject: ORM::find_all() now uses null as the default value for offset.

---
 modules/gallery/libraries/ORM_MPTT.php        | 2 +-
 modules/gallery/models/item.php               | 2 +-
 modules/organize/views/organize_tree.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 90b9d38a..a67f05be 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -150,7 +150,7 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
+  function children($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
       $this->merge_where($where);
     }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index acc4e96f..16c57dbc 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -597,7 +597,7 @@ class Item_Model extends ORM_MPTT {
    * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+  function children($limit=null, $offset=null, $where=array(), $order_by=null) {
     if (empty($order_by)) {
       $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 1ccb942c..c5257956 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -8,7 +8,7 @@
     title) ?>
   
   
          
-    children(null, 0, array(array("type", "=", "album"))) as $child): ?>
+    children(null, null, array(array("type", "=", "album"))) as $child): ?>
     contains($selected)): ?>
      $selected, "album" => $child)); ?>
     
-- 
cgit v1.2.3


From 3dd8bf245ea16fe1b9f1c27c4ad42d11d3cde1ee Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 20:24:16 -0800
Subject: Kohana::$user_agent moved to the request helper and is protected, so
 instead set the user agent into $_SERVER.

---
 modules/gallery/hooks/init_gallery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index 4ce9bab4..c7355260 100644
--- a/modules/gallery/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -42,5 +42,5 @@ if ($g3sid = $input->post("g3sid", $input->get("g3sid"))) {
 }
 
 if ($user_agent = $input->post("user_agent", $input->get("user_agent"))) {
-  Kohana::$user_agent = $user_agent;
+  $_SERVER["HTTP_USER_AGENT"] = $user_agent;
 }
-- 
cgit v1.2.3


From dee3ee81e2013f0b38e0f84123dec2ce12574bd7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 20:25:32 -0800
Subject: Database::orwhere() is now Database_Builder::or_where()

---
 modules/exif/helpers/exif.php           | 2 +-
 modules/exif/helpers/exif_task.php      | 2 +-
 modules/gallery/controllers/albums.php  | 2 +-
 modules/gallery/controllers/movies.php  | 2 +-
 modules/gallery/controllers/photos.php  | 2 +-
 modules/gallery/helpers/album.php       | 2 +-
 modules/gallery/helpers/movie.php       | 2 +-
 modules/gallery/helpers/photo.php       | 2 +-
 modules/gallery/tests/Database_Test.php | 8 ++++----
 modules/search/helpers/search.php       | 2 +-
 modules/search/helpers/search_task.php  | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b4241e89..a8b12a8b 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -146,7 +146,7 @@ class exif_Core {
       ->where("type", "=", "photo")
       ->and_open()
       ->where("exif_records.item_id", "=", null)
-      ->orwhere("exif_records.dirty", "=", 1)
+      ->or_where("exif_records.dirty", "=", 1)
       ->close()
       ->get()
       ->count();
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 1a449fc7..66f69790 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -47,7 +47,7 @@ class exif_task_Core {
                ->where("type", "=", "photo")
                ->and_open()
                ->where("exif_records.item_id", "=", null)
-               ->orwhere("exif_records.dirty", "=", 1)
+               ->or_where("exif_records.dirty", "=", 1)
                ->close()
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 431d98a0..32db48d4 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -130,7 +130,7 @@ class Albums_Controller extends Items_Controller {
             ->where("id", "<>", $album->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->dirname->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 157c388f..e017b8c8 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -78,7 +78,7 @@ class Movies_Controller extends Items_Controller {
             ->where("id <>", $movie->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->filename->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 478447b1..5431fcfe 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -78,7 +78,7 @@ class Photos_Controller extends Items_Controller {
             ->where("id", "<>", $photo->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->filename->value)
-            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
             ->get()
             ->current()) {
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index cd8777e2..0ffb0fc6 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -71,7 +71,7 @@ class album_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $album->name)
-           ->orwhere("slug", "=", $album->slug)
+           ->or_where("slug", "=", $album->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 82247eb0..96dafe11 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -93,7 +93,7 @@ class movie_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $movie->name)
-           ->orwhere("slug", "=", $movie->slug)
+           ->or_where("slug", "=", $movie->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 2a563043..cc309e28 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -92,7 +92,7 @@ class photo_Core {
            ->where("parent_id", "=", $parent->id)
            ->and_open()
            ->where("name", "=", $photo->name)
-           ->orwhere("slug", "=", $photo->slug)
+           ->or_where("slug", "=", $photo->slug)
            ->close()
            ->find()->id) {
       $rand = rand();
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 4f5a1da2..9b428379 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -32,7 +32,7 @@ class Database_Test extends Unit_Test_Case {
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
+      ->or_where("inner2", "=", 2)
       ->close()
       ->where("outer2", "=", 2)
       ->compile();
@@ -46,7 +46,7 @@ class Database_Test extends Unit_Test_Case {
     $sql = Database::instance()
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
+      ->or_where("inner2", "=", 2)
       ->close()
       ->where("outer1", "=", 1)
       ->where("outer2", "=", 2)
@@ -62,8 +62,8 @@ class Database_Test extends Unit_Test_Case {
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
-      ->orwhere("inner2", "=", 2)
-      ->orwhere("inner3", "=", 3))
+      ->or_where("inner2", "=", 2)
+      ->or_where("inner3", "=", 3))
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index c0bb1b32..1fd5175f 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -78,7 +78,7 @@ class search_Core {
       ->join("search_records", "items.id", "search_records.item_id", "left")
       ->and_open()
       ->where("search_records.item_id", "=", null)
-      ->orwhere("search_records.dirty", "=", 1)
+      ->or_where("search_records.dirty", "=", 1)
       ->close()
       ->get()
       ->count();
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 061f4084..6b35cabc 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -46,7 +46,7 @@ class search_task_Core {
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
                ->where("search_records.item_id", "=", null)
-               ->orwhere("search_records.dirty", "=", 1)
+               ->or_where("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
-- 
cgit v1.2.3


From e79e0d1980f186edb97f242b378db8e5a7579db3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 20:47:30 -0800
Subject: Make ORM::__call() always return an ORM so that it's chainable.

---
 system/libraries/ORM.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php
index 1d1f48f5..eff22fc0 100644
--- a/system/libraries/ORM.php
+++ b/system/libraries/ORM.php
@@ -242,7 +242,7 @@ class ORM_Core {
 						else
 						{
 							// Support for things like reset_select, reset_write, list_tables
-							return $this->db_builder->$method();
+							$this->db_builder->$method();
 						}
 					break;
 					case 1:
-- 
cgit v1.2.3


From ddf668d43958e060f5aa4a14a4ef8dc8d2b51d2b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 21:14:17 -0800
Subject: utf8::clean() is now Input::clean()

---
 modules/exif/helpers/exif.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index a8b12a8b..d3a8c103 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -39,7 +39,7 @@ class exif_Core {
             if (function_exists("mb_detect_encoding") && mb_detect_encoding($value) != "UTF-8") {
               $value = utf8_encode($value);
             }
-            $keys[$field] = utf8::clean($value);
+            $keys[$field] = Input::clean($value);
 
             if ($field == "DateTime") {
               $time = strtotime($value);
@@ -62,7 +62,7 @@ class exif_Core {
             if (function_exists("mb_detect_encoding") && mb_detect_encoding($value) != "UTF-8") {
               $value = utf8_encode($value);
             }
-            $keys[$keyword] = utf8::clean($value);
+            $keys[$keyword] = Input::clean($value);
 
             if ($keyword == "Caption" && !$item->description) {
               $item->description = $value;
-- 
cgit v1.2.3


From b9a0e0963746420d82ad3107135aa7a9256825be Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 21:14:43 -0800
Subject: Kohana::config_xxx() is now Kohana_Config::instance()->xxx

---
 modules/gallery/helpers/graphics.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index e45a5125..c93cc304 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -371,18 +371,18 @@ class graphics_Core {
     }
     switch(module::get_var("gallery", "graphics_toolkit")) {
     case "gd":
-      Kohana::config_set("image.driver", "GD");
+      Kohana_Config::instance()->set("image.driver", "GD");
       break;
 
     case "imagemagick":
-      Kohana::config_set("image.driver", "ImageMagick");
-      Kohana::config_set(
+      Kohana_Config::instance()->set("image.driver", "ImageMagick");
+      Kohana_Config::instance()->set(
         "image.params.directory", module::get_var("gallery", "graphics_toolkit_path"));
       break;
 
     case "graphicsmagick":
-      Kohana::config_set("image.driver", "GraphicsMagick");
-      Kohana::config_set(
+      Kohana_Config::instance()->set("image.driver", "GraphicsMagick");
+      Kohana_Config::instance()->set(
         "image.params.directory", module::get_var("gallery", "graphics_toolkit_path"));
       break;
     }
-- 
cgit v1.2.3


From 96b00d6cfe437e376d5547a10aa8d1cf7def8c13 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 26 Nov 2009 21:14:54 -0800
Subject: Convert some more Database::instance() calls to db::build() form.

---
 modules/comment/helpers/comment_event.php     |  5 +-
 modules/gallery/helpers/item.php              |  4 +-
 modules/gallery/libraries/ORM_MPTT.php        | 90 +++++++++++++++++----------
 modules/gallery/models/item.php               |  6 +-
 modules/notification/helpers/notification.php |  4 +-
 modules/tag/helpers/tag.php                   |  4 +-
 6 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index cf5d0a60..c90f7663 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -62,12 +62,11 @@ class comment_event_Core {
   }
 
   static function item_index_data($item, $data) {
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("text")
              ->from("comments")
              ->where("item_id", "=", $item->id)
-             ->get()
-             ->as_array() as $row) {
+             ->execute() as $row) {
       $data[] = $row->text;
     }
   }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 7496d368..c3126435 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -140,10 +140,10 @@ class item_Core {
     // Guard against an empty result when we create the first item.  It's unfortunate that we
     // have to check this every time.
     // @todo: figure out a better way to bootstrap the weight.
-    $result = Database::instance()
+    $result = db::build()
       ->select("weight")->from("items")
       ->order_by("weight", "desc")->limit(1)
-      ->get()->current();
+      ->execute()->current();
     return ($result ? $result->weight : 0) + 1;
   }
 
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index a67f05be..0ec0a848 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -51,10 +51,16 @@ class ORM_MPTT_Core extends ORM {
 
     try {
       // Make a hole in the parent for this new item
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` + 2 WHERE `left_ptr` >= {$parent->right_ptr}");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` + 2 WHERE `right_ptr` >= {$parent->right_ptr}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + 2"))
+        ->where("left_ptr", ">=", $parent->right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` + 2"))
+        ->where("right_ptr", ">=", $parent->right_ptr)
+        ->execute();
       $parent->right_ptr += 2;
 
       // Insert this item into the hole
@@ -92,10 +98,16 @@ class ORM_MPTT_Core extends ORM {
 
     $this->lock();
     try {
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` - 2 WHERE `left_ptr` > {$this->right_ptr}");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` - 2 WHERE `right_ptr` > {$this->right_ptr}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` - 2"))
+        ->where("left_ptr", ">", $this->right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` - 2"))
+        ->where("right_ptr", ">", $this->right_ptr)
+        ->execute();
     } catch (Exception $e) {
       $this->unlock();
       throw $e;
@@ -239,23 +251,32 @@ class ORM_MPTT_Core extends ORM {
     try {
       if ($level_delta) {
         // Update the levels for the to-be-moved items
-        $this->db->query(
-          "UPDATE {{$this->table_name}} SET `level` = `level` + $level_delta" .
-          " WHERE `left_ptr` >= $original_left_ptr AND `right_ptr` <= $original_right_ptr");
+        $this->db_builder
+          ->update($this->table_name)
+          ->set("level", new Database_Expression("`level` + $level_delta"))
+          ->where("left_ptr", ">=", $original_left_ptr)
+          ->where("right_ptr", "<=", $original_right_ptr)
+          ->execute();
       }
 
       // Make a hole in the target for the move
-      $target->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` + $size_of_hole" .
-        " WHERE `left_ptr` >= $target_right_ptr");
-      $target->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` + $size_of_hole" .
-        " WHERE `right_ptr` >= $target_right_ptr");
+      $target->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + $size_of_hole"))
+        ->where("left_ptr", ">=", $target_right_ptr)
+        ->execute();
+      $target->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` + $size_of_hole"))
+        ->where("right_ptr", ">=", $target_right_ptr)
+        ->execute();
 
       // Change the parent.
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `parent_id` = {$target->id}" .
-        " WHERE `id` = {$this->id}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("parent_id", $target->id)
+        ->where("id", "=", $this->id)
+        ->execute();
 
       // If the source is to the right of the target then we just adjusted its left_ptr and right_ptr above.
       $left_ptr = $original_left_ptr;
@@ -266,20 +287,25 @@ class ORM_MPTT_Core extends ORM {
       }
 
       $new_offset = $target->right_ptr - $left_ptr;
-      $this->db->query(
-        "UPDATE {{$this->table_name}}" .
-        "   SET `left_ptr` = `left_ptr` + $new_offset," .
-        "       `right_ptr` = `right_ptr` + $new_offset" .
-      " WHERE `left_ptr` >= $left_ptr" .
-        "   AND `right_ptr` <= $right_ptr");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + $new_offset"))
+        ->set("right_ptr", new Database_Expression("`right_ptr` + $new_offset"))
+        ->where("left_ptr", ">=", $left_ptr)
+        ->where("right_ptr", "<=", $right_ptr)
+        ->execute();
 
       // Close the hole in the source's parent after the move
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` - $size_of_hole" .
-        " WHERE `left_ptr` > $right_ptr");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` - $size_of_hole" .
-        " WHERE `right_ptr` > $right_ptr");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` - $size_of_hole"))
+        ->where("left_ptr", ">", $right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` - $size_of_hole"))
+        ->where("right_ptr", ">", $right_ptr)
+        ->execute();
     } catch (Exception $e) {
       $this->unlock();
       throw $e;
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 16c57dbc..8a42cc1e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -285,14 +285,14 @@ class Item_Model extends ORM_MPTT {
   private function _build_relative_caches() {
     $names = array();
     $slugs = array();
-    foreach (Database::instance()
+    foreach (db::build()
              ->select(array("name", "slug"))
              ->from("items")
              ->where("left_ptr", "<=", $this->left_ptr)
              ->where("right_ptr", ">=", $this->right_ptr)
              ->where("id", "<>", 1)
              ->order_by("left_ptr", "ASC")
-             ->get() as $row) {
+             ->execute() as $row) {
       // Don't encode the names segment
       $names[] = rawurlencode($row->name);
       $slugs[] = rawurlencode($row->slug);
@@ -489,7 +489,7 @@ class Item_Model extends ORM_MPTT {
                ->where("parent_id", "=", $this->id)
                ->merge_where($where)
                ->order_by($order_by)
-               ->get() as $row) {
+               ->execute() as $row) {
         $position++;
         if ($row->id == $child->id) {
           break;
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 7e935614..31a56c1f 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -170,10 +170,10 @@ class notification {
   }
 
   static function send_pending_notifications() {
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("DISTINCT email")
              ->from("pending_notifications")
-             ->get() as $row) {
+             ->execute() as $row) {
       $email = $row->email;
       $result = ORM::factory("pending_notification")
         ->where("email", "=", $email)
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index c4c4ba15..3e8a0d20 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -89,12 +89,12 @@ class tag_Core {
    */
   static function item_tags($item) {
     $tags = array();
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("name")
              ->from("tags")
              ->join("items_tags", "tags.id", "items_tags.tag_id", "left")
              ->where("items_tags.item_id", "=", $item->id)
-             ->get() as $row) {
+             ->execute() as $row) {
       $tags[] = $row->name;
     }
     return $tags;
-- 
cgit v1.2.3


From 53df0df0a4f9d2d5369016a7e2ea983ffe202346 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 29 Nov 2009 02:48:42 -0800
Subject: Update a few more occurrences of ORM/Database -> Database_Builder

---
 modules/gallery/controllers/admin_advanced_settings.php |  3 ++-
 modules/gallery/helpers/module.php                      | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index c9de7e57..391d2598 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,8 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
-      ->order_by("module_name", "name")
+      ->order_by("module_name")
+      ->order_by("name")
       ->find_all();
     print $view;
   }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 9fe2ec5e..14caa89b 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -377,11 +377,12 @@ class module_Core {
         self::$var_cache = unserialize($row->value);
       } else {
         // gallery._cache doesn't exist.  Create it now.
-        foreach (Database::instance()
+        foreach (db::build()
                  ->select("module_name", "name", "value")
                  ->from("vars")
-                 ->order_by("module_name", "name")
-                 ->get() as $row) {
+                 ->order_by("module_name")
+                 ->order_by("name")
+                 ->execute() as $row) {
           if ($row->module_name == "gallery" && $row->name == "_cache") {
             // This could happen if there's a race condition
             continue;
@@ -421,7 +422,11 @@ class module_Core {
     $var->value = $value;
     $var->save();
 
-    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
+    db::build()
+      ->delete("vars")
+      ->where("module_name", "=", "gallery")
+      ->where("name", "=", "_cache")
+      ->execute();
     self::$var_cache = null;
  }
 
-- 
cgit v1.2.3


From d2cb217e20d44d7928a0910ac0375740de163bb3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 2 Dec 2009 00:34:34 -0800
Subject: Convert more database calls over to the new format -
 admin/maintenance page loads, the rebuild thumbs/resizes task works - Fixed
 up some conversion bugs in the Cache driver

---
 modules/exif/helpers/exif.php                      |  6 +--
 modules/exif/helpers/exif_task.php                 |  9 +++--
 modules/gallery/controllers/admin_maintenance.php  | 22 ++++++-----
 modules/gallery/helpers/gallery_task.php           |  4 +-
 modules/gallery/helpers/graphics.php               | 33 ++++++++++------
 .../gallery/libraries/drivers/Cache/Database.php   | 46 ++++++++++++----------
 modules/search/helpers/search.php                  |  4 +-
 modules/search/helpers/search_task.php             |  8 ++--
 8 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index d3a8c103..3177e7eb 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -139,7 +139,7 @@ class exif_Core {
   }
 
   static function stats() {
-    $missing_exif = Database::instance()
+    $missing_exif = db::build()
       ->select("items.id")
       ->from("items")
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
@@ -148,10 +148,10 @@ class exif_Core {
       ->where("exif_records.item_id", "=", null)
       ->or_where("exif_records.dirty", "=", 1)
       ->close()
-      ->get()
+      ->execute()
       ->count();
 
-    $total_items = ORM::factory("item")->where("type", "photo")->count_all();
+    $total_items = ORM::factory("item")->where("type", "=", "photo")->count_all();
     if (!$total_items) {
       return array(0, 0, 0);
     }
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 66f69790..e25e2405 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -20,10 +20,11 @@
 class exif_task_Core {
   static function available_tasks() {
     // Delete extra exif_records
-    Database::instance()->query(
-      "DELETE FROM {exif_records} " .
-      "WHERE {exif_records}.`item_id` NOT IN " .
-      "(SELECT `id` FROM {items} WHERE {items}.`type` = 'photo')");
+    db::build()
+      ->delete("exif_records")
+      ->where("item_id", "NOT IN",
+              db::build()->select("id")->from("items")->where("type", "=", "photo"))
+      ->execute();
 
     list ($remaining, $total, $percent) = exif::stats();
     return array(Task_Definition::factory()
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 6377f40f..213e4fe2 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -22,11 +22,13 @@ class Admin_Maintenance_Controller extends Admin_Controller {
    * Show a list of all available, running and finished tasks.
    */
   public function index() {
-    $query = Database::instance()->query(
-      "UPDATE {tasks} SET `state` = 'stalled' " .
-      "WHERE done = 0 " .
-      "AND   state <> 'stalled' " .
-      "AND   unix_timestamp(now()) - updated > 15");
+    $query = db::build()
+      ->update("tasks")
+      ->set("state", "stalled")
+      ->where("done", "=", 0)
+      ->where("state", "<>", "stalled")
+      ->where(new Database_Expression("UNIX_TIMESTAMP(NOW()) - `updated` > 15"))
+      ->execute();
     $stalled_count = $query->count();
     if ($stalled_count) {
       log::warning("tasks",
@@ -138,10 +140,12 @@ class Admin_Maintenance_Controller extends Admin_Controller {
 
   public function cancel_running_tasks() {
     access::verify_csrf();
-    Database::instance()->update(
-      "tasks",
-      array("done" => 1, "state" => "cancelled"),
-      array("done" => 0));
+    db::build()
+      ->update("tasks")
+      ->set("done", 1)
+      ->set("state", "cancelled")
+      ->where("done", "=", 0)
+      ->execute();
     message::success(t("All running tasks cancelled"));
     url::redirect("admin/maintenance");
   }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 4d6de3ba..3a705027 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -19,7 +19,7 @@
  */
 class gallery_task_Core {
   static function available_tasks() {
-    $dirty_count = graphics::find_dirty_images_query()->count();
+    $dirty_count = graphics::find_dirty_images_query()->count_records();
     $tasks = array();
     $tasks[] = Task_Definition::factory()
                  ->callback("gallery_task::rebuild_dirty_images")
@@ -47,7 +47,7 @@ class gallery_task_Core {
   static function rebuild_dirty_images($task) {
     $errors = array();
     try {
-      $result = graphics::find_dirty_images_query();
+      $result = graphics::find_dirty_images_query()->select("id")->execute();
       $total_count = $task->get("total_count", $result->count());
       $mode = $task->get("mode", "init");
       if ($mode == "init") {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index c93cc304..6fab0b54 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -197,11 +197,22 @@ class graphics_Core {
    * @return Database_Result Query result
    */
   static function find_dirty_images_query() {
-    return Database::instance()->query(
-      "SELECT `id` FROM {items} " .
-      "WHERE ((`thumb_dirty` = 1 AND (`type` <> 'album' OR `album_cover_item_id` IS NOT NULL))" .
-      "   OR (`resize_dirty` = 1 AND `type` = 'photo')) " .
-      "   AND `id` != 1");
+    return db::build()
+      ->from("items")
+      ->and_open()
+      ->and_open()
+      ->where("thumb_dirty", "=", 1)
+      ->and_open()
+      ->where("type", "<>", "album")
+      ->or_where("album_cover_item_id", "IS NOT", null)
+      ->close()
+      ->or_open()
+      ->where("resize_dirty", "=", 1)
+      ->where("type", "=", "photo")
+      ->close()
+      ->close()
+      ->where("id", "<>", 1)
+      ->close();
   }
 
   /**
@@ -209,18 +220,18 @@ class graphics_Core {
    */
   static function mark_dirty($thumbs, $resizes) {
     if ($thumbs || $resizes) {
-      $db = Database::instance();
-      $fields = array();
+      $db = db::build()
+        ->update("items");
       if ($thumbs) {
-        $fields["thumb_dirty"] = 1;
+        $db->set("thumb_dirty", 1);
       }
       if ($resizes) {
-        $fields["resize_dirty"] = 1;
+        $db->set("resize_dirty", 1);
       }
-      $db->update("items", $fields, true);
+      $db->execute();
     }
 
-    $count = self::find_dirty_images_query()->count();
+    $count = self::find_dirty_images_query()->count_records();
     if ($count) {
       site_status::warning(
           t2("One of your photos is out of date. Click here to fix it",
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index a317798e..5fa2a72a 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -33,7 +33,7 @@ class Cache_Database_Driver extends Cache_Driver {
   public function exists($id) {
     $count = db::build()
       ->where("key", "=", $id)
-      ->where("expiration", ">=", "time()")
+      ->where("expiration", ">=", time())
       ->count_records("caches");
     return $count > 0;
   }
@@ -61,16 +61,18 @@ class Cache_Database_Driver extends Cache_Driver {
 
     foreach ($items as $id => $data) {
       if ($this->exists($id)) {
-        $status = db::build()->update(
-          "caches",
-          array("tags" => $tags, "expiration" => $lifetime, "cache" => serialize($data)),
-          array("key", "=", $id))
+        $status = db::build()
+          ->update("caches")
+          ->set("tags", $tags)
+          ->set("expiration", $lifetime)
+          ->set("cache", serialize($data))
+          ->where("key", "=", $id)
           ->execute();
       } else {
-        $status = db::build()->insert(
-          "caches",
-          array("key" => $id, "tags" => $tags,
-                "expiration" => $lifetime, "cache" => serialize($data)))
+        $status = db::build()
+          ->insert("caches")
+          ->columns("key", "tags", "expiration", "cache")
+          ->values($id, $tags, $lifetime, serialize($data))
           ->execute();
       }
     }
@@ -84,11 +86,13 @@ class Cache_Database_Driver extends Cache_Driver {
    * @return  array    cached data
    */
   public function get_tag($tags) {
-    $db = db::build()->from("caches");
+    $db = db::build()
+      ->select("*")
+      ->from("caches");
     foreach ($tags as $tag) {
       $db->where("tags", "LIKE", "<$tag>");
     }
-    $db_result = $db->execute()->as_array();
+    $db_result = $db->execute();
 
     // An array will always be returned
     $result = array();
@@ -116,9 +120,9 @@ class Cache_Database_Driver extends Cache_Driver {
   public function get($keys, $single=false) {
     $data = null;
     $result = db::build()
+      ->select("*")
       ->from("caches")
       ->where("key", "IN", $keys)
-      ->select()
       ->execute();
 
     if (count($result) > 0) {
@@ -150,17 +154,18 @@ class Cache_Database_Driver extends Cache_Driver {
    * @return bool
    */
   public function delete($id, $tag = false) {
-    $this->db->from("caches");
+    $db = db::build()
+      ->delete("caches");
     if ($id === true) {
       // Delete all caches
-      $this->db->where("1", "=", "1");
+      $db->where("1", "=", "1");
     } else if ($tag === true) {
-      $this->db->like("tags", "<$id>");
+      $db->where("tags", "LIKE", "<$id>");
     } else {
-      $this->db->where("key", "=", $id);
+      $db->where("key", "=", $id);
     }
 
-    $status = $this->db->delete();
+    $status = $db->execute();
 
     return count($status) > 0;
   }
@@ -177,10 +182,11 @@ class Cache_Database_Driver extends Cache_Driver {
    */
   public function delete_expired() {
     // Delete all expired caches
-    $status = $this->db->from("caches")
+    $status = db::build()
+      ->delete("caches")
       ->where("expiration", "<>", 0)
       ->where("expiration", "<=", time())
-      ->delete();
+      ->execute();
 
     return count($status) > 0;
   }
@@ -189,6 +195,6 @@ class Cache_Database_Driver extends Cache_Driver {
    * Empty the cache
    */
   public function delete_all() {
-    db::build()->query("TRUNCATE {caches}")->execute();
+    Database::instance()->query("TRUNCATE {caches}");
   }
 }
\ No newline at end of file
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 1fd5175f..9123df09 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -72,7 +72,7 @@ class search_Core {
   }
 
   static function stats() {
-    $remaining = Database::instance()
+    $remaining = db::build()
       ->select("items.id")
       ->from("items")
       ->join("search_records", "items.id", "search_records.item_id", "left")
@@ -80,7 +80,7 @@ class search_Core {
       ->where("search_records.item_id", "=", null)
       ->or_where("search_records.dirty", "=", 1)
       ->close()
-      ->get()
+      ->execute()
       ->count();
 
     $total = ORM::factory("item")->count_all();
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 6b35cabc..6aa4a0d1 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -20,10 +20,10 @@
 class search_task_Core {
   static function available_tasks() {
     // Delete extra search_records
-    Database::instance()->query(
-      "DELETE FROM {search_records} " .
-      "WHERE {search_records}.`item_id` NOT IN " .
-      "(SELECT `id` FROM {items})");
+    db::build()
+      ->delete("search_records")
+      ->where("item_id", "NOT IN", db::build()->select("id")->from("items"))
+      ->execute();
 
     list ($remaining, $total, $percent) = search::stats();
     return array(Task_Definition::factory()
-- 
cgit v1.2.3


From 94411b36585a5bdf6225b8af6ae4ee5c21d5779d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 2 Dec 2009 10:02:08 -0800
Subject: Fix a bunch of places where we were using "= null" instead of "IS
 NULL".

---
 modules/exif/helpers/exif.php                 | 2 +-
 modules/exif/helpers/exif_task.php            | 2 +-
 modules/search/helpers/search.php             | 6 ++----
 modules/search/helpers/search_task.php        | 2 +-
 modules/server_add/controllers/server_add.php | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 3177e7eb..3baed177 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -145,7 +145,7 @@ class exif_Core {
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
       ->where("type", "=", "photo")
       ->and_open()
-      ->where("exif_records.item_id", "=", null)
+      ->where("exif_records.item_id", "IS", null)
       ->or_where("exif_records.dirty", "=", 1)
       ->close()
       ->execute()
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index e25e2405..27352643 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -47,7 +47,7 @@ class exif_task_Core {
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
                ->where("type", "=", "photo")
                ->and_open()
-               ->where("exif_records.item_id", "=", null)
+               ->where("exif_records.item_id", "IS", null)
                ->or_where("exif_records.dirty", "=", 1)
                ->close()
                ->find_all() as $item) {
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 9123df09..70a39272 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -73,15 +73,13 @@ class search_Core {
 
   static function stats() {
     $remaining = db::build()
-      ->select("items.id")
       ->from("items")
       ->join("search_records", "items.id", "search_records.item_id", "left")
       ->and_open()
-      ->where("search_records.item_id", "=", null)
+      ->where("search_records.item_id", "IS", null)
       ->or_where("search_records.dirty", "=", 1)
       ->close()
-      ->execute()
-      ->count();
+      ->count_records();
 
     $total = ORM::factory("item")->count_all();
     $percent = round(100 * ($total - $remaining) / $total);
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 6aa4a0d1..e039e493 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -45,7 +45,7 @@ class search_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
-               ->where("search_records.item_id", "=", null)
+               ->where("search_records.item_id", "IS", null)
                ->or_where("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 3c3a6c2b..78e1620c 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -198,7 +198,7 @@ class Server_Add_Controller extends Admin_Controller {
       // they're done.
       $entries = ORM::factory("server_add_file")
         ->where("task_id", "=", $task->id)
-        ->where("item_id", "=", null)
+        ->where("item_id", "IS", null)
         ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
-- 
cgit v1.2.3


From 87bc32345f6d7cb64c4009ed68a79776ace7ff1b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 2 Dec 2009 10:42:49 -0800
Subject: Use select() instead of select("*")

---
 modules/gallery/libraries/drivers/Cache/Database.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 5fa2a72a..5c453f28 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -87,7 +87,7 @@ class Cache_Database_Driver extends Cache_Driver {
    */
   public function get_tag($tags) {
     $db = db::build()
-      ->select("*")
+      ->select()
       ->from("caches");
     foreach ($tags as $tag) {
       $db->where("tags", "LIKE", "<$tag>");
@@ -120,7 +120,7 @@ class Cache_Database_Driver extends Cache_Driver {
   public function get($keys, $single=false) {
     $data = null;
     $result = db::build()
-      ->select("*")
+      ->select()
       ->from("caches")
       ->where("key", "IN", $keys)
       ->execute();
-- 
cgit v1.2.3


From d0874a65acfbb2ed36eb7eae666969fde69ca004 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 2 Dec 2009 10:43:06 -0800
Subject: Use:   ->select(new Database_Expression("DISTINCT `email`"))

instead of:
  ->select("DISTINCT email")

This is not the perfect API.  http://dev.kohanaphp.com/issues/2396 is
the upstream tracking ticket for a better API.
---
 modules/notification/helpers/notification.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 31a56c1f..e9fc3f33 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -171,7 +171,7 @@ class notification {
 
   static function send_pending_notifications() {
     foreach (db::build()
-             ->select("DISTINCT email")
+             ->select(new Database_Expression("DISTINCT `email`"))
              ->from("pending_notifications")
              ->execute() as $row) {
       $email = $row->email;
-- 
cgit v1.2.3


From c7b934bc6daf41af1b6e0b04b9b0e9cb22113db6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 2 Dec 2009 12:20:21 -0800
Subject: Update a couple more queries.

---
 modules/gallery/helpers/l10n_client.php  | 9 ++++-----
 modules/gallery/helpers/l10n_scanner.php | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 14ab5a85..fe70933d 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -80,11 +80,10 @@ class l10n_client_Core {
     }
 
     // @todo Batch requests (max request size)
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("key", "locale", "revision", "translation")
              ->from("incoming_translations")
-             ->get()
-             ->as_array() as $row) {
+             ->execute() as $row) {
       if (!isset($request->messages->{$row->key})) {
         $request->messages->{$row->key} = 1;
       }
@@ -168,10 +167,10 @@ class l10n_client_Core {
 
     // @todo Batch requests (max request size)
     // @todo include base_revision in submission / how to handle resubmissions / edit fights?
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("key", "message", "locale", "base_revision", "translation")
              ->from("outgoing_translations")
-             ->get() as $row) {
+             ->execute() as $row) {
       $key = $row->key;
       if (!isset($request->{$key})) {
         $request->{$key}->message = json_encode(unserialize($row->message));
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index a7ce2c59..d76c4d19 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -28,11 +28,11 @@ class l10n_scanner_Core {
 
   static function process_message($message, &$cache) {
     if (empty($cache)) {
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key")
                ->from("incoming_translations")
                ->where("locale", "=", "root")
-               ->get() as $row) {
+               ->execute() as $row) {
         $cache[$row->key] = true;
       }
     }
-- 
cgit v1.2.3


From 112aafe5137220181dd74afc509fa6cd39573028 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 19:51:00 -0800
Subject: Oops, removed the overload for query() before, we need this back so
 that we can prefix table names properly.

---
 modules/gallery/libraries/MY_Database.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index 0f29c09b..52bc46d6 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -20,6 +20,17 @@
 abstract class Database extends Database_Core {
   protected $_table_names;
 
+  /**
+   * Parse the query string and convert any strings of the form `\([a-zA-Z0-9_]*?)\]
+   * table prefix . $1
+   */
+  public function query($sql = '') {
+    if (!empty($sql)) {
+      $sql = $this->add_table_prefixes($sql);
+    }
+    return parent::query($sql);
+  }
+
   public function add_table_prefixes($sql) {
     $prefix = $this->config["table_prefix"];
     if (strpos($sql, "SHOW TABLES") === 0) {
-- 
cgit v1.2.3


From 5a7449f31574c7c548abe4244a6ba0993138e013 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 19:51:25 -0800
Subject: Update more database calls.

---
 modules/gallery/helpers/graphics.php | 19 ++++++++++++++-----
 modules/gallery/helpers/module.php   |  6 +++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 6fab0b54..7577d7ac 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -74,7 +74,10 @@ class graphics_Core {
    * @param string $module_name
    */
   static function remove_rules($module_name) {
-    $status = Database::instance()->delete("graphics_rules", array("module_name" => $module_name));
+    $status = db::build()
+      ->delete("graphics_rules")
+      ->where("module_name", "=", $module_name)
+      ->execute();
     if (count($status)) {
       self::mark_dirty(true, true);
     }
@@ -86,8 +89,11 @@ class graphics_Core {
    * module it won't cause all of your images to suddenly require a rebuild.
    */
   static function activate_rules($module_name) {
-    Database::instance()
-      ->update("graphics_rules",array("active" => true), array("module_name" => $module_name));
+    db::build()
+      ->update("graphics_rules")
+      ->set("active", true)
+      ->where("module_name", "=", $module_name)
+      ->execute();
   }
 
   /**
@@ -96,8 +102,11 @@ class graphics_Core {
    * module it won't cause all of your images to suddenly require a rebuild.
    */
   static function deactivate_rules($module_name) {
-    Database::instance()
-      ->update("graphics_rules",array("active" => false), array("module_name" => $module_name));
+    db::build()
+      ->update("graphics_rules")
+      ->set("active", false)
+      ->where("module_name", "=", $module_name)
+      ->execute();
   }
 
   /**
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 14caa89b..b8928f7b 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -460,7 +460,11 @@ class module_Core {
       $var->delete();
     }
 
-    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
+    db::build()
+      ->delete("vars")
+      ->where("module_name", "=", "gallery")
+      ->where("name", "=", "_cache")
+      ->execute();
     self::$var_cache = null;
   }
 
-- 
cgit v1.2.3


From 2132c9a96d923d48effc3fe8facedff4a4da3b13 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 20:19:54 -0800
Subject: Fix some database calls.

---
 modules/tag/controllers/admin_tags.php |  2 +-
 modules/tag/models/tag.php             | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 6cd2f337..ed4a0366 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -51,7 +51,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     $form = tag::get_delete_form($tag);
     if ($form->validate()) {
       $name = $tag->name;
-      Database::instance()->delete("items_tags", array("tag_id" => "$tag->id"));
+      db::build()->delete("items_tags")->where("tag_id", "=", $tag->id)->execute();
       $tag->delete();
       message::success(t("Deleted tag %tag_name", array("tag_name" => $name)));
       log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name)));
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index f9a453be..b60f8dfc 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -63,13 +63,21 @@ class Tag_Model extends ORM {
   public function save() {
     $db = Database::instance();
     $related_item_ids = array();
-    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+    foreach (db::build()
+             ->select("item_id")
+             ->from("items_tags")
+             ->where("tag_id", "=", $this->id)
+             ->execute() as $row) {
       $related_item_ids[$row->item_id] = 1;
     }
 
     $result = parent::save();
 
-    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+    foreach (db::build()
+             ->select("item_id")
+             ->from("items_tags")
+             ->where("tag_id", "=", $this->id)
+             ->execute() as $row) {
       $related_item_ids[$row->item_id] = 1;
     }
 
@@ -89,7 +97,12 @@ class Tag_Model extends ORM {
   public function delete() {
     $related_item_ids = array();
     $db = Database::Instance();
-    foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) {
+
+    foreach (db::build()
+             ->select("item_id")
+             ->from("items_tags")
+             ->where("tag_id", "=", $this->id)
+             ->execute() as $row) {
       $related_item_ids[$row->item_id] = 1;
     }
 
-- 
cgit v1.2.3


From 3d0a7a33ad0c1bbc16ef6156609110e14b6e0ee6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 20:38:57 -0800
Subject: Fix a few more database queries

---
 modules/tag/controllers/tags.php | 2 +-
 modules/tag/models/tag.php       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index dfa3a9b3..a44f6aa3 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -83,7 +83,7 @@ class Tags_Controller extends Controller {
     $limit = $this->input->get("limit");
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
-      ->like("name", "{$tag_part}%", false)
+      ->where("name", "LIKE", "{$tag_part}%")
       ->order_by("name", "ASC")
       ->limit($limit)
       ->find_all();
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index b60f8dfc..f6cc6144 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -82,7 +82,9 @@ class Tag_Model extends ORM {
     }
 
     if ($related_item_ids) {
-      foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+      foreach (ORM::factory("item")
+               ->where("id", "IN", array_keys($related_item_ids))
+               ->find_all() as $item) {
         module::event("item_related_update", $item);
       }
     }
-- 
cgit v1.2.3


From 2be72bb1c3c5790e0ce68c2609de141bf9756614 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 20:42:38 -0800
Subject: Overload Kohana_Exception::text() to dump out the complete stack
 trace so that we have useful data in the logs.

---
 application/Bootstrap.php                         |  2 +-
 modules/gallery/libraries/MY_Kohana_Exception.php | 29 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 modules/gallery/libraries/MY_Kohana_Exception.php

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index b15cbfce..f36fac14 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -30,7 +30,7 @@ require SYSPATH.'core/Kohana'.EXT;
 final class Kohana extends Kohana_Core {}
 
 require SYSPATH.'core/Kohana_Exception'.EXT;
-class Kohana_Exception extends Kohana_Exception_Core {}
+require MODPATH.'gallery/libraries/MY_Kohana_Exception'.EXT;
 
 require SYSPATH.'core/Kohana_Config'.EXT;
 require SYSPATH.'libraries/drivers/Config'.EXT;
diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
new file mode 100644
index 00000000..32b4ab93
--- /dev/null
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -0,0 +1,29 @@
+getCode(), strip_tags($e->getMessage()), $e->getTraceAsString());
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From c22bf27cc2b69bc2109b9562cbd1a8f6a9143ef4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:02:30 -0800
Subject: Add the current file/line at the top of the trace.

---
 modules/gallery/libraries/MY_Kohana_Exception.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index 32b4ab93..dd5998a1 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -23,7 +23,9 @@ class Kohana_Exception extends Kohana_Exception_Core {
    */
   public static function text($e) {
     return sprintf(
-      "%s [ %s ]: %s\n%s",
-      get_class($e), $e->getCode(), strip_tags($e->getMessage()), $e->getTraceAsString());
+      "%s [ %s ]: %s\n%s [ %s ]\n%s",
+      get_class($e), $e->getCode(), strip_tags($e->getMessage()),
+      $e->getFile(), $e->getLine(),
+      $e->getTraceAsString());
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From b9dadb77c3c75c6ba6ead293757df440976b3917 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:21:35 -0800
Subject: Get rid of unused _method param in the item edit form. Fix viewable()
 to properly OR view restrictions together.

---
 modules/gallery/helpers/item.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index c3126435..300a6942 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -127,7 +127,6 @@ class item_Core {
     $page_type = Input::instance()->get("page_type");
     $form = new Forge(
       "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete"));
-    $form->hidden("_method")->value("put");
     $group = $form->group("confirm_delete")->label(t("Confirm Deletion"));
     $group->submit("")->value(t("Delete"));
     return $form;
@@ -156,7 +155,7 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        $view_restrictions[] = "items.view_$id";
+        $view_restrictions["items.view_$id"] = access::ALLOW;
       }
     }
     switch (count($view_restrictions)) {
@@ -168,10 +167,7 @@ class item_Core {
       break;
 
     default:
-      $model
-        ->and_open()
-        ->or_where($view_restrictions, "=", access::ALLOW)
-        ->close();
+      $model->and_open()->or_where($view_restrictions)->close();
       break;
     }
 
-- 
cgit v1.2.3


From fb899c313c9cdf4d6b0529c53d2b647999ad94db Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:28:40 -0800
Subject: Further simplifications to viewable().  Stop trying to optimize for
 the case where we just have one restriction, it's unnecessary.

---
 modules/gallery/helpers/item.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 300a6942..b7be23cd 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -158,17 +158,9 @@ class item_Core {
         $view_restrictions["items.view_$id"] = access::ALLOW;
       }
     }
-    switch (count($view_restrictions)) {
-    case 0:
-      break;
 
-    case 1:
-      $model->where($view_restrictions[0], "=", access::ALLOW);
-      break;
-
-    default:
+    if (count($view_restrictions)) {
       $model->and_open()->or_where($view_restrictions)->close();
-      break;
     }
 
     return $model;
-- 
cgit v1.2.3


From 2f5c612036984a6f09995e8c692f399fb8c7fb15 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:33:17 -0800
Subject: Update database queries.

---
 modules/tag/helpers/tag.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 3e8a0d20..8075afe4 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -125,10 +125,16 @@ class tag_Core {
    * Delete all tags associated with an item
    */
   static function clear_all($item) {
-    $db = Database::instance();
-    $db->query("UPDATE {tags} SET `count` = `count` - 1 WHERE `count` > 0 " .
-               "AND `id` IN (SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
-    $db->delete("items_tags", array("item_id" => "$item->id"));
+    db::build()
+      ->update("tags")
+      ->set("count", new Database_Expression("`count` - 1"))
+      ->where("count", ">", 0)
+      ->where("id", "IN", db::build()->select("tag_id")->from("items_tags")->where("item_id", "=", $item->id))
+      ->execute();
+    db::build()
+      ->delete("items_tags")
+      ->where("item_id", "=", $item->id)
+      ->execute();
   }
 
   /**
@@ -138,6 +144,6 @@ class tag_Core {
     // @todo There's a potential race condition here which we can solve by adding a lock around
     // this and all the cases where we create/update tags.  I'm loathe to do that since it's an
     // extremely rare case.
-    Database::instance() ->delete("tags", array("count" => 0));
+    db::build()->delete("tags")->where("count", "=", 0)->execute();
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From dec084fe08db1505d272e6a577b8627f57abef16 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:34:09 -0800
Subject: Update database queries.

---
 modules/gallery/helpers/gallery_event.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index fa4db317..37f39d15 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -30,19 +30,21 @@ class gallery_event_Core {
 
   static function user_deleted($user) {
     $admin = identity::admin_user();
-    $db = Database::instance();
-    $db->from("tasks")
-      ->set(array("owner_id" => $admin->id))
+    db::build()
+      ->update("tasks")
+      ->set("owner_id", $admin->id)
       ->where("owner_id", "=", $user->id)
-      ->update();
-    $db->from("items")
-      ->set(array("owner_id" => $admin->id))
+      ->execute();
+    db::build()
+      ->update("items")
+      ->set("owner_id", $admin->id)
       ->where("owner_id", "=", $user->id)
-      ->update();
-    $db->from("logs")
-      ->set(array("user_id" => $admin->id))
+      ->execute();
+    db::build()
+      ->update("logs")
+      ->set("user_id", $admin->id)
       ->where("user_id", "=", $user->id)
-      ->update();
+      ->execute();
   }
 
   static function identity_provider_changed($old_provider, $new_provider) {
-- 
cgit v1.2.3


From 0a345895b424b74920f27bc60a7f3c6e22695bd1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:34:35 -0800
Subject: Updated for K2.4.  This is a fork from the main-line, but we're going
 to replace this with Formio anyway.

---
 modules/forge/libraries/Form_Input.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/forge/libraries/Form_Input.php b/modules/forge/libraries/Form_Input.php
index 30311941..0c578011 100644
--- a/modules/forge/libraries/Form_Input.php
+++ b/modules/forge/libraries/Form_Input.php
@@ -317,7 +317,7 @@ class Form_Input_Core {
 				$args = is_array($args) ? $args : array();
 
 				// Add the label or name to the beginning of the args
-				array_unshift($args, $this->label ? utf8::strtolower($this->label) : $this->name);
+				array_unshift($args, $this->label ? mb_strtolower($this->label) : $this->name);
 
 				if (isset($this->error_messages[$func]))
 				{
@@ -333,7 +333,7 @@ class Form_Input_Core {
 						case 'valid_email':
 						case 'valid_ip':
 							// Fetch an i18n error message
-							$error = Kohana::lang('validation.'.$func, $args);
+                                                        $error = 'validation.'.$func;
 							break;
 						case substr($func, 0, 6) === 'valid_':
 							// Strip 'valid_' from func name
@@ -343,11 +343,11 @@ class Form_Input_Core {
 						case 'digit':
 						case 'numeric':
 							// i18n strings have to be inserted into valid_type
-							$args[] = Kohana::lang('validation.'.$func);
-							$error = Kohana::lang('validation.valid_type', $args);
+							$args[] = 'validation.'.$func;
+							$error = 'validation.valid_type';
 							break;
 						default:
-							$error = Kohana::lang('validation.'.$func, $args);
+							$error = 'validation.'.$func;
 					}
 				}
 			}
@@ -490,7 +490,7 @@ class Form_Input_Core {
 				if ($this->value != $input->value)
 				{
 					// Field does not match
-					$this->errors['matches'] = array($input->label ? utf8::strtolower($input->label) : $input->name);
+					$this->errors['matches'] = array($input->label ? mb_strtolower($input->label) : $input->name);
 					break;
 				}
 			}
@@ -529,7 +529,7 @@ class Form_Input_Core {
 	protected function rule_length($min, $max = NULL)
 	{
 		// Get the length, return if zero
-		if (($length = utf8::strlen($this->value)) === 0)
+		if (($length = mb_strlen($this->value)) === 0)
 			return;
 
 		if ($max == NULL)
-- 
cgit v1.2.3


From b129ff7cfa1690c1af602035ebfc0e374b9066f1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:34:48 -0800
Subject: Update database query.

---
 modules/exif/helpers/exif_event.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index 826ec959..6490d11f 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -25,6 +25,9 @@ class exif_event_Core {
   }
 
   static function item_deleted($item) {
-    Database::instance()->delete("exif_records", array("item_id" => $item->id));
+    db::build()
+      ->delete("exif_records")
+      ->where("item_id", "=", $item->id)
+      ->execute();
   }
 }
-- 
cgit v1.2.3


From 2ff84b092d0b9d8ca61b313d2aa5d7941f3f8711 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:35:04 -0800
Subject: Update database query.

---
 modules/g2_import/helpers/g2_import_event.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/g2_import/helpers/g2_import_event.php b/modules/g2_import/helpers/g2_import_event.php
index 609e1a45..02a2126d 100644
--- a/modules/g2_import/helpers/g2_import_event.php
+++ b/modules/g2_import/helpers/g2_import_event.php
@@ -19,7 +19,10 @@
  */
 class g2_import_event_Core {
   static function item_deleted($item) {
-    Database::instance()->delete("g2_maps", array("g3_id" => $item->id));
+    db::build()
+      ->delete("g2_maps")
+      ->where("g3_id", "=", $item->id)
+      ->execute();
   }
 
   static function item_created($item) {
-- 
cgit v1.2.3


From a6dbd25cf11e1b5044862eea9bac0ff3cdf6de80 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 6 Dec 2009 21:38:09 -0800
Subject: Update database queries.

---
 modules/comment/helpers/comment_event.php          | 31 ++++++++++++----------
 .../notification/helpers/notification_event.php    | 10 ++++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index c90f7663..576e041d 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -19,29 +19,32 @@
  */
 class comment_event_Core {
   static function item_deleted($item) {
-    Database::instance()->delete("comments", array("item_id" => $item->id));
+    db::build()
+      ->delete("comments")
+      ->where("item_id", "=", $item->id);
   }
 
   static function user_deleted($user) {
     $guest = identity::guest();
-    Database::instance()->from("comments")
-      ->set(array("author_id" => $guest->id,
-                  "guest_email" => null,
-                  "guest_name" => "guest",
-                  "guest_url" => null))
+    db::build()
+      ->update("comments")
+      ->set("author_id", $guest->id)
+      ->set("guest_email", null)
+      ->set("guest_name", "guest")
+      ->set("guest_url", null)
       ->where("author_id", "=", $user->id)
-      ->update();
+      ->execute();
   }
 
   static function identity_provider_changed($old_provider, $new_provider) {
     $guest = identity::guest();
-    Database::instance()->from("comments")
-      ->set(array("author_id" => $guest->id,
-                  "guest_email" => null,
-                  "guest_name" => "guest",
-                  "guest_url" => null))
-      ->where("1", "=", "1")  // @todo: why do we do this?
-      ->update();
+    db::build()
+      ->update("comments")
+      ->set("author_id", $guest->id)
+      ->set("guest_email", null)
+      ->set("guest_name", "guest")
+      ->set("guest_url", null)
+      ->execute();
   }
 
   static function admin_menu($menu, $theme) {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 951e6e52..2c7ede27 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -53,14 +53,16 @@ class notification_event_Core {
   }
 
   static function user_deleted($user) {
-    ORM::factory("subscriptions")
+    db::build()
+      ->delete("subscriptions")
       ->where("user_id", "=", $user->id)
-      ->delete_all();
+      ->execute();
   }
 
   static function identity_provider_changed($old_provider, $new_provider) {
-    ORM::factory("subscriptions")
-      ->delete_all();
+    db::build()
+      ->delete("subscriptions")
+      ->execute();
   }
 
   static function comment_created($comment) {
-- 
cgit v1.2.3


From cb55eea0f3609d802da5fdb0ea1c8b3acb0b8ea9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 13 Dec 2009 17:03:07 -0800
Subject: Convert a database query.

---
 modules/digibug/controllers/digibug.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 25f1ca3e..03f9e812 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -115,9 +115,10 @@ class Digibug_Controller extends Controller {
   }
 
   private function _clean_expired() {
-    Database::instance()->query(
-      "DELETE FROM {digibug_proxies} " .
-      "WHERE request_date <= (CURDATE() - INTERVAL 10 DAY) " .
-      "LIMIT 20");
+    db::build()
+      ->delete("digibug_proxies")
+      ->where("request_date", "<=", new Database_Expression("(CURDATE() - INTERVAL 10 DAY)"))
+      ->limit(20)
+      ->execute();
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 8c03c7a073df7d210e1e961797cc39fd124ec390 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 13 Dec 2009 17:15:12 -0800
Subject: Convert some database calls.

---
 modules/gallery/models/item.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 8a42cc1e..b6af0528 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -161,11 +161,13 @@ class Item_Model extends ORM_MPTT {
     $this->name = $new_name;
 
     if ($this->is_album()) {
-      Database::instance()
-        ->update("items",
-                 array("relative_path_cache" => null,
-                       "relative_url_cache" => null),
-                 array("left_ptr >" => $this->left_ptr, "right_ptr <" => $this->right_ptr));
+      db::build()
+        ->update("items")
+        ->set("relative_url_cache", null)
+        ->set("relative_path_cache", null)
+        ->where("left_ptr", ">", $this->left_ptr)
+        ->where("right_ptr", "<", $this->right_ptr)
+        ->execute();
     }
 
     return $this;
@@ -362,10 +364,12 @@ class Item_Model extends ORM_MPTT {
         // Clear the relative url cache for this item and all children
         $this->relative_url_cache = null;
         if ($this->is_album()) {
-          Database::instance()
-            ->update("items",
-                     array("relative_url_cache" => null),
-                     array("left_ptr >" => $this->left_ptr, "right_ptr <" => $this->right_ptr));
+          db::build()
+            ->update("items")
+            ->set("relative_url_cache", null)
+            ->where("left_ptr", ">", $this->left_ptr)
+            ->where("right_ptr", "<", $this->right_ptr)
+            ->execute();
         }
       }
     }
-- 
cgit v1.2.3


From 064a24b897880e4dbf4dafeb756406bbd907bdba Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Sun, 13 Dec 2009 17:15:59 -0800
Subject: Convert a database call.

---
 modules/gallery/controllers/albums.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 76032655..319f1416 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -132,7 +132,7 @@ class Albums_Controller extends Items_Controller {
           $form->edit_item->dirname->value != $album->name ||
           $form->edit_item->slug->value != $album->slug) {
         // Make sure that there's not a conflict
-        if ($row = Database::instance()
+        if ($row = db::build()
             ->select(array("name", "slug"))
             ->from("items")
             ->where("parent_id", "=", $album->parent_id)
@@ -141,7 +141,7 @@ class Albums_Controller extends Items_Controller {
             ->where("name", "=", $form->edit_item->dirname->value)
             ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
-            ->get()
+            ->execute()
             ->current()) {
           if ($row->name == $form->edit_item->dirname->value) {
             $form->edit_item->dirname->add_error("name_conflict", 1);
-- 
cgit v1.2.3


From 4566c299c1d1756fa78bc873a2266c28e047118a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 16 Dec 2009 09:24:38 -0800
Subject: Convert some database calls.

---
 modules/gallery/controllers/l10n_client.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 30a18631..71df1cf1 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -113,12 +113,11 @@ class L10n_Client_Controller extends Controller {
   public static function l10n_form() {
     if (Input::instance()->get("show_all_l10n_messages")) {
       $calls = array();
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key", "message")
                ->from("incoming_translations")
-               ->where("locale", "=", "root"))
-               ->get()
-               ->as_array() as $row) {
+               ->where("locale", "=", "root")
+               ->execute() as $row) {
         $calls[$row->key] = array(unserialize($row->message), array());
       }
     } else {
@@ -128,21 +127,19 @@ class L10n_Client_Controller extends Controller {
 
     if ($calls) {
       $translations = array();
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key", "translation")
                ->from("incoming_translations")
                ->where("locale", "=", $locale)
-               ->get()
-               ->as_array() as $row) {
+               ->execute() as $row) {
         $translations[$row->key] = unserialize($row->translation);
       }
       // Override incoming with outgoing...
-      foreach (Database::instance()
+      foreach (db::build()
                ->select("key", "translation")
                ->from("outgoing_translations")
                ->where("locale", "=", $locale)
-               ->get()
-               ->as_array() as $row) {
+               ->execute() as $row) {
         $translations[$row->key] = unserialize($row->translation);
       }
 
-- 
cgit v1.2.3


From 86467363c20c6150ee0fccc7901cd34b281be2b1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 16 Dec 2009 18:03:23 -0800
Subject: Convert a database call.

---
 modules/gallery/controllers/movies.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 6e25e6ea..b5785ecf 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -76,16 +76,16 @@ class Movies_Controller extends Items_Controller {
       if ($form->edit_item->filename->value != $movie->name ||
           $form->edit_item->slug->value != $movie->slug) {
         // Make sure that there's not a name or slug conflict
-        if ($row = Database::instance()
+        if ($row = db::build()
             ->select(array("name", "slug"))
             ->from("items")
             ->where("parent_id", "=", $movie->parent_id)
-            ->where("id <>", $movie->id)
+            ->where("id", "<>", $movie->id)
             ->and_open()
             ->where("name", "=", $form->edit_item->filename->value)
             ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
-            ->get()
+            ->execute()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
             $form->edit_item->filename->add_error("name_conflict", 1);
-- 
cgit v1.2.3


From f431d7e12e0be10cfd7ea30543a44cf17a4e8275 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 16 Dec 2009 18:04:44 -0800
Subject: Convert a database call.

---
 modules/gallery/controllers/photos.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f7c5039e..ced9da2f 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -76,7 +76,7 @@ class Photos_Controller extends Items_Controller {
       if ($form->edit_item->filename->value != $photo->name ||
           $form->edit_item->slug->value != $photo->slug) {
         // Make sure that there's not a name or slug conflict
-        if ($row = Database::instance()
+        if ($row = db::build()
             ->select(array("name", "slug"))
             ->from("items")
             ->where("parent_id", "=", $photo->parent_id)
@@ -85,7 +85,7 @@ class Photos_Controller extends Items_Controller {
             ->where("name", "=", $form->edit_item->filename->value)
             ->or_where("slug", "=", $form->edit_item->slug->value)
             ->close()
-            ->get()
+            ->execute()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
             $form->edit_item->filename->add_error("name_conflict", 1);
-- 
cgit v1.2.3


From c99a75b5d150f14c96697833f08354afd456323a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 09:16:44 -0800
Subject: Improve the exception error message.

---
 modules/gallery/controllers/packager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 1354a01b..d27adf4d 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -30,7 +30,7 @@ class Packager_Controller extends Controller {
       $this->_dump_database();        // Dump the database
       $this->_dump_var();             // Dump the var directory
     } catch (Exception $e) {
-      print $e->getTraceAsString();
+      print $e->getMessage() . "\n" . $e->getTraceAsString();
       return;
     }
 
-- 
cgit v1.2.3


From 2aba8c4bffed5fb38689d5ed998c486ab6bde902 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 21:05:47 -0800
Subject: Simplify add_table_prefixes.  In Kohana 2.4, it returns the bare
 table name, not the prefixed one so this makes our logic easier.

---
 modules/gallery/libraries/MY_Database.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index 52bc46d6..fd486039 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -25,7 +25,7 @@ abstract class Database extends Database_Core {
    * table prefix . $1
    */
   public function query($sql = '') {
-    if (!empty($sql)) {
+    if ($this->config["table_prefix"] && !empty($sql)) {
       $sql = $this->add_table_prefixes($sql);
     }
     return parent::query($sql);
@@ -49,19 +49,12 @@ abstract class Database extends Database_Core {
 
     if (!isset($this->_table_names)) {
       // This should only run once on the first query
-      $this->_table_names =array();
-      $len = strlen($prefix);
+      $this->_table_names = array();
       foreach($this->list_tables() as $table_name) {
-        if ($len > 0) {
-          $naked_name = strpos($table_name, $prefix) !== 0 ?
-            $table_name : substr($table_name, $len);
-        } else {
-          $naked_name = $table_name;
-        }
-        $this->_table_names["{{$naked_name}}"] = $table_name;
+        $this->_table_names["{{$table_name}}"] = $prefix . $table_name;
       }
     }
 
-    return empty($this->_table_names) ? $sql : strtr($sql, $this->_table_names);
+    return strtr($sql, $this->_table_names);
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 9b75b85e71b47fc953773544c930f5cecf6b34a7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 21:05:58 -0800
Subject: Update all database queries such that we can run "php index.php
 package" and generate the same SQL as before.

---
 modules/gallery/controllers/packager.php |  7 +--
 modules/gallery/helpers/access.php       | 81 ++++++++++++++++++++------------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index d27adf4d..4569e166 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -42,7 +42,7 @@ class Packager_Controller extends Controller {
 
     // Drop all tables
     foreach ($db->list_tables() as $table) {
-      $db->query("DROP TABLE IF EXISTS `$table`");
+      $db->query("DROP TABLE IF EXISTS {{$table}}");
     }
 
     // Clean out data
@@ -88,8 +88,9 @@ class Packager_Controller extends Controller {
     $db->query("TRUNCATE {sessions}");
     $db->query("TRUNCATE {logs}");
     $db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
-    $db->update("users", array("password" => ""), array("id" => 1));
-    $db->update("users", array("password" => ""), array("id" => 2));
+
+    db::build()->update("users", array("password" => ""), array("id" => 1))->execute();
+    db::build()->update("users", array("password" => ""), array("id" => 2))->execute();
 
     $dbconfig = Kohana::config('database.default');
     $conn = $dbconfig["connection"];
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 0d197597..85410085 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -419,8 +419,8 @@ class access_Core {
    * @return ORM_Iterator
    */
   private static function _get_all_groups() {
-    // When we build the gallery package, it's possible that there is no identity provider installed yet.
-    // This is ok at packaging time, so work around it.
+    // When we build the gallery package, it's possible that there is no identity provider
+    // installed yet.  This is ok at packaging time, so work around it.
    if (module::is_active(module::get_var("gallery", "identity_provider", "user"))) {
       return identity::groups();
     } else {
@@ -436,11 +436,10 @@ class access_Core {
    * @return void
    */
   private static function _drop_columns($perm_name, $group) {
-    $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
     $cache_table = $perm_name == "view" ? "items" : "access_caches";
-    $db->query("ALTER TABLE {{$cache_table}} DROP `$field`");
-    $db->query("ALTER TABLE {access_intents} DROP `$field`");
+    Database::instance()->query("ALTER TABLE {{$cache_table}} DROP `$field`");
+    Database::instance()->query("ALTER TABLE {access_intents} DROP `$field`");
     model_cache::clear();
     ORM::factory("access_intent")->clear_cache();
   }
@@ -453,13 +452,18 @@ class access_Core {
    * @return void
    */
   private static function _add_columns($perm_name, $group) {
-    $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
     $cache_table = $perm_name == "view" ? "items" : "access_caches";
     $not_null = $cache_table == "items" ? "" : "NOT NULL";
-    $db->query("ALTER TABLE {{$cache_table}} ADD `$field` BINARY $not_null DEFAULT FALSE");
-    $db->query("ALTER TABLE {access_intents} ADD `$field` BINARY DEFAULT NULL");
-    $db->update("access_intents", array($field => self::DENY), array("item_id" => 1));
+    Database::instance()->query(
+      "ALTER TABLE {{$cache_table}} ADD `$field` BINARY $not_null DEFAULT FALSE");
+    Database::instance()->query(
+      "ALTER TABLE {access_intents} ADD `$field` BINARY DEFAULT NULL");
+    db::build()
+      ->update("access_intents")
+      ->set($field, self::DENY)
+      ->where("item_id", "=", 1)
+      ->execute();
     model_cache::clear();
     ORM::factory("access_intent")->clear_cache();
   }
@@ -476,8 +480,6 @@ class access_Core {
    */
   private static function _update_access_view_cache($group, $item) {
     $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
-
-    $db = Database::instance();
     $field = "view_{$group->id}";
 
     // With view permissions, deny values in the parent can override allow values in the child,
@@ -506,8 +508,12 @@ class access_Core {
     // access_caches table will already contain DENY values and we won't be able to overwrite
     // them according the rule above.  So mark every permission below this level as UNKNOWN so
     // that we can tell which permissions have been changed, and which ones need to be updated.
-    $db->update("items", array($field => self::UNKNOWN),
-                array("left_ptr >=" => $item->left_ptr, "right_ptr <=" => $item->right_ptr));
+    db::build()
+      ->update("items")
+      ->set($field, self::UNKNOWN)
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->execute();
 
     $query = ORM::factory("access_intent")
       ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr", "items.id"))
@@ -521,20 +527,34 @@ class access_Core {
     foreach ($query as $row) {
       if ($row->$field == self::ALLOW) {
         // Propagate ALLOW for any row that is still UNKNOWN.
-        $db->update("items", array($field => $row->$field),
-          array($field => self::UNKNOWN, "left_ptr >=" => $row->left_ptr, "right_ptr <=" => $row->right_ptr));
+        db::build()
+          ->update("items")
+          ->set($field, $row->$field)
+          ->where($field, "IS", self::UNKNOWN) // UNKNOWN is NULL so we have to use IS
+          ->where("left_ptr", ">=", $row->left_ptr)
+          ->where("right_ptr", "<=", $row->right_ptr)
+          ->execute();
       } else if ($row->$field == self::DENY) {
         // DENY overwrites everything below it
-        $db->update("items", array($field => $row->$field),
-                    array("left_ptr >=" => $row->left_ptr, "right_ptr <=" => $row->right_ptr));
+        db::build()
+          ->update("items")
+          ->set($field, $row->$field)
+          ->where("left_ptr", ">=", $row->left_ptr)
+          ->where("right_ptr", "<=", $row->right_ptr)
+          ->execute();
       }
     }
 
     // Finally, if our intent is DEFAULT at this point it means that we were unable to find a
     // DENY parent in the hierarchy to propagate from.  So we'll still have a UNKNOWN values in
     // the hierarchy, and all of those are safe to change to ALLOW.
-    $db->update("items", array($field => self::ALLOW),
-                array($field => self::UNKNOWN, "left_ptr >=" => $item->left_ptr, "right_ptr <=" => $item->right_ptr));
+    db::build()
+      ->update("items")
+      ->set($field, self::ALLOW)
+      ->where($field, "IS", self::UNKNOWN) // UNKNOWN is NULL so we have to use IS
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->execute();
   }
 
   /**
@@ -551,7 +571,6 @@ class access_Core {
   private static function _update_access_non_view_cache($group, $perm_name, $item) {
     $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
 
-    $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
 
     // If the item's intent is DEFAULT, then we need to back up the chain to find the nearest
@@ -564,7 +583,7 @@ class access_Core {
         ->join("access_intents", "items.id", "access_intents.item_id")
         ->where("left_ptr", "<", $item->left_ptr)
         ->where("right_ptr", ">", $item->right_ptr)
-        ->where($field, "IS NOT", self::UNKNOWN)
+        ->where($field, "IS NOT", self::UNKNOWN) // UNKNOWN is NULL so we have to use IS NOT
         ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
@@ -583,14 +602,18 @@ class access_Core {
       ->where($field, "IS NOT", self::INHERIT)
       ->order_by("level", "ASC")
       ->find_all();
-    foreach  ($query as $row) {
-      $value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
-      $db->query(
-        "UPDATE {access_caches} SET `$field` = $value " .
-        "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM {items} " .
-        "  WHERE `left_ptr` >= $row->left_ptr " .
-        "  AND `right_ptr` <= $row->right_ptr)");
+    foreach ($query as $row) {
+      $value = ($row->$field === self::ALLOW) ? true : false;
+      db::build()
+        ->update("access_caches")
+        ->set($field, $value)
+        ->where("item_id", "IN",
+                db::build()
+                ->select("id")
+                ->from("items")
+                ->where("left_ptr", ">=", $row->left_ptr)
+                ->where("right_ptr", "<=", $row->right_ptr))
+        ->execute();
     }
   }
 
-- 
cgit v1.2.3


From 8883d1605a12b94fb8f8b5a39ce5b4675b358302 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 21:16:37 -0800
Subject: Convert some more database queries.

---
 modules/gallery/controllers/packager.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 4569e166..2592da31 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -38,11 +38,9 @@ class Packager_Controller extends Controller {
   }
 
   private function _reset() {
-    $db = Database::instance();
-
     // Drop all tables
-    foreach ($db->list_tables() as $table) {
-      $db->query("DROP TABLE IF EXISTS {{$table}}");
+    foreach (Database::instance()->list_tables() as $table) {
+      Database::instance()->query("DROP TABLE IF EXISTS {{$table}}");
     }
 
     // Clean out data
@@ -53,7 +51,7 @@ class Packager_Controller extends Controller {
     dir::unlink(VARPATH . "modules");
     dir::unlink(VARPATH . "tmp");
 
-    $db->clear_cache();
+    Database::instance()->clear_cache();
     module::$modules = array();
     module::$active = array();
 
@@ -84,11 +82,13 @@ class Packager_Controller extends Controller {
       module::set_var("gallery", "blocks_{$key}", serialize($blocks));
     }
 
-    $db = Database::instance();
-    $db->query("TRUNCATE {sessions}");
-    $db->query("TRUNCATE {logs}");
-    $db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
-
+    Database::instance()->query("TRUNCATE {sessions}");
+    Database::instance()->query("TRUNCATE {logs}");
+    db::build()
+      ->delete("vars")
+      ->where("module_name", "=", "gallery")
+      ->where("name", "=", "_cache")
+      ->execute();
     db::build()->update("users", array("password" => ""), array("id" => 1))->execute();
     db::build()->update("users", array("password" => ""), array("id" => 2))->execute();
 
-- 
cgit v1.2.3


From 9d19e272d672ffc224dfed2799f8e480ecb583e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 21:16:51 -0800
Subject: Convert some database queries.

---
 modules/gallery/helpers/gallery_event.php | 25 ++++++++++++-------------
 modules/gallery/helpers/module.php        | 23 ++++++++++++++++++-----
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 37f39d15..301432d4 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -49,19 +49,18 @@ class gallery_event_Core {
 
   static function identity_provider_changed($old_provider, $new_provider) {
     $admin = identity::admin_user();
-    $db = Database::instance();
-    $db->from("tasks")
-      ->set(array("owner_id" => $admin->id))
-      ->where("1", "=", "1") // @todo why do we need this?
-      ->update();
-    $db->from("items")
-      ->set(array("owner_id" => $admin->id))
-      ->where("1", "=", "1") // @todo why do we need this?
-      ->update();
-    $db->from("logs")
-      ->set(array("user_id" => $admin->id))
-      ->where("1", "=", "1") // @todo why do we need this?
-      ->update();
+    db::build()
+      ->update("tasks")
+      ->set("owner_id", $admin->id)
+      ->execute();
+    db::build()
+      ->update("items")
+      ->set("owner_id", $admin->id)
+      ->execute();
+    db::build()
+      ->update("logs")
+      ->set("user_id", $admin->id)
+      ->execute();
   }
 
   static function group_created($group) {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index b8928f7b..71c4efa0 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -432,17 +432,30 @@ class module_Core {
 
   /**
    * Increment the value of a variable for this module
+   *
+   * Note: Frequently updating counters is very inefficient because it invalidates the cache value
+   * which has to be rebuilt every time we make a change.
+   *
+   * @todo Get rid of this and find an alternate approach for all callers (currently only Akismet)
+   *
+   * @deprecated
    * @param string $module_name
    * @param string $name
    * @param string $increment (optional, default is 1)
    */
   static function incr_var($module_name, $name, $increment=1) {
-    Database::instance()->query(
-      "UPDATE {vars} SET `value` = `value` + $increment " .
-      "WHERE `module_name` = '$module_name' " .
-      "AND `name` = '$name'");
+    db::build()
+      ->update("vars")
+      ->set("value", new Database_Expression("`value` + $increment"))
+      ->where("module_name", "=", $module_name)
+      ->where("name", "=", $name)
+      ->execute();
 
-    Database::instance()->delete("vars", array("module_name" => "gallery", "name" => "_cache"));
+    db::build()
+      ->delete("vars")
+      ->where("module_name", "=", "gallery")
+      ->where("name", "=", "_cache")
+      ->execute();
     self::$var_cache = null;
   }
 
-- 
cgit v1.2.3


From 0736cf203b37534848482e47c3afde9b58d6ce27 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 17 Dec 2009 21:32:53 -0800
Subject: In Kohana 2.4, ORM no longer does the find_all() call for us when we
 retrieve related ORMs.  If we tack a find_all() on the end, it breaks the
 User_Definition interface so create User_Model::groups() and
 Groups_Model::users() as glue.

---
 modules/gallery/helpers/access.php           | 2 +-
 modules/gallery/helpers/identity.php         | 2 +-
 modules/gallery/tests/Access_Helper_Test.php | 6 +++---
 modules/user/models/group.php                | 4 ++++
 modules/user/models/user.php                 | 4 ++++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 85410085..8ce7e436 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -101,7 +101,7 @@ class access_Core {
 
     $resource = $perm_name == "view" ?
       $item : model_cache::get("access_cache", $item->id, "item_id");
-    foreach ($user->groups->find_all() as $group) {
+    foreach ($user->groups() as $group) {
       if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
       }
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 707d1830..eae0ea3e 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -75,7 +75,7 @@ class identity_Core {
 
       if (!$session->get("group_ids")) {
         $ids = array();
-        foreach ($user->groups->find_all() as $group) {
+        foreach ($user->groups() as $group) {
           $ids[] = $group->id;
         }
         $session->set("group_ids", $ids);
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 771c6a85..799d5e44 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -76,7 +76,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::registered_users(), "view", $item);
 
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->add($access_test);
@@ -93,7 +93,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::registered_users(), "view", $item);
 
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->save();
@@ -288,7 +288,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   public function i_can_edit_test() {
     // Create a new user that belongs to no groups
     $user = identity::create_user("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
+    foreach ($user->groups() as $group) {
       $user->remove($group);
     }
     $user->save();
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 3a084684..515788a3 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -33,6 +33,10 @@ class Group_Model extends ORM implements Group_Definition {
     module::event("group_deleted", $old);
   }
 
+  public function users() {
+    return $this->users->find_all();
+  }
+
   public function save() {
     if (!$this->loaded()) {
         $created = 1;
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index e14d9b31..7d5bf413 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -61,6 +61,10 @@ class User_Model extends ORM implements User_Definition {
                    md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
   }
 
+  public function groups() {
+    return $this->groups->find_all();
+  }
+
   public function save() {
     if (!$this->loaded()) {
         $created = 1;
-- 
cgit v1.2.3


From c10386fe87f9fe0d659e730d171800f26f809604 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 18 Dec 2009 01:05:02 -0800
Subject: Convert html::specialchars() to html::chars()

---
 modules/user/helpers/user.php                               | 2 +-
 modules/user/libraries/drivers/IdentityProvider/Gallery.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 5027580c..e092aecc 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -86,7 +86,7 @@ class user_Core {
     }
 
     // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
+    $sanitizedPassword = html::chars($password, false);
     $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
           : ($salt . md5($salt . $sanitizedPassword));
     if (!strcmp($guess, $valid)) {
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index f02c53a2..50064287 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -63,7 +63,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
     }
 
     // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
+    $sanitizedPassword = html::chars($password, false);
     $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
           : ($salt . md5($salt . $sanitizedPassword));
     if (!strcmp($guess, $valid)) {
-- 
cgit v1.2.3


From ca1f7d0da7495aaa2558ddad134f14164a550ab3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 18 Dec 2009 01:12:16 -0800
Subject: Convert a database query.

---
 modules/gallery/models/item.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index d7ddcd02..e2208b73 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -120,11 +120,13 @@ class Item_Model extends ORM_MPTT {
     if ($this->is_album()) {
       @rename(dirname($original_resize_path), dirname($this->resize_path()));
       @rename(dirname($original_thumb_path), dirname($this->thumb_path()));
-      Database::instance()
-        ->update("items",
-                 array("relative_path_cache" => null,
-                       "relative_url_cache" => null),
-                 array("left_ptr >" => $this->left_ptr, "right_ptr <" => $this->right_ptr));
+      db::build()
+        ->update("items")
+        ->set("relative_path_cache", null)
+        ->set("relative_url_cache", null)
+        ->where("left_ptr", ">", $this->left_ptr)
+        ->where("right_ptr", "<", $this->right_ptr)
+        ->execute();
     } else {
       @rename($original_resize_path, $this->resize_path());
       @rename($original_thumb_path, $this->thumb_path());
-- 
cgit v1.2.3


From 338af4a722fb08abdf9f5b364418ceb83a329cdc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 18 Dec 2009 01:16:27 -0800
Subject: Database::escape_str() is now Database::escape().

---
 modules/search/helpers/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 70a39272..b2497eae 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -20,7 +20,7 @@
 class search_Core {
   static function search($q, $limit, $offset) {
     $db = Database::instance();
-    $q = $db->escape_str($q);
+    $q = $db->escape($q);
 
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-- 
cgit v1.2.3


From 046382c3e7f863e291d000eb2bb549474e475d1b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 18 Dec 2009 11:27:44 -0800
Subject: Remove some unused references to Database::instance()

---
 modules/tag/models/tag.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index f6cc6144..b2ce9eda 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -61,7 +61,6 @@ class Tag_Model extends ORM {
    * event for the union of all related items before and after the save.
    */
   public function save() {
-    $db = Database::instance();
     $related_item_ids = array();
     foreach (db::build()
              ->select("item_id")
@@ -98,8 +97,6 @@ class Tag_Model extends ORM {
    */
   public function delete() {
     $related_item_ids = array();
-    $db = Database::Instance();
-
     foreach (db::build()
              ->select("item_id")
              ->from("items_tags")
-- 
cgit v1.2.3


From 9af0a4e59c17987137b0ea316b6ccd45c02ca8a8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 18 Dec 2009 13:36:43 -0800
Subject: Convert a database call.

---
 modules/server_add/controllers/server_add.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 78e1620c..70ad6ea2 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -176,14 +176,13 @@ class Server_Add_Controller extends Admin_Controller {
       $task->set("queue", $queue);
       $task->percent_complete = min($task->percent_complete + 0.1, 10);
       $task->status = t2("Found one file", "Found %count files",
-                         Database::instance()
-                         ->where("task_id", "=", $task->id)
-                         ->count_records("server_add_files"));
+                         db::build()->count_records(
+                           "server_add_files", array("task_id" => $task->id)));
 
       if (!$queue) {
         $task->set("mode", "add-files");
         $task->set(
-          "total_files", database::instance()->count_records(
+          "total_files", db::build()->count_records(
             "server_add_files", array("task_id" => $task->id)));
         $task->percent_complete = 10;
       }
-- 
cgit v1.2.3


From 91e39f75a2e2954377da1c830388965f030f03be Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 11:29:13 -0800
Subject: Hardcode language translations since K24 now does it totally
 differently.  This forks the code, but it's reached the end of its
 development path and we should replace it with phpunit anyway

---
 modules/unit_test/libraries/Unit_Test.php | 96 ++++++++++++++++++++++---------
 1 file changed, 69 insertions(+), 27 deletions(-)

diff --git a/modules/unit_test/libraries/Unit_Test.php b/modules/unit_test/libraries/Unit_Test.php
index 7558759c..badefb79 100644
--- a/modules/unit_test/libraries/Unit_Test.php
+++ b/modules/unit_test/libraries/Unit_Test.php
@@ -20,6 +20,48 @@ class Unit_Test_Core {
 	// Statistics for every test class
 	protected $stats = array();
 
+        public static $lang = array(
+                'class'                => 'Class',
+                'method'               => 'Method',
+                'invalid_test_path'    => 'Failed to open test path: %s.',
+                'duplicate_test_class' => 'Duplicate test class named %s found in %s.',
+                'test_class_not_found' => 'No test class by the name of %s found in %s.',
+                'test_class_extends'   => '%s must extend Unit_Test_Case.',
+                'no_tests_found'       => 'No tests found',
+                'score'                => 'Score',
+                'total'                => 'Total',
+                'passed'               => 'Passed',
+                'failed'               => 'Failed',
+                'error'                => 'Error',
+                'errors'               => 'Errors',
+                'line'                 => 'line',
+                'assert_true'          => 'assert_true: Expected true, but was given (%s) %s.',
+                'assert_true_strict'   => 'assert_true_strict: Expected (boolean) true, but was given (%s) %s.',
+                'assert_false'         => 'assert_false: Expected false, but was given (%s) %s.',
+                'assert_false_strict'  => 'assert_false_strict: Expected (boolean) false, but was given (%s) %s.',
+                'assert_equal'         => 'assert_equal: Expected (%s) %s, but was given (%s) %s.',
+                'assert_not_equal'     => 'assert_not_equal: Expected not (%s) %s, but was given (%s) %s.',
+                'assert_same'          => 'assert_same: Expected (%s) %s, but was given (%s) %s.',
+                'assert_not_same'      => 'assert_not_same: Expected not (%s) %s, but was given (%s) %s.',
+                'assert_boolean'       => 'assert_boolean: Expected a boolean, but was given (%s) %s.',
+                'assert_not_boolean'   => 'assert_not_boolean: Expected not a boolean, but was given (%s) %s.',
+                'assert_integer'       => 'assert_integer: Expected an integer, but was given (%s) %s.',
+                'assert_not_integer'   => 'assert_not_integer: Expected not an integer, but was given (%s) %s.',
+                'assert_float'         => 'assert_float: Expected a float, but was given (%s) %s.',
+                'assert_not_float'     => 'assert_not_float: Expected not a float, but was given (%s) %s.',
+                'assert_array'         => 'assert_array: Expected an array, but was given (%s) %s.',
+                'assert_array_key'     => 'assert_array_key: Expected a valid key, but was given (%s) %s.',
+                'assert_in_array'      => 'assert_in_array: Expected a valid value, but was given (%s) %s.',	
+                'assert_not_array'     => 'assert_not_array: Expected not an array, but was given (%s) %s.',
+                'assert_object'        => 'assert_object: Expected an object, but was given (%s) %s.',
+                'assert_not_object'    => 'assert_not_object: Expected not an object, but was given (%s) %s.',
+                'assert_null'          => 'assert_null: Expected null, but was given (%s) %s.',
+                'assert_not_null'      => 'assert_not_null: Expected not null, but was given (%s) %s.',
+                'assert_empty'         => 'assert_empty: Expected an empty value, but was given (%s) %s.',
+                'assert_not_empty'     => 'assert_not_empty: Expected not an empty value, but was given (%s) %s.',
+                'assert_pattern'       => 'assert_pattern: Expected %s to match %s.',
+                'assert_not_pattern'   => 'assert_not_pattern: Expected %s to not match %s.'
+                      );
 	/**
 	 * Sets the test path(s), runs the tests inside and stores the results.
 	 *
@@ -207,7 +249,7 @@ class Unit_Test_Core {
 	{
 		// No tests found
 		if (empty($this->results))
-			return Kohana::lang('unit_test.no_tests_found');
+			return sprintf(self::$lang['unit_test.no_tests_found']);
 
 		// Hide passed tests from the report?
 		$hide_passed = (bool) (($hide_passed !== NULL) ? $hide_passed : Kohana::config('unit_test.hide_passed', FALSE, FALSE));
@@ -259,7 +301,7 @@ abstract class Unit_Test_Case {
 	public function assert_true($value, $debug = NULL)
 	{
 		if ($value != TRUE)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_true', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_true'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -267,7 +309,7 @@ abstract class Unit_Test_Case {
 	public function assert_true_strict($value, $debug = NULL)
 	{
 		if ($value !== TRUE)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_true_strict', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_true_strict'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -275,7 +317,7 @@ abstract class Unit_Test_Case {
 	public function assert_false($value, $debug = NULL)
 	{
 		if ($value != FALSE)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_false', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_false'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -283,7 +325,7 @@ abstract class Unit_Test_Case {
 	public function assert_false_strict($value, $debug = NULL)
 	{
 		if ($value !== FALSE)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_false_strict', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_false_strict'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -291,7 +333,7 @@ abstract class Unit_Test_Case {
 	public function assert_equal($expected, $actual, $debug = NULL)
 	{
 		if ($expected != $actual)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_equal', gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -299,7 +341,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_equal($expected, $actual, $debug = NULL)
 	{
 		if ($expected == $actual)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_equal', gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -307,7 +349,7 @@ abstract class Unit_Test_Case {
 	public function assert_same($expected, $actual, $debug = NULL)
 	{
 		if ($expected !== $actual)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_same', gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -315,7 +357,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_same($expected, $actual, $debug = NULL)
 	{
 		if ($expected === $actual)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_same', gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -323,7 +365,7 @@ abstract class Unit_Test_Case {
 	public function assert_boolean($value, $debug = NULL)
 	{
 		if ( ! is_bool($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_boolean', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_boolean'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -331,7 +373,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_boolean($value, $debug = NULL)
 	{
 		if (is_bool($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_boolean', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_boolean'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -339,7 +381,7 @@ abstract class Unit_Test_Case {
 	public function assert_integer($value, $debug = NULL)
 	{
 		if ( ! is_int($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_integer', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_integer'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -347,7 +389,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_integer($value, $debug = NULL)
 	{
 		if (is_int($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_integer', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_integer'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -355,7 +397,7 @@ abstract class Unit_Test_Case {
 	public function assert_float($value, $debug = NULL)
 	{
 		if ( ! is_float($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_float', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_float'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -363,7 +405,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_float($value, $debug = NULL)
 	{
 		if (is_float($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_float', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_float'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -371,7 +413,7 @@ abstract class Unit_Test_Case {
 	public function assert_array($value, $debug = NULL)
 	{
 		if ( ! is_array($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_array', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_array'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -379,7 +421,7 @@ abstract class Unit_Test_Case {
 	public function assert_array_key($key, $array, $debug = NULL)
 	{
 		if ( ! array_key_exists($key, $array)) {
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_array_key', gettype($key), var_export($key, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_array_key'], gettype($key), var_export($key, TRUE)), $debug);
 		}
 
 		return $this;
@@ -388,7 +430,7 @@ abstract class Unit_Test_Case {
 	public function assert_in_array($value, $array, $debug = NULL)
 	{
 		if ( ! in_array($value, $array)) {
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_in_array', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_in_array'], gettype($value), var_export($value, TRUE)), $debug);
 		}
 
 		return $this;
@@ -397,7 +439,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_array($value, $debug = NULL)
 	{
 		if (is_array($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_array', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_array'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -405,7 +447,7 @@ abstract class Unit_Test_Case {
 	public function assert_object($value, $debug = NULL)
 	{
 		if ( ! is_object($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_object', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_object'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -413,7 +455,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_object($value, $debug = NULL)
 	{
 		if (is_object($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_object', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_object'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -421,7 +463,7 @@ abstract class Unit_Test_Case {
 	public function assert_null($value, $debug = NULL)
 	{
 		if ($value !== NULL)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_null', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_null'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -429,7 +471,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_null($value, $debug = NULL)
 	{
 		if ($value === NULL)
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_null', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_null'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -437,7 +479,7 @@ abstract class Unit_Test_Case {
 	public function assert_empty($value, $debug = NULL)
 	{
 		if ( ! empty($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_empty', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -445,7 +487,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_empty($value, $debug = NULL)
 	{
 		if (empty($value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_empty', gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -453,7 +495,7 @@ abstract class Unit_Test_Case {
 	public function assert_pattern($value, $regex, $debug = NULL)
 	{
 		if ( ! is_string($value) OR ! is_string($regex) OR ! preg_match($regex, $value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_pattern', var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
 
 		return $this;
 	}
@@ -461,7 +503,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_pattern($value, $regex, $debug = NULL)
 	{
 		if ( ! is_string($value) OR ! is_string($regex) OR preg_match($regex, $value))
-			throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_pattern', var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
 
 		return $this;
 	}
-- 
cgit v1.2.3


From a22aa4ab05e50bb0bdd5e59a27b5f1867323f7a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 11:29:28 -0800
Subject: Forgot to rename the file when I renamed the class.

---
 modules/gallery/tests/Gallery_I18n_Test.php | 108 ++++++++++++++++++++++++++++
 modules/gallery/tests/I18n_Test.php         | 108 ----------------------------
 2 files changed, 108 insertions(+), 108 deletions(-)
 create mode 100644 modules/gallery/tests/Gallery_I18n_Test.php
 delete mode 100644 modules/gallery/tests/I18n_Test.php

diff --git a/modules/gallery/tests/Gallery_I18n_Test.php b/modules/gallery/tests/Gallery_I18n_Test.php
new file mode 100644
index 00000000..895e3051
--- /dev/null
+++ b/modules/gallery/tests/Gallery_I18n_Test.php
@@ -0,0 +1,108 @@
+ 'en',
+        'default_locale' => 'te_ST',
+        'locale_dir' => VARPATH . 'locale/');
+    $this->i18n = Gallery_I18n::instance($config);
+
+    ORM::factory("incoming_translation")
+      ->where("locale", "=", "te_ST")
+      ->delete_all();
+
+    $messages_te_ST = array(
+        array('Hello world', 'Hallo Welt'),
+        array(array('one' => 'One item has been added',
+                    'other' => '%count elements have been added'),
+              array('one' => 'Ein Element wurde hinzugefuegt.',
+                    'other' => '%count Elemente wurden hinzugefuegt.')),
+        array('Hello %name, how are you today?', 'Hallo %name, wie geht es Dir heute?'));
+
+    foreach ($messages_te_ST as $data) {
+      list ($message, $translation) = $data;
+      $entry = ORM::factory("incoming_translation");
+      $entry->key = Gallery_I18n::get_message_key($message);
+      $entry->message = serialize($message);
+      $entry->translation = serialize($translation);
+      $entry->locale = 'te_ST';
+      $entry->revision = null;
+      $entry->save();
+    }
+  }
+
+  public function get_locale_test() {
+    $locale = $this->i18n->locale();
+    $this->assert_equal("te_ST", $locale);
+  }
+
+  public function set_locale_test() {
+    $this->i18n->locale("de_DE");
+    $locale = $this->i18n->locale();
+    $this->assert_equal("de_DE", $locale);
+  }
+
+  public function translate_simple_test() {
+    $result = $this->i18n->translate('Hello world');
+    $this->assert_equal('Hallo Welt', $result);
+  }
+
+  public function translate_simple_root_fallback_test() {
+    $result = $this->i18n->translate('Hello world zzz');
+    $this->assert_equal('Hello world zzz', $result);
+  }
+
+  public function translate_plural_other_test() {
+    $result = $this->i18n->translate(array('one' => 'One item has been added',
+                                           'other' => '%count elements have been added'),
+                                     array('count' => 5));
+    $this->assert_equal('5 Elemente wurden hinzugefuegt.', $result);
+  }
+
+  public function translate_plural_one_test() {
+    $result = $this->i18n->translate(array('one' => 'One item has been added',
+                                           'other' => '%count elements have been added'),
+                                     array('count' => 1));
+    $this->assert_equal('Ein Element wurde hinzugefuegt.', $result);
+  }
+
+  public function translate_interpolate_test() {
+    $result = $this->i18n->translate('Hello %name, how are you today?', array('name' => 'John'));
+    $this->assert_equal('Hallo John, wie geht es Dir heute?', $result);
+  }
+
+  public function translate_interpolate_missing_value_test() {
+    $result = $this->i18n->translate('Hello %name, how are you today?', array('foo' => 'bar'));
+    $this->assert_equal('Hallo %name, wie geht es Dir heute?', $result);
+  }
+
+  public function translate_plural_zero_test() {
+    // te_ST has the same plural rules as en and de.
+    // For count 0, plural form "other" should be used.
+    $result = $this->i18n->translate(array('one' => 'One item has been added',
+                                           'other' => '%count elements have been added'),
+                                     array('count' => 0));
+    $this->assert_equal('0 Elemente wurden hinzugefuegt.', $result);
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
deleted file mode 100644
index 895e3051..00000000
--- a/modules/gallery/tests/I18n_Test.php
+++ /dev/null
@@ -1,108 +0,0 @@
- 'en',
-        'default_locale' => 'te_ST',
-        'locale_dir' => VARPATH . 'locale/');
-    $this->i18n = Gallery_I18n::instance($config);
-
-    ORM::factory("incoming_translation")
-      ->where("locale", "=", "te_ST")
-      ->delete_all();
-
-    $messages_te_ST = array(
-        array('Hello world', 'Hallo Welt'),
-        array(array('one' => 'One item has been added',
-                    'other' => '%count elements have been added'),
-              array('one' => 'Ein Element wurde hinzugefuegt.',
-                    'other' => '%count Elemente wurden hinzugefuegt.')),
-        array('Hello %name, how are you today?', 'Hallo %name, wie geht es Dir heute?'));
-
-    foreach ($messages_te_ST as $data) {
-      list ($message, $translation) = $data;
-      $entry = ORM::factory("incoming_translation");
-      $entry->key = Gallery_I18n::get_message_key($message);
-      $entry->message = serialize($message);
-      $entry->translation = serialize($translation);
-      $entry->locale = 'te_ST';
-      $entry->revision = null;
-      $entry->save();
-    }
-  }
-
-  public function get_locale_test() {
-    $locale = $this->i18n->locale();
-    $this->assert_equal("te_ST", $locale);
-  }
-
-  public function set_locale_test() {
-    $this->i18n->locale("de_DE");
-    $locale = $this->i18n->locale();
-    $this->assert_equal("de_DE", $locale);
-  }
-
-  public function translate_simple_test() {
-    $result = $this->i18n->translate('Hello world');
-    $this->assert_equal('Hallo Welt', $result);
-  }
-
-  public function translate_simple_root_fallback_test() {
-    $result = $this->i18n->translate('Hello world zzz');
-    $this->assert_equal('Hello world zzz', $result);
-  }
-
-  public function translate_plural_other_test() {
-    $result = $this->i18n->translate(array('one' => 'One item has been added',
-                                           'other' => '%count elements have been added'),
-                                     array('count' => 5));
-    $this->assert_equal('5 Elemente wurden hinzugefuegt.', $result);
-  }
-
-  public function translate_plural_one_test() {
-    $result = $this->i18n->translate(array('one' => 'One item has been added',
-                                           'other' => '%count elements have been added'),
-                                     array('count' => 1));
-    $this->assert_equal('Ein Element wurde hinzugefuegt.', $result);
-  }
-
-  public function translate_interpolate_test() {
-    $result = $this->i18n->translate('Hello %name, how are you today?', array('name' => 'John'));
-    $this->assert_equal('Hallo John, wie geht es Dir heute?', $result);
-  }
-
-  public function translate_interpolate_missing_value_test() {
-    $result = $this->i18n->translate('Hello %name, how are you today?', array('foo' => 'bar'));
-    $this->assert_equal('Hallo %name, wie geht es Dir heute?', $result);
-  }
-
-  public function translate_plural_zero_test() {
-    // te_ST has the same plural rules as en and de.
-    // For count 0, plural form "other" should be used.
-    $result = $this->i18n->translate(array('one' => 'One item has been added',
-                                           'other' => '%count elements have been added'),
-                                     array('count' => 0));
-    $this->assert_equal('0 Elemente wurden hinzugefuegt.', $result);
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.3


From 287f79dd721193aaaafdee3908cd8f251654de02 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 11:30:06 -0800
Subject: Updated for K24

---
 .../controllers/gallery_unit_test.php              | 39 +++++++++++-----------
 modules/gallery_unit_test/helpers/MY_request.php   | 25 ++++++++++++++
 2 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 modules/gallery_unit_test/helpers/MY_request.php

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 391ad029..498dd756 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -20,7 +20,7 @@
 class Gallery_Unit_Test_Controller extends Controller {
   function Index() {
     if (!TEST_MODE) {
-      print throw new Kohana_404_Exception();
+      throw new Kohana_404_Exception();
     }
 
     // Jump through some hoops to satisfy the way that we check for the site_domain in
@@ -30,6 +30,7 @@ class Gallery_Unit_Test_Controller extends Controller {
     $_SERVER["SCRIPT_FILENAME"] = "index.php";
     $_SERVER["SCRIPT_NAME"] = "./index.php";
 
+    $config = Kohana_Config::instance();
     $original_config = DOCROOT . "var/database.php";
     $test_config = VARPATH . "database.php";
     if (!file_exists($original_config)) {
@@ -41,20 +42,20 @@ class Gallery_Unit_Test_Controller extends Controller {
       if (empty($db_config['unit_test'])) {
         $default = $db_config['default'];
         $conn = $default['connection'];
-        Kohana::config_set('database.unit_test.benchmark', $default['benchmark']);
-        Kohana::config_set('database.unit_test.persistent', $default['persistent']);
-        Kohana::config_set('database.unit_test.connection.type', $conn['type']);
-        Kohana::config_set('database.unit_test.connection.user', $conn['user']);
-        Kohana::config_set('database.unit_test.connection.pass', $conn['pass']);
-        Kohana::config_set('database.unit_test.connection.host', $conn['host']);
-        Kohana::config_set('database.unit_test.connection.port', $conn['port']);
-        Kohana::config_set('database.unit_test.connection.socket', $conn['socket']);
-        Kohana::config_set('database.unit_test.connection.database', "{$conn['database']}_test");
-        Kohana::config_set('database.unit_test.character_set', $default['character_set']);
-        Kohana::config_set('database.unit_test.table_prefix', $default['table_prefix']);
-        Kohana::config_set('database.unit_test.object', $default['object']);
-        Kohana::config_set('database.unit_test.cache', $default['cache']);
-        Kohana::config_set('database.unit_test.escape', $default['escape']);
+        $config->set('database.unit_test.benchmark', $default['benchmark']);
+        $config->set('database.unit_test.persistent', $default['persistent']);
+        $config->set('database.unit_test.connection.type', $conn['type']);
+        $config->set('database.unit_test.connection.user', $conn['user']);
+        $config->set('database.unit_test.connection.pass', $conn['pass']);
+        $config->set('database.unit_test.connection.host', $conn['host']);
+        $config->set('database.unit_test.connection.port', $conn['port']);
+        $config->set('database.unit_test.connection.socket', $conn['socket']);
+        $config->set('database.unit_test.connection.database', "{$conn['database']}_test");
+        $config->set('database.unit_test.character_set', $default['character_set']);
+        $config->set('database.unit_test.table_prefix', $default['table_prefix']);
+        $config->set('database.unit_test.object', $default['object']);
+        $config->set('database.unit_test.cache', $default['cache']);
+        $config->set('database.unit_test.escape', $default['escape']);
         $db_config = Kohana::config('database');
       }
 
@@ -69,7 +70,7 @@ class Gallery_Unit_Test_Controller extends Controller {
         $db->connect();
 
         // Make this the default database for the rest of this run
-        Database::$instances = array('default' => $db);
+        Database::set_default_instance($db);
       } catch (Exception $e) {
         print "{$e->getMessage()}\n";
         return;
@@ -80,7 +81,7 @@ class Gallery_Unit_Test_Controller extends Controller {
       // Clean out the database
       if ($tables = $db->list_tables()) {
         foreach ($db->list_tables() as $table) {
-          $db->query("DROP TABLE $table");
+          $db->query("DROP TABLE {{$table}}");
         }
       }
 
@@ -97,7 +98,7 @@ class Gallery_Unit_Test_Controller extends Controller {
       $db->clear_cache();
 
       // Rest the cascading class path
-      Kohana::config_set("core", Kohana::config_load("core"));
+      $config->set("core", $config->load("core"));
 
       // Install the active modules
       // Force gallery and user to be installed first to resolve dependencies.
@@ -119,7 +120,7 @@ class Gallery_Unit_Test_Controller extends Controller {
         }
       }
 
-      Kohana::config_set('unit_test.paths', $paths);
+      $config->set('unit_test.paths', $paths);
 
       // Trigger late-binding install actions (defined in gallery_event::user_login)
       graphics::choose_default_toolkit();
diff --git a/modules/gallery_unit_test/helpers/MY_request.php b/modules/gallery_unit_test/helpers/MY_request.php
new file mode 100644
index 00000000..9cc9746a
--- /dev/null
+++ b/modules/gallery_unit_test/helpers/MY_request.php
@@ -0,0 +1,25 @@
+
Date: Mon, 21 Dec 2009 11:30:26 -0800
Subject: Add Database::set_default_instance() for tests

---
 modules/gallery/libraries/MY_Database.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index fd486039..a8f4bc08 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -57,4 +57,11 @@ abstract class Database extends Database_Core {
 
     return strtr($sql, $this->_table_names);
   }
+
+  /**
+   * This is used by the unit test code to switch the active database connection.
+   */
+  static function set_default_instance($db) {
+    self::$instances["default"] = $db;
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From bfcd99f3f2a7d1b2c5ed0b6593c202ff07058b68 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 11:30:34 -0800
Subject: Updated for K24

---
 modules/akismet/tests/Akismet_Helper_Test.php |  2 +-
 modules/comment/tests/Comment_Helper_Test.php |  7 ++++---
 modules/gallery/tests/Database_Test.php       | 25 +++++++++++++++----------
 modules/gallery/tests/Item_Model_Test.php     | 15 +++++++++++----
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index 745b455c..d8605d5c 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -22,7 +22,7 @@ class Akismet_Helper_Test extends Unit_Test_Case {
 
   public function setup() {
     Input::instance()->ip_address = "1.1.1.1";
-    Kohana::$user_agent = "Akismet_Helper_Test";
+    request::set_user_agent("Akismet_Helper_Test");
 
     $root = ORM::factory("item", 1);
     $this->_comment = comment::create(
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 82b7ebd2..8e726869 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -23,7 +23,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
 
   public function setup() {
     $this->_ip_address = Input::instance()->ip_address;
-    $this->_user_agent = Kohana::$user_agent;
+    $this->_user_agent = request::user_agent();
     $this->_save = $_SERVER;
 
     $_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
@@ -33,16 +33,17 @@ class Comment_Helper_Test extends Unit_Test_Case {
     $_SERVER["HTTP_CONNECTION"] = "HTTP_CONNECTION";
     $_SERVER["HTTP_HOST"] = "HTTP_HOST";
     $_SERVER["HTTP_REFERER"] = "HTTP_REFERER";
-    $_SERVER["HTTP_USER_AGENT"] = "HTTP_USER_AGENT";
     $_SERVER["QUERY_STRING"] = "QUERY_STRING";
     $_SERVER["REMOTE_ADDR"] = "REMOTE_ADDR";
     $_SERVER["REMOTE_HOST"] = "REMOTE_HOST";
     $_SERVER["REMOTE_PORT"] = "REMOTE_PORT";
+
+    request::set_user_agent("HTTP_USER_AGENT");
   }
 
   public function teardown() {
     Input::instance()->ip_address = $this->_ip_address;
-    Kohana::$user_agent = $this->_user_agent;
+    request::set_user_agent($this->_user_agent);
     $_SERVER = $this->_save;
   }
 
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 9b428379..4259961e 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -19,7 +19,7 @@
  */
 class Database_Test extends Unit_Test_Case {
   function simple_where_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("a", "=", 1)
       ->where("b", "=", 2)
       ->compile();
@@ -28,7 +28,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function compound_where_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -43,7 +43,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function group_first_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
@@ -58,12 +58,12 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function where_array_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
-      ->or_where("inner3", "=", 3))
+      ->or_where("inner3", "=", 3)
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
@@ -73,7 +73,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function notlike_test() {
-    $sql = Database::instance()
+    $sql = Database_Builder_For_Test::instance()
       ->where("outer1", "=", 1)
       ->or_open()
       ->where("inner1", "NOT LIKE", 1)
@@ -86,7 +86,7 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_replacement_test() {
-    $db = Database_For_Test::instance();
+    $db = Database::instance();
     $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test_tables} (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
@@ -118,7 +118,8 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_no_replacement_test() {
-    $update = Database_For_Test::instance()->from("test_tables")
+    $update = Database_Builder_For_Test::instance()
+      ->from("test_tables")
       ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
       ->update();
@@ -129,9 +130,9 @@ class Database_Test extends Unit_Test_Case {
   }
 }
 
-class Database_For_Test extends Database {
+class Database_Builder_For_Test extends Database_Builder {
   static function instance() {
-    $db = new Database_For_Test();
+    $db = new Database_Builder_For_Test();
     $db->_table_names["{items}"] = "g3test_items";
     $db->config["table_prefix"] = "g3test_";
     return $db;
@@ -143,4 +144,8 @@ class Database_For_Test extends Database {
     }
     return $sql;
   }
+
+  public function compile() {
+    return parent::compile();
+  }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index e7dce893..bf5fca1a 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -35,8 +35,12 @@ class Item_Model_Test extends Unit_Test_Case {
     $item = self::_create_random_item();
 
     // Force the creation date to something well known
-    $db = Database::instance();
-    $db->update("items", array("created" => 0, "updated" => 0), array("id" => $item->id));
+    db::build()
+      ->update("items")
+      ->set("created", 0)
+      ->set("updated", 0)
+      ->where("id", "=", $item->id)
+      ->execute();
     $item->reload();
     $item->title = "foo";  // force a change
     $item->save();
@@ -51,8 +55,11 @@ class Item_Model_Test extends Unit_Test_Case {
     $this->assert_same(0, $item->view_count);
 
     // Force the updated date to something well known
-    $db = Database::instance();
-    $db->update("items", array("updated" => 0), array("id" => $item->id));
+    db::build()
+      ->update("items")
+      ->set("updated", 0)
+      ->where("id", "=", $item->id)
+      ->execute();
     $item->reload();
     $item->view_count++;
     $item->save();
-- 
cgit v1.2.3


From 7d8f76fa7a303447f7835b803c05739b3e8e48c3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 12:07:20 -0800
Subject: Fix the translation keys to not require "unit_test." as a prefix.

---
 modules/unit_test/libraries/Unit_Test.php | 54 +++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/modules/unit_test/libraries/Unit_Test.php b/modules/unit_test/libraries/Unit_Test.php
index badefb79..46a926d8 100644
--- a/modules/unit_test/libraries/Unit_Test.php
+++ b/modules/unit_test/libraries/Unit_Test.php
@@ -249,7 +249,7 @@ class Unit_Test_Core {
 	{
 		// No tests found
 		if (empty($this->results))
-			return sprintf(self::$lang['unit_test.no_tests_found']);
+			return sprintf(self::$lang['no_tests_found']);
 
 		// Hide passed tests from the report?
 		$hide_passed = (bool) (($hide_passed !== NULL) ? $hide_passed : Kohana::config('unit_test.hide_passed', FALSE, FALSE));
@@ -301,7 +301,7 @@ abstract class Unit_Test_Case {
 	public function assert_true($value, $debug = NULL)
 	{
 		if ($value != TRUE)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_true'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_true'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -309,7 +309,7 @@ abstract class Unit_Test_Case {
 	public function assert_true_strict($value, $debug = NULL)
 	{
 		if ($value !== TRUE)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_true_strict'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_true_strict'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -317,7 +317,7 @@ abstract class Unit_Test_Case {
 	public function assert_false($value, $debug = NULL)
 	{
 		if ($value != FALSE)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_false'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_false'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -325,7 +325,7 @@ abstract class Unit_Test_Case {
 	public function assert_false_strict($value, $debug = NULL)
 	{
 		if ($value !== FALSE)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_false_strict'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_false_strict'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -333,7 +333,7 @@ abstract class Unit_Test_Case {
 	public function assert_equal($expected, $actual, $debug = NULL)
 	{
 		if ($expected != $actual)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -341,7 +341,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_equal($expected, $actual, $debug = NULL)
 	{
 		if ($expected == $actual)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_equal'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -349,7 +349,7 @@ abstract class Unit_Test_Case {
 	public function assert_same($expected, $actual, $debug = NULL)
 	{
 		if ($expected !== $actual)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -357,7 +357,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_same($expected, $actual, $debug = NULL)
 	{
 		if ($expected === $actual)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_same'], gettype($expected), var_export($expected, TRUE), gettype($actual), var_export($actual, TRUE)), $debug);
 
 		return $this;
 	}
@@ -365,7 +365,7 @@ abstract class Unit_Test_Case {
 	public function assert_boolean($value, $debug = NULL)
 	{
 		if ( ! is_bool($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_boolean'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_boolean'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -373,7 +373,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_boolean($value, $debug = NULL)
 	{
 		if (is_bool($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_boolean'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_boolean'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -381,7 +381,7 @@ abstract class Unit_Test_Case {
 	public function assert_integer($value, $debug = NULL)
 	{
 		if ( ! is_int($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_integer'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_integer'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -389,7 +389,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_integer($value, $debug = NULL)
 	{
 		if (is_int($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_integer'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_integer'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -397,7 +397,7 @@ abstract class Unit_Test_Case {
 	public function assert_float($value, $debug = NULL)
 	{
 		if ( ! is_float($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_float'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_float'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -405,7 +405,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_float($value, $debug = NULL)
 	{
 		if (is_float($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_float'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_float'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -413,7 +413,7 @@ abstract class Unit_Test_Case {
 	public function assert_array($value, $debug = NULL)
 	{
 		if ( ! is_array($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_array'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_array'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -421,7 +421,7 @@ abstract class Unit_Test_Case {
 	public function assert_array_key($key, $array, $debug = NULL)
 	{
 		if ( ! array_key_exists($key, $array)) {
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_array_key'], gettype($key), var_export($key, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_array_key'], gettype($key), var_export($key, TRUE)), $debug);
 		}
 
 		return $this;
@@ -430,7 +430,7 @@ abstract class Unit_Test_Case {
 	public function assert_in_array($value, $array, $debug = NULL)
 	{
 		if ( ! in_array($value, $array)) {
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_in_array'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_in_array'], gettype($value), var_export($value, TRUE)), $debug);
 		}
 
 		return $this;
@@ -439,7 +439,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_array($value, $debug = NULL)
 	{
 		if (is_array($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_array'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_array'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -447,7 +447,7 @@ abstract class Unit_Test_Case {
 	public function assert_object($value, $debug = NULL)
 	{
 		if ( ! is_object($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_object'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_object'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -455,7 +455,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_object($value, $debug = NULL)
 	{
 		if (is_object($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_object'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_object'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -463,7 +463,7 @@ abstract class Unit_Test_Case {
 	public function assert_null($value, $debug = NULL)
 	{
 		if ($value !== NULL)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_null'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_null'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -471,7 +471,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_null($value, $debug = NULL)
 	{
 		if ($value === NULL)
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_null'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_null'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -479,7 +479,7 @@ abstract class Unit_Test_Case {
 	public function assert_empty($value, $debug = NULL)
 	{
 		if ( ! empty($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -487,7 +487,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_empty($value, $debug = NULL)
 	{
 		if (empty($value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_empty'], gettype($value), var_export($value, TRUE)), $debug);
 
 		return $this;
 	}
@@ -495,7 +495,7 @@ abstract class Unit_Test_Case {
 	public function assert_pattern($value, $regex, $debug = NULL)
 	{
 		if ( ! is_string($value) OR ! is_string($regex) OR ! preg_match($regex, $value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
 
 		return $this;
 	}
@@ -503,7 +503,7 @@ abstract class Unit_Test_Case {
 	public function assert_not_pattern($value, $regex, $debug = NULL)
 	{
 		if ( ! is_string($value) OR ! is_string($regex) OR preg_match($regex, $value))
-			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['unit_test.assert_not_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+			throw new Kohana_Unit_Test_Exception(sprintf(Unit_Test::$lang['assert_not_pattern'], var_export($value, TRUE), var_export($regex, TRUE)), $debug);
 
 		return $this;
 	}
-- 
cgit v1.2.3


From 0c3fd9579fa5008cb51ab7080f2d861aa3fbfd6a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 12:09:16 -0800
Subject: Stop using Kohana::lang.

---
 modules/gallery_unit_test/views/kohana_unit_test_cli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery_unit_test/views/kohana_unit_test_cli.php b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
index 352671eb..3203ee44 100644
--- a/modules/gallery_unit_test/views/kohana_unit_test_cli.php
+++ b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
@@ -44,7 +44,7 @@ foreach ($results as $class => $methods) {
                red_start(), color_end());
         echo "  ", $result->getMessage(), "\n";
         echo "  ", $result->getFile();
-        echo " ", "(" . Kohana::lang("unit_test.line") . " " . $result->getLine(), ")\n";
+        echo " ", "(line " . $result->getLine(), ")\n";
         if ($result->getDebug() !== null) {
           echo "  ", "(", gettype($result->getDebug()), ") ",
             var_export($result->getDebug(), true), "\n";
-- 
cgit v1.2.3


From 5df1dc135b6b1fad77a23cd604f008e0784bdd73 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 12:13:25 -0800
Subject: Fix some bugs in the cache database driver, and update the tests for
 K24.

---
 .../gallery/libraries/drivers/Cache/Database.php   |  7 +-
 modules/gallery/tests/Cache_Test.php               | 79 ++++++++++------------
 2 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 5c453f28..82a09ab9 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -90,7 +90,7 @@ class Cache_Database_Driver extends Cache_Driver {
       ->select()
       ->from("caches");
     foreach ($tags as $tag) {
-      $db->where("tags", "LIKE", "<$tag>");
+      $db->where("tags", "LIKE", "%<$tag>%");
     }
     $db_result = $db->execute();
 
@@ -153,14 +153,13 @@ class Cache_Database_Driver extends Cache_Driver {
    * @param  bool    delete a tag
    * @return bool
    */
-  public function delete($id, $tag = false) {
+  public function delete($id, $tag=false) {
     $db = db::build()
       ->delete("caches");
     if ($id === true) {
       // Delete all caches
-      $db->where("1", "=", "1");
     } else if ($tag === true) {
-      $db->where("tags", "LIKE", "<$id>");
+      $db->where("tags", "LIKE", "%<$id>%");
     } else {
       $db->where("key", "=", $id);
     }
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index 776c6625..d5bf37cc 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -20,88 +20,83 @@
 class Cache_Test extends Unit_Test_Case {
   private $_driver;
   public function setup() {
-    Database::instance()->from("caches")->where("1", "=", "1")->delete();
+    db::build()->delete("caches")->execute();
     $this->_driver = new Cache_Database_Driver();
   }
 
   public function cache_exists_test() {
-    $db = Database::instance();
-
     $this->assert_false($this->_driver->exists("test_key"), "test_key should not be defined");
 
     $id = md5(rand());
-    $db->insert("caches", array("key" => $id, "tags" => ", ",
-                                "expiration" => 84600 + time(),
-                                "cache" => serialize("some test data")));
+    db::build()
+      ->insert("caches")
+      ->columns("key", "tags", "expiration", "cache")
+      ->values($id, ", ", 84600 + time(), serialize("some test data"))
+      ->execute();
 
     $this->assert_true($this->_driver->exists($id), "test_key should be defined");
   }
 
   public function cache_get_test() {
-    $db = Database::instance();
-
     $id = md5(rand());
-    $db->insert("caches", array("key" => $id, "tags" => ", ",
-                                "expiration" => 84600  + time(),
-                                "cache" => serialize("some test data")));
 
-    $data = $this->_driver->get($id);
+    db::build()
+      ->insert("caches")
+      ->columns("key", "tags", "expiration", "cache")
+      ->values($id, ", ", 84600 + time(), serialize("some test data"))
+      ->execute();
+
+    $data = $this->_driver->get(array($id));
     $this->assert_equal("some test data", $data, "cached data should match");
 
-    $data = $this->_driver->get("");
+    $data = $this->_driver->get(array(""));
     $this->assert_equal(null, $data, "cached data should not be found");
   }
 
   public function cache_set_test() {
-    $db = Database::instance();
-
     $id = md5(rand());
     $original_data = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id, $original_data, array("tag1", "tag2"), 84600);
+    $this->_driver->set(array($id => $original_data), array("tag1", "tag2"), 84600);
 
-    $data = $this->_driver->get($id);
+    $data = $this->_driver->get(array($id));
     $this->assert_equal($original_data, $data, "cached data should match");
   }
 
-  public function cache_find_test() {
-    $db = Database::instance();
-
+  public function cache_get_tag_test() {
     $id1 = md5(rand());
     $value1 = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
+    $this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);
 
     $id2 = md5(rand());
     $value2 = array("field3" => "value3", "field4" => "value4");
-    $this->_driver->set($id2, $value2, array("tag2", "tag3"), 84600);
+    $this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 84600);
 
     $id3 = md5(rand());
     $value3 = array("field5" => "value5", "field6" => "value6");
-    $this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
+    $this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);
 
-    $data = $this->_driver->find("tag2");
+    $data = $this->_driver->get_tag(array("tag2"));
 
     $expected = array($id1 => $value1, $id2 => $value2);
     ksort($expected);
     $this->assert_equal($expected, $data, "Expected id1 & id2");
 
-    $data = $this->_driver->find("tag4");
+    $data = $this->_driver->get_tag(array("tag4"));
     $this->assert_equal(array($id3 => $value3), $data, "Expected id3");
   }
 
   public function cache_delete_expired_test() {
-    $db = Database::instance();
-
     $id1 = md5(rand());
     $value1 = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id1, $value1, array("tag1", "tag2"), -84600);
+    $this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), -84600);
 
     $id2 = md5(rand());
     $value2 = array("field3" => "value3", "field4" => "value4");
-    $this->_driver->set($id2, $value2, array("tag2", "tag3"), -846000);
+    $this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), -846000);
 
     $id3 = md5(rand());
     $value3 = array("field5" => "value5", "field6" => "value6");
-    $this->_driver->set($id3, $value3, array("tag3", "tag4"), -84600);
+    $this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), -84600);
 
     $data = $this->_driver->delete_expired();
 
@@ -111,19 +106,17 @@ class Cache_Test extends Unit_Test_Case {
   }
 
   public function cache_delete_id_test() {
-    $db = Database::instance();
-
     $id1 = md5(rand());
     $value1 = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
+    $this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);
 
     $id2 = md5(rand());
     $value2 = array("field3" => "value3", "field4" => "value4");
-    $this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
+    $this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);
 
     $id3 = md5(rand());
     $value3 = array("field5" => "value5", "field6" => "value6");
-    $this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
+    $this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);
 
     $this->_driver->delete($id1);
 
@@ -133,19 +126,17 @@ class Cache_Test extends Unit_Test_Case {
   }
 
   public function cache_delete_tag_test() {
-    $db = Database::instance();
-
     $id1 = md5(rand());
     $value1 = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
+    $this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);
 
     $id2 = md5(rand());
     $value2 = array("field3" => "value3", "field4" => "value4");
-    $this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
+    $this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);
 
     $id3 = md5(rand());
     $value3 = array("field5" => "value5", "field6" => "value6");
-    $this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
+    $this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);
 
     $data = $this->_driver->delete("tag3", true);
 
@@ -155,19 +146,17 @@ class Cache_Test extends Unit_Test_Case {
   }
 
   public function cache_delete_all_test() {
-    $db = Database::instance();
-
     $id1 = md5(rand());
     $value1 = array("field1" => "value1", "field2" => "value2");
-    $this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
+    $this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);
 
     $id2 = md5(rand());
     $value2 = array("field3" => "value3", "field4" => "value4");
-    $this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
+    $this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);
 
     $id3 = md5(rand());
     $value3 = array("field5" => "value5", "field6" => "value6");
-    $this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
+    $this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);
 
     $data = $this->_driver->delete(true);
 
-- 
cgit v1.2.3


From e1f43ad403ac3deba8ac19d3d748500bba608395 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 12:22:19 -0800
Subject: Updated for K24

---
 modules/gallery/tests/Sendmail_Test.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index 64c1fff0..f3a8d897 100644
--- a/modules/gallery/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
@@ -19,9 +19,7 @@
  */
 class Sendmail_Test extends Unit_Test_Case {
   public function setup() {
-    $config = Kohana::config("sendmail");
-    $config["from"] = "from@gallery3.com";
-    Kohana::config_set("sendmail", $config);
+    Kohana_Config::instance()->set("sendmail.from", "from@gallery3.com");
   }
 
   public function sendmail_test() {
-- 
cgit v1.2.3


From cc4d7c672c863185bab5d654222e205d6517e98a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 15:40:28 -0800
Subject: Update database tests for K24.  Use a mock database that we load
 through the framework so that we're properly testing the Database_Builder,
 it's a lot cleaner than what we had before.

---
 modules/gallery/tests/Database_Test.php            | 105 +++++++++++++--------
 .../libraries/MY_Database_Builder.php              |   4 +
 2 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 4259961e..6aa186e5 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -18,17 +18,27 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Database_Test extends Unit_Test_Case {
+  function setup() {
+    $config = Kohana_Config::instance();
+    $config->set("database.mock.connection.type", "mock");
+    $config->set("database.mock.cache", false);
+    $config->set("database.mock.table_prefix", "g_");
+  }
+
   function simple_where_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select("some_column")
+      ->from("some_table")
       ->where("a", "=", 1)
       ->where("b", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
-    $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
+    $this->assert_same("SELECT [some_column] FROM [some_table] WHERE [a] = [1] AND [b] = [2]", $sql);
   }
 
   function compound_where_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -38,12 +48,13 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2) AND `outer2` = 2",
+      "SELECT [*] WHERE [outer1] = [1] AND ([inner1] = [1] OR [inner2] = [2]) AND [outer2] = [2]",
       $sql);
   }
 
   function group_first_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->and_open()
       ->where("inner1", "=", 1)
       ->or_where("inner2", "=", 2)
@@ -53,12 +64,13 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE (`inner1` = 1 OR `inner2` = 2) AND `outer1` = 1 AND `outer2` = 2",
+      "SELECT [*] WHERE ([inner1] = [1] OR [inner2] = [2]) AND [outer1] = [1] AND [outer2] = [2]",
       $sql);
   }
 
   function where_array_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->and_open()
       ->where("inner1", "=", 1)
@@ -68,32 +80,33 @@ class Database_Test extends Unit_Test_Case {
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 AND (`inner1` = 1 OR `inner2` = 2 OR `inner3` = 3)",
+      "SELECT [*] WHERE [outer1] = [1] AND ([inner1] = [1] OR [inner2] = [2] OR [inner3] = [3])",
       $sql);
   }
 
   function notlike_test() {
-    $sql = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
+      ->select()
       ->where("outer1", "=", 1)
       ->or_open()
-      ->where("inner1", "NOT LIKE", 1)
+      ->where("inner1", "NOT LIKE", "%1%")
       ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
-      "SELECT * WHERE `outer1` = 1 OR ( `inner1` NOT LIKE '%1%')",
+      "SELECT [*] WHERE [outer1] = [1] OR ([inner1] NOT LIKE [%1%])",
       $sql);
   }
 
   function prefix_replacement_test() {
-    $db = Database::instance();
-    $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test_tables} (
+    $db = Database::instance("mock");
+    $converted = $db->add_table_prefixes("CREATE TABLE IF NOT EXISTS {test} (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8");
-    $expected = "CREATE TABLE IF NOT EXISTS g3test_test_tables (
+    $expected = "CREATE TABLE IF NOT EXISTS g_test (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(32) NOT NULL,
                    PRIMARY KEY (`id`),
@@ -101,16 +114,16 @@ class Database_Test extends Unit_Test_Case {
                  ENGINE=InnoDB DEFAULT CHARSET=utf8";
     $this->assert_same($expected, $converted);
 
-    $sql = "UPDATE {test_tables} SET `name` = '{test string}' " .
+    $sql = "UPDATE {test} SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM {items} " .
+        "  (SELECT `id` FROM {test} " .
         "  WHERE `left_ptr` >= 1 " .
         "  AND `right_ptr` <= 6)";
     $sql = $db->add_table_prefixes($sql);
 
-    $expected = "UPDATE g3test_test_tables SET `name` = '{test string}' " .
+    $expected = "UPDATE g_test SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
-        "  (SELECT `id` FROM g3test_items " .
+        "  (SELECT `id` FROM g_test " .
         "  WHERE `left_ptr` >= 1 " .
         "  AND `right_ptr` <= 6)";
 
@@ -118,34 +131,52 @@ class Database_Test extends Unit_Test_Case {
   }
 
   function prefix_no_replacement_test() {
-    $update = Database_Builder_For_Test::instance()
+    $sql = db::build("mock")
       ->from("test_tables")
       ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
-      ->update();
+      ->update()
+      ->compile();
+    $sql = str_replace("\n", " ", $sql);
+    $this->assert_same("UPDATE [test_tables] SET [name] = [Test Name] WHERE [1] = [1]", $sql);
+  }
+}
 
-    $expected = "UPDATE `g3test_test_tables` SET `name` = 'Test Name' WHERE 1 = 1";
+class Database_Mock extends Database {
+  public function connect() {
+  }
 
-    $this->assert_same($expected, $update);
+  public function disconnect() {
   }
-}
 
-class Database_Builder_For_Test extends Database_Builder {
-  static function instance() {
-    $db = new Database_Builder_For_Test();
-    $db->_table_names["{items}"] = "g3test_items";
-    $db->config["table_prefix"] = "g3test_";
-    return $db;
+  public function set_charset($charset) {
   }
 
-  public function query($sql = '') {
-    if (!empty($sql)) {
-      $sql = $this->add_table_prefixes($sql);
-    }
-    return $sql;
+  public function query_execute($sql) {
   }
 
-  public function compile() {
-    return parent::compile();
+  public function escape($val) {
   }
-}
+
+  public function list_constraints($table) {
+  }
+
+  public function list_fields($table) {
+  }
+
+  public function list_tables() {
+    return array("test");
+  }
+
+  public function quote_column($val) {
+    return "[$val]";
+  }
+
+  public function quote_table($val) {
+    return "[$val]";
+  }
+
+  public function quote($val) {
+    return "[$val]";
+  }
+}
\ No newline at end of file
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 974f9c6d..54a10860 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -28,4 +28,8 @@ class Database_Builder extends Database_Builder_Core {
     }
     return $this;
   }
+
+  public function compile() {
+    return parent::compile();
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 31a545fa26a002432f01beabdae147de34793ec8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 15:58:22 -0800
Subject: Add missing execute() call -- tests ftw!

---
 modules/comment/helpers/comment_event.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 576e041d..43a30d70 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -21,7 +21,8 @@ class comment_event_Core {
   static function item_deleted($item) {
     db::build()
       ->delete("comments")
-      ->where("item_id", "=", $item->id);
+      ->where("item_id", "=", $item->id)
+      ->execute();
   }
 
   static function user_deleted($user) {
-- 
cgit v1.2.3


From 5080bc12a240e6e6c1fb7d2c8e93d78137b5092c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 16:40:01 -0800
Subject: Fix the relationship.  DigibugProxy belongs to Item, not the other
 way around.  K24 ORM requires this because it needs to know where the foreign
 key is (in the Digibug_Proxy table, in this case).

---
 modules/digibug/models/digibug_proxy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/digibug/models/digibug_proxy.php b/modules/digibug/models/digibug_proxy.php
index c76afdae..10949ed7 100644
--- a/modules/digibug/models/digibug_proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Digibug_Proxy_Model extends ORM {
-  protected $has_one = array("item");
+  protected $belongs_to = array("item");
 }
-- 
cgit v1.2.3


From ffb81c33571072e549d9f84f76c801699aef4cff Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 16:40:18 -0800
Subject: Rename $id --> $uuid for clarity.

---
 modules/digibug/controllers/digibug.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 03f9e812..d070727d 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -55,7 +55,7 @@ class Digibug_Controller extends Controller {
     print $v;
   }
 
-  public function print_proxy($type, $id) {
+  public function print_proxy($type, $uuid) {
     // If its a request for the full size then make sure we are coming from an
     // authorized address
     if ($type == "full") {
@@ -80,7 +80,7 @@ class Digibug_Controller extends Controller {
       }
     }
 
-    $proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
+    $proxy = ORM::factory("digibug_proxy")->where("uuid", "=", $uuid)->find();
     if (!$proxy->loaded() || !$proxy->item->loaded()) {
       throw new Kohana_404_Exception();
     }
-- 
cgit v1.2.3


From a474fb51556d9bf102f779faacf0671dc11dade7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 16:40:48 -0800
Subject: Get rid of unnecessary cleanup that makes debugging harder.

---
 modules/digibug/tests/Digibug_Controller_Test.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/digibug/tests/Digibug_Controller_Test.php b/modules/digibug/tests/Digibug_Controller_Test.php
index a56d58bb..015a270a 100644
--- a/modules/digibug/tests/Digibug_Controller_Test.php
+++ b/modules/digibug/tests/Digibug_Controller_Test.php
@@ -24,10 +24,6 @@ class Digibug_Controller_Test extends Unit_Test_Case {
 
   public function teardown() {
     $_SERVER = $this->_server;
-
-    if ($this->_proxy) {
-      $this->_proxy->delete();
-    }
   }
 
   public function setup() {
-- 
cgit v1.2.3


From e94009e90df5124ab83aad6a7f6a45806c3ff71b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 17:26:04 -0800
Subject: Add a helper for doing complex string comparisons

---
 modules/gallery_unit_test/helpers/diff.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 modules/gallery_unit_test/helpers/diff.php

diff --git a/modules/gallery_unit_test/helpers/diff.php b/modules/gallery_unit_test/helpers/diff.php
new file mode 100644
index 00000000..1ea16fa6
--- /dev/null
+++ b/modules/gallery_unit_test/helpers/diff.php
@@ -0,0 +1,26 @@
+
Date: Mon, 21 Dec 2009 17:26:24 -0800
Subject: Updated for recent K24 Forge changes.

---
 modules/gallery/tests/DrawForm_Test.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 7ee80ca2..baded8de 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -25,9 +25,10 @@ class DrawForm_Test extends Unit_Test_Case {
     $form->submit("")->value(t("Submit"));
     $rendered = $form->__toString();
 
+    $csrf = access::csrf_token();
     $expected = "
          \n" .
-                "\n" .
+                "" .
                 "  
            \n" .
                 "  
          • \n" .
                 "    \n" .
@@ -36,14 +37,14 @@ class DrawForm_Test extends Unit_Test_Case {
                 "  
            • \n" .
                 "  
          • \n" .
                 "    \n" .
-                "    \n" .
                 "  
            • \n" .
                 "  
          • \n" .
                 "    \n" .
                 "  
            • \n" .
                 "  
          \n" .
-                "
          \n";
+                "";
     $this->assert_same($expected, $rendered);
   }
 
@@ -55,9 +56,10 @@ class DrawForm_Test extends Unit_Test_Case {
     $group->submit("")->value(t("Submit"));
     $rendered = $form->__toString();
 
+    $csrf = access::csrf_token();
     $expected = "
          \n" .
-                "\n" .
+                "" .
                 "  
          \n" .
                 "    Test Group\n" .
                 "    
            \n" .
@@ -68,7 +70,7 @@ class DrawForm_Test extends Unit_Test_Case {
                 "      \n" .
                 "      
          • \n" .
                 "        \n" .
-                "        \n" .
                 "      
            • \n" .
                 "      
          • \n" .
@@ -76,7 +78,7 @@ class DrawForm_Test extends Unit_Test_Case {
                 "      
            • \n" .
                 "    
          \n" .
                 "  
          \n" .
-                "
          \n";
+                "";
     $this->assert_same($expected, $rendered);
   }
 
@@ -91,9 +93,10 @@ class DrawForm_Test extends Unit_Test_Case {
     $group->submit("")->value(t("Submit"));
     $rendered = $form->__toString();
 
+    $csrf = access::csrf_token();
     $expected = "
          \n" .
-                "\n" .
+                "" .
                 "  
          \n" .
                 "    Test Group\n" .
                 "    
            \n" .
@@ -104,7 +107,7 @@ class DrawForm_Test extends Unit_Test_Case {
                 "      \n" .
                 "      
          • \n" .
                 "        \n" .
-                "        \n" .
                 "      
            • \n" .
                 "      
          • \n" .
@@ -116,7 +119,7 @@ class DrawForm_Test extends Unit_Test_Case {
                 "\n" .
-                "
            • \n";
+                "";
     $this->assert_same($expected, $rendered);
   }
 }
-- 
cgit v1.2.3


From 9c5df1d31bd214fab051b71d092c751a1da20ecc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 19:59:44 -0800
Subject: Fix preambles, and fix the File_Structure_Test to be more lenient
 because of preamble variation in K24.

---
 application/Bootstrap.php                        | 22 +++++++++----
 modules/gallery/config/log_file.php              | 20 ++++++++++-
 modules/gallery/tests/File_Structure_Test.php    | 16 ++++++---
 modules/kohana23_compat/config/pagination.php    | 42 +++++++++++++-----------
 modules/kohana23_compat/libraries/Pagination.php | 20 ++++++++++-
 5 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index f36fac14..95f7b8d2 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,13 +1,21 @@
-\n";
+      $expected_2 = " 'pagination',
-	'style'          => 'classic',
-	'uri_segment'    => 3,
-	'query_string'   => '',
-	'items_per_page' => 20,
-	'auto_hide'      => FALSE,
+$config["default"] = array(
+  "directory"      => "pagination",
+  "style"          => "classic",
+  "uri_segment"    => 3,
+  "query_string"   => "",
+  "items_per_page" => 20,
+  "auto_hide"      => FALSE
 );
diff --git a/modules/kohana23_compat/libraries/Pagination.php b/modules/kohana23_compat/libraries/Pagination.php
index 8ff8bf94..012bc484 100644
--- a/modules/kohana23_compat/libraries/Pagination.php
+++ b/modules/kohana23_compat/libraries/Pagination.php
@@ -1,4 +1,22 @@
-
Date: Mon, 21 Dec 2009 20:05:27 -0800
Subject: Updated Kohana to r4724

---
 system/config/cache.php                     |    3 +
 system/config/database.php                  |    3 +-
 system/core/Kohana.php                      |   39 +-
 system/core/Kohana_Exception.php            |    4 +-
 system/helpers/form.php                     |   28 +-
 system/helpers/inflector.php                |    6 +-
 system/helpers/request.php                  |    4 +-
 system/helpers/security.php                 |   13 +-
 system/helpers/text.php                     |   46 +-
 system/helpers/url.php                      |   21 +-
 system/helpers/utf8.php                     |    2 +-
 system/libraries/Cache.php                  |   87 +-
 system/libraries/Controller.php             |    8 +-
 system/libraries/Database.php               |   23 +-
 system/libraries/Database_Builder.php       |  103 +-
 system/libraries/Database_Mysql.php         |    9 +-
 system/libraries/Database_Mysqli.php        |   32 +-
 system/libraries/Input.php                  |    8 +-
 system/libraries/Kohana_PHP_Exception.php   |    4 +-
 system/libraries/ORM.php                    |   56 +-
 system/libraries/Profiler.php               |    4 +-
 system/libraries/Router.php                 |   10 +-
 system/libraries/Validation.php             |  155 +-
 system/libraries/drivers/Cache/File.php     |    4 +-
 system/libraries/drivers/Cache/Memcache.php |    7 +-
 system/libraries/drivers/Cache/Xcache.php   |    2 +-
 system/messages/core.php                    |    9 +-
 system/messages/validation/default.php      |   17 +
 system/vendor/Markdown.php                  | 2909 ---------------------------
 29 files changed, 458 insertions(+), 3158 deletions(-)
 create mode 100644 system/messages/validation/default.php
 delete mode 100644 system/vendor/Markdown.php

diff --git a/system/config/cache.php b/system/config/cache.php
index 68682c0a..76af4f6a 100644
--- a/system/config/cache.php
+++ b/system/config/cache.php
@@ -19,10 +19,13 @@
  *             thirty minutes. Specific lifetime can also be set when creating a new cache.
  *             Setting this to 0 will never automatically delete caches.
  *
+ *  prefix   - Adds a prefix to all keys and tags. This can have a severe performance impact.
+ *
  */
 $config['default'] = array
 (
 	'driver'   => 'file',
 	'params'   => array('directory' => APPPATH.'cache', 'gc_probability' => 1000),
 	'lifetime' => 1800,
+	'prefix'   => NULL
 );
diff --git a/system/config/database.php b/system/config/database.php
index 2e53fa2b..36e4614c 100644
--- a/system/config/database.php
+++ b/system/config/database.php
@@ -35,7 +35,8 @@ $config['default'] = array
 		'host'     => 'localhost',
 		'port'     => FALSE,
 		'socket'   => FALSE,
-		'database' => 'kohana'
+		'database' => 'kohana',
+		'params'   => NULL,
 	),
 	'character_set' => 'utf8',
 	'table_prefix'  => '',
diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index 5258d635..740adb80 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -2,7 +2,7 @@
 /**
  * Provides Kohana-specific helper functions. This is where the magic happens!
  *
- * $Id: Kohana.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Kohana.php 4724 2009-12-21 16:28:54Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -45,6 +45,9 @@ abstract class Kohana_Core {
 	protected static $internal_cache_key;
 	protected static $internal_cache_encrypt;
 
+	// Server API that PHP is using. Allows testing of different APIs.
+	public static $server_api = PHP_SAPI;
+
 	/**
 	 * Sets up the PHP environment. Adds error/exception handling, output
 	 * buffering, and adds an auto-loading method for loading classes.
@@ -162,6 +165,35 @@ abstract class Kohana_Core {
 		// Set and validate the timezone
 		date_default_timezone_set(Kohana::config('locale.timezone'));
 
+		// register_globals is enabled
+		if (ini_get('register_globals'))
+		{
+			if (isset($_REQUEST['GLOBALS']))
+			{
+				// Prevent GLOBALS override attacks
+				exit('Global variable overload attack.');
+			}
+
+			// Destroy the REQUEST global
+			$_REQUEST = array();
+
+			// These globals are standard and should not be removed
+			$preserve = array('GLOBALS', '_REQUEST', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER', '_ENV', '_SESSION');
+
+			// This loop has the same effect as disabling register_globals
+			foreach (array_diff(array_keys($GLOBALS), $preserve) as $key)
+			{
+				global $$key;
+				$$key = NULL;
+
+				// Unset the global variable
+				unset($GLOBALS[$key], $$key);
+			}
+
+			// Warn the developer about register globals
+			Kohana_Log::add('debug', 'Disable register_globals! It is evil and deprecated: http://php.net/register_globals');
+		}
+
 		// Enable Kohana routing
 		Event::add('system.routing', array('Router', 'find_uri'));
 		Event::add('system.routing', array('Router', 'setup'));
@@ -602,7 +634,7 @@ abstract class Kohana_Core {
 				header('Content-Encoding: '.$compress);
 
 				// Sending Content-Length in CGI can result in unexpected behavior
-				if (stripos(PHP_SAPI, 'cgi') === FALSE)
+				if (stripos(Kohana::$server_api, 'cgi') === FALSE)
 				{
 					header('Content-Length: '.strlen($output));
 				}
@@ -876,9 +908,6 @@ abstract class Kohana_Core {
 		$group = explode('.', $key, 2);
 		$group = $group[0];
 
-		// Get locale name
-		$locale = Kohana::config('locale.language.0');
-
 		if ( ! isset(Kohana::$internal_cache['messages'][$group]))
 		{
 			// Messages for this group
diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php
index cdb06a62..2eb28f75 100644
--- a/system/core/Kohana_Exception.php
+++ b/system/core/Kohana_Exception.php
@@ -2,7 +2,7 @@
 /**
  * Kohana Exceptions
  *
- * $Id: Kohana_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Kohana_Exception.php 4692 2009-12-04 15:59:44Z cbandy $
  *
  * @package    Core
  * @author     Kohana Team
@@ -197,7 +197,7 @@ class Kohana_Exception_Core extends Exception {
 			echo Kohana_Exception::text($e), "\n";
 		}
 
-		if (PHP_SAPI === 'cli')
+		if (Kohana::$server_api === 'cli')
 		{
 			// Exit with an error status
 			exit(1);
diff --git a/system/helpers/form.php b/system/helpers/form.php
index 901edc91..4225b1b6 100644
--- a/system/helpers/form.php
+++ b/system/helpers/form.php
@@ -2,7 +2,7 @@
 /**
  * Form helper class.
  *
- * $Id: form.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: form.php 4699 2009-12-08 18:45:14Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -421,32 +421,6 @@ class form_Core {
 		if (empty($attr))
 			return '';
 
-		if (isset($attr['name']) AND empty($attr['id']) AND strpos($attr['name'], '[') === FALSE)
-		{
-			if ($type === NULL AND ! empty($attr['type']))
-			{
-				// Set the type by the attributes
-				$type = $attr['type'];
-			}
-
-			switch ($type)
-			{
-				case 'text':
-				case 'textarea':
-				case 'password':
-				case 'select':
-				case 'checkbox':
-				case 'file':
-				case 'image':
-				case 'button':
-				case 'submit':
-				case 'hidden':
-					// Only specific types of inputs use name to id matching
-					$attr['id'] = $attr['name'];
-				break;
-			}
-		}
-
 		$order = array
 		(
 			'action',
diff --git a/system/helpers/inflector.php b/system/helpers/inflector.php
index 9bd281db..5a2910c0 100644
--- a/system/helpers/inflector.php
+++ b/system/helpers/inflector.php
@@ -2,7 +2,7 @@
 /**
  * Inflector helper class.
  *
- * $Id: inflector.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: inflector.php 4722 2009-12-19 17:47:34Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -241,9 +241,9 @@ class inflector_Core {
 	}
 
 	/**
-	 * Makes an underscored or dashed phrase human-reable.
+	 * Makes an underscored or dashed phrase human-readable.
 	 *
-	 * @param   string  phrase to make human-reable
+	 * @param   string  phrase to make human-readable
 	 * @return  string
 	 */
 	public static function humanize($str)
diff --git a/system/helpers/request.php b/system/helpers/request.php
index 4770d64b..31afee4e 100644
--- a/system/helpers/request.php
+++ b/system/helpers/request.php
@@ -2,7 +2,7 @@
 /**
  * Request helper class.
  *
- * $Id: request.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: request.php 4692 2009-12-04 15:59:44Z cbandy $
  *
  * @package    Core
  * @author     Kohana Team
@@ -61,7 +61,7 @@ class request_Core {
 	 */
 	public static function protocol()
 	{
-		if (PHP_SAPI === 'cli')
+		if (Kohana::$server_api === 'cli')
 		{
 			return NULL;
 		}
diff --git a/system/helpers/security.php b/system/helpers/security.php
index 9eb82a58..33e5118e 100644
--- a/system/helpers/security.php
+++ b/system/helpers/security.php
@@ -2,7 +2,7 @@
 /**
  * Security helper class.
  *
- * $Id: security.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: security.php 4698 2009-12-08 18:39:33Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -34,15 +34,4 @@ class security_Core {
 		return preg_replace('#\s]*)["\']?[^>]*)?>#is', '$1', $str);
 	}
 
-	/**
-	 * Remove PHP tags from a string.
-	 *
-	 * @param   string  string to sanitize
-	 * @return  string
-	 */
-	public static function encode_php_tags($str)
-	{
-		return str_replace(array(''), array('<?', '?>'), $str);
-	}
-
 } // End security
\ No newline at end of file
diff --git a/system/helpers/text.php b/system/helpers/text.php
index 66bcd243..ed7f9cbf 100644
--- a/system/helpers/text.php
+++ b/system/helpers/text.php
@@ -2,7 +2,7 @@
 /**
  * Text helper class.
  *
- * $Id: text.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: text.php 4689 2009-12-02 01:39:24Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -298,27 +298,37 @@ class text_Core {
 	 */
 	public static function auto_link_urls($text)
 	{
-		// Finds all http/https/ftp/ftps links that are not part of an existing html anchor
-		if (preg_match_all('~\b(?)(?:ht|f)tps?://\S+(?:/|\b)~i', $text, $matches))
-		{
-			foreach ($matches[0] as $match)
-			{
-				// Replace each link with an anchor
-				$text = str_replace($match, html::anchor($match), $text);
-			}
-		}
 
-		// Find all naked www.links.com (without http://)
-		if (preg_match_all('~\b(? $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 @@
 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;
 	}
 
@@ -779,6 +839,19 @@ class Database_Builder_Core {
 		return $this;
 	}
 
+	/**
+	 * 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
 	 *
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
@@ -524,16 +524,6 @@ class ORM_Core {
 		unset($this->object[$column], $this->changed[$column], $this->related[$column]);
 	}
 
-	/**
-	 * 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.
 	 *
@@ -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);
 	}
 
@@ -85,21 +82,6 @@ class Validation_Core extends ArrayObject {
 		return $copy;
 	}
 
-	/**
-	 * 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.
 	 *
@@ -196,6 +178,42 @@ class Validation_Core extends ArrayObject {
 		return $this;
 	}
 
+	/**
+	* 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.
 	 *
@@ -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
@@ -618,46 +640,6 @@ class Validation_Core extends ArrayObject {
 		return $this;
 	}
 
-	/**
-	 * 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.
 	 *
@@ -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;
 	}
diff --git a/system/messages/core.php b/system/messages/core.php
index 4bf6ee8c..64f897e8 100644
--- a/system/messages/core.php
+++ b/system/messages/core.php
@@ -8,7 +8,6 @@ $messages = array
 		E_PAGE_NOT_FOUND     => __('Page Not Found'),    // __('The requested page was not found. It may have moved, been deleted, or archived.'),
 		E_DATABASE_ERROR     => __('Database Error'),    // __('A database error occurred while performing the requested procedure. Please review the database error below for more information.'),
 		E_RECOVERABLE_ERROR  => __('Recoverable Error'), // __('An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'),
-
 		E_ERROR              => __('Fatal Error'),
 		E_COMPILE_ERROR      => __('Fatal Error'),
 		E_CORE_ERROR         => __('Fatal Error'),
@@ -29,4 +28,10 @@ $messages = array
 	'driver'             => 'driver',
 	'model'              => 'model',
 	'view'               => 'view',
-);
\ No newline at end of file
+);
+
+// E_DEPRECATED is only defined in PHP >= 5.3.0
+if (defined('E_DEPRECATED'))
+{
+	$messages['errors'][E_DEPRECATED] = __('Deprecated');
+}
\ No newline at end of file
diff --git a/system/messages/validation/default.php b/system/messages/validation/default.php
new file mode 100644
index 00000000..2c59fa06
--- /dev/null
+++ b/system/messages/validation/default.php
@@ -0,0 +1,17 @@
+ 'The :field field is required',
+	'length'        => 'The :field field must be between :param1 and :param2 characters long',
+	'depends_on'    => 'The :field field requires the :param1 field',
+	'matches'       => 'The :field field must be the same as :param1',
+	'email'         => 'The :field field must be a valid email address',
+	'decimal'       => 'The :field field must be a decimal with :param1 places',
+	'digit'         => 'The :field field must be a digit',
+	'in_array'      => 'The :field field must be one of the available options',
+	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',
+	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',
+	'numeric '      => 'The :field field must be a valid number',
+	'url'           => 'The :field field must be a valid url',
+	'phone'         => 'The :field field must be a valid phone number',
+);
diff --git a/system/vendor/Markdown.php b/system/vendor/Markdown.php
deleted file mode 100644
index b649f6c1..00000000
--- a/system/vendor/Markdown.php
+++ /dev/null
@@ -1,2909 +0,0 @@
-
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber  
-# 
-#
-
-
-define( 'MARKDOWN_VERSION',  "1.0.1m" ); # Sat 21 Jun 2008
-define( 'MARKDOWNEXTRA_VERSION',  "1.2.3" ); # Wed 31 Dec 2008
-
-
-#
-# Global default settings:
-#
-
-# Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
-
-# Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
-
-# Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
-
-# Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
-
-
-#
-# WordPress settings:
-#
-
-# Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
-
-
-
-### Standard Function Interface ###
-
-@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
-
-function Markdown($text) {
-#
-# Initialize the parser and return the result of its transform method.
-#
-	# Setup static parser variable.
-	static $parser;
-	if (!isset($parser)) {
-		$parser_class = MARKDOWN_PARSER_CLASS;
-		$parser = new $parser_class;
-	}
-
-	# Transform text using parser.
-	return $parser->transform($text);
-}
-
-
-### WordPress Plugin Interface ###
-
-/*
-Plugin Name: Markdown Extra
-Plugin URI: http://www.michelf.com/projects/php-markdown/
-Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...
-Version: 1.2.2
-Author: Michel Fortin
-Author URI: http://www.michelf.com/
-*/
-
-if (isset($wp_version)) {
-	# More details about how it works here:
-	# 
-	
-	# Post content and excerpts
-	# - Remove WordPress paragraph generator.
-	# - Run Markdown on excerpt, then remove all tags.
-	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
-	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
-        remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
-        add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
-		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
-		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
-		add_filter('the_excerpt_rss', 'mdwp_strip_p');
-		
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
-		add_filter('get_the_excerpt', 'balanceTags', 9);
-	}
-	
-	# Add a footnote id prefix to posts when inside a loop.
-	function mdwp_MarkdownPost($text) {
-		static $parser;
-		if (!$parser) {
-			$parser_class = MARKDOWN_PARSER_CLASS;
-			$parser = new $parser_class;
-		}
-		if (is_single() || is_page() || is_feed()) {
-			$parser->fn_id_prefix = "";
-		} else {
-			$parser->fn_id_prefix = get_the_ID() . ".";
-		}
-		return $parser->transform($text);
-	}
-	
-	# Comments
-	# - Remove WordPress paragraph generator.
-	# - Remove WordPress auto-link generator.
-	# - Scramble important tags before passing them to the kses filter.
-	# - Run Markdown on excerpt then remove paragraph tags.
-	if (MARKDOWN_WP_COMMENTS) {
-		remove_filter('comment_text', 'wpautop', 30);
-		remove_filter('comment_text', 'make_clickable');
-		add_filter('pre_comment_content', 'Markdown', 6);
-		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
-		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
-		add_filter('get_comment_excerpt', 'Markdown', 6);
-		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
-	
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		$mdwp_hidden_tags = explode(' ',
-			'
             
             
             
             
               
             
               
             
          •  
            • ');
-		$mdwp_placeholders = explode(' ', str_rot13(
-			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
-			'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
-	}
-	
-	function mdwp_add_p($text) {
-		if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
-			$text = '
            '.$text.'
            ';
-			$text = preg_replace('{\n{2,}}', "
            \n\n
            ", $text);
-		}
-		return $text;
-	}
-	
-	function mdwp_strip_p($t) { return preg_replace('{}i', '', $t); }
-
-	function mdwp_hide_tags($text) {
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
-	}
-	function mdwp_show_tags($text) {
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
-	}
-}
-
-
-### bBlog Plugin Info ###
-
-function identify_modifier_markdown() {
-	return array(
-		'name' => 'markdown',
-		'type' => 'modifier',
-		'nicename' => 'PHP Markdown Extra',
-		'description' => 'A text-to-HTML conversion tool for web writers',
-		'authors' => 'Michel Fortin and John Gruber',
-		'licence' => 'GPL',
-		'version' => MARKDOWNEXTRA_VERSION,
-		'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...',
-		);
-}
-
-
-### Smarty Modifier Interface ###
-
-function smarty_modifier_markdown($text) {
-	return Markdown($text);
-}
-
-
-### Textile Compatibility Mode ###
-
-# Rename this file to "classTextile.php" and it can replace Textile everywhere.
-
-if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) {
-	# Try to include PHP SmartyPants. Should be in the same directory.
-	@include_once 'smartypants.php';
-	# Fake Textile class. It calls Markdown instead.
-	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
-			if ($lite == '' && $encode == '')    $text = Markdown($text);
-			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
-			return $text;
-		}
-		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
-			return $this->TextileThis($text, $lite);
-		}
-		# Workaround to ensure compatibility with TextPattern 4.0.3.
-		function blockLite($text) { return $text; }
-	}
-}
-
-
-
-#
-# Markdown Parser Class
-#
-
-class Markdown_Parser {
-
-	# Regex to match balanced [brackets].
-	# Needed to insert a maximum bracked depth while converting to PHP.
-	var $nested_brackets_depth = 6;
-	var $nested_brackets_re;
-	
-	var $nested_url_parenthesis_depth = 4;
-	var $nested_url_parenthesis_re;
-
-	# Table of hash values for escaped characters:
-	var $escape_chars = '\`*_{}[]()>#+-.!';
-	var $escape_chars_re;
-
-	# Change to ">" for HTML output.
-	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
-	var $tab_width = MARKDOWN_TAB_WIDTH;
-	
-	# Change to `true` to disallow markup or entities.
-	var $no_markup = false;
-	var $no_entities = false;
-	
-	# Predefined urls and titles for reference links and images.
-	var $predef_urls = array();
-	var $predef_titles = array();
-
-
-	function Markdown_Parser() {
-	#
-	# Constructor function. Initialize appropriate member variables.
-	#
-		$this->_initDetab();
-		$this->prepareItalicsAndBold();
-	
-		$this->nested_brackets_re = 
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-			str_repeat('\])*', $this->nested_brackets_depth);
-	
-		$this->nested_url_parenthesis_re = 
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
-		
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
-		
-		# Sort document, block, and span gamut in ascendent priority order.
-		asort($this->document_gamut);
-		asort($this->block_gamut);
-		asort($this->span_gamut);
-	}
-
-
-	# Internal hashes used during transformation.
-	var $urls = array();
-	var $titles = array();
-	var $html_hashes = array();
-	
-	# Status flag to avoid invalid nesting.
-	var $in_anchor = false;
-	
-	
-	function setup() {
-	#
-	# Called before the transformation process starts to setup parser 
-	# states.
-	#
-		# Clear global hashes.
-		$this->urls = $this->predef_urls;
-		$this->titles = $this->predef_titles;
-		$this->html_hashes = array();
-		
-		$in_anchor = false;
-	}
-	
-	function teardown() {
-	#
-	# Called after the transformation process to clear any variable 
-	# which may be taking up memory unnecessarly.
-	#
-		$this->urls = array();
-		$this->titles = array();
-		$this->html_hashes = array();
-	}
-
-
-	function transform($text) {
-	#
-	# Main function. Performs some preprocessing on the input text
-	# and pass it through the document gamut.
-	#
-		$this->setup();
-	
-		# Remove UTF-8 BOM and marker character in input, if present.
-		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
-
-		# Standardize line endings:
-		#   DOS to Unix and Mac to Unix
-		$text = preg_replace('{\r\n?}', "\n", $text);
-
-		# Make sure $text ends with a couple of newlines:
-		$text .= "\n\n";
-
-		# Convert all tabs to spaces.
-		$text = $this->detab($text);
-
-		# Turn block-level HTML blocks into hash entries
-		$text = $this->hashHTMLBlocks($text);
-
-		# Strip any lines consisting only of spaces and tabs.
-		# This makes subsequent regexen easier to write, because we can
-		# match consecutive blank lines with /\n+/ instead of something
-		# contorted like /[ ]*\n+/ .
-		$text = preg_replace('/^[ ]+$/m', '', $text);
-
-		# Run document gamut methods.
-		foreach ($this->document_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-		
-		$this->teardown();
-
-		return $text . "\n";
-	}
-	
-	var $document_gamut = array(
-		# Strip link definitions, store in hashes.
-		"stripLinkDefinitions" => 20,
-		
-		"runBasicBlockGamut"   => 30,
-		);
-
-
-	function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
-							  [ ]*
-							  \n?				# maybe *one* newline
-							  [ ]*
-							?			# url = $2
-							  [ ]*
-							  \n?				# maybe one newline
-							  [ ]*
-							(?:
-								(?<=\s)			# lookbehind for whitespace
-								["(]
-								(.*?)			# title = $3
-								[")]
-								[ ]*
-							)?	# title is optional
-							(?:\n+|\Z)
-			}xm',
-			array(&$this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$this->urls[$link_id] = $matches[2];
-		$this->titles[$link_id] =& $matches[3];
-		return ''; # String that will replace the block
-	}
-
-
-	function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
-
-		$less_than_tab = $this->tab_width - 1;
-
-		# Hashify HTML blocks:
-		# We only want to do this for block-level HTML tags, such as headers,
-		# lists, and tables. That's because we still want to wrap 
            s around
-		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-		# phrase emphasis, and spans. The list of tags we're looking for is
-		# hard-coded:
-		#
-		# *  List "a" is made of tags which can be both inline or block-level.
-		#    These will be treated block-level when the start tag is alone on 
-		#    its line, otherwise they're not matched here and will be taken as 
-		#    inline later.
-		# *  List "b" is made of tags which are always block-level;
-		#
-		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|form|fieldset|iframe|math';
-
-		# Regular expression for the content of a block tag.
-		$nested_tags_level = 4;
-		$attr = '
-			(?>				# optional tag attributes
-			  \s			# starts with whitespace
-			  (?>
-				[^>"/]+		# text outside quotes
-			  |
-				/+(?!>)		# slash not followed by ">"
-			  |
-				"[^"]*"		# text inside double quotes (tolerate ">")
-			  |
-				\'[^\']*\'	# text inside single quotes (tolerate ">")
-			  )*
-			)?	
-			';
-		$content =
-			str_repeat('
-				(?>
-				  [^<]+			# content without tag
-				|
-				  <\2			# nested opening tag
-					'.$attr.'	# attributes
-					(?>
-					  />
-					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
-			str_repeat('
-					  	# closing nested tag
-					)
-				  |				
-					<(?!/\2\s*>	# other tags with a different name
-				  )
-				)*',
-				$nested_tags_level);
-		$content2 = str_replace('\2', '\3', $content);
-
-		# First, look for nested blocks, e.g.:
-		# 	
            
-		# 		
            
-		# 		tags for inner block must be indented.
-		# 		
            
-		# 	
            
-		#
-		# The outermost tags must start at the left margin for this to match, and
-		# the inner nested divs must be indented.
-		# We need to do this before the next, more liberal match, because the next
-		# match will start at the first `
            ` and stop at the first `
            `.
-		$text = preg_replace_callback('{(?>
-			(?>
-				(?<=\n\n)		# Starting after a blank line
-				|				# or
-				\A\n?			# the beginning of the doc
-			)
-			(						# save in $1
-
-			  # Match from `\n` to `\n`, handling nested tags 
-			  # in between.
-					
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_b_re.')# start tag = $2
-						'.$attr.'>			# attributes followed by > and \n
-						'.$content.'		# content, support nesting
-										# the matching end tag
-						[ ]*				# trailing spaces/tabs
-						(?=\n+|\Z)	# followed by a newline or end of document
-
-			| # Special version for tags of group a.
-
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_a_re.')# start tag = $3
-						'.$attr.'>[ ]*\n	# attributes followed by >
-						'.$content2.'		# content, support nesting
-										# the matching end tag
-						[ ]*				# trailing spaces/tabs
-						(?=\n+|\Z)	# followed by a newline or end of document
-					
-			| # Special case just for 
            . It was easier to make a special 
-			  # case than to make the other regex more complicated.
-			
-						[ ]{0,'.$less_than_tab.'}
-						<(hr)				# start tag = $2
-						'.$attr.'			# attributes
-						/?>					# the matching end tag
-						[ ]*
-						(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
-			| # Special case for standalone HTML comments:
-			
-					[ ]{0,'.$less_than_tab.'}
-					(?s:
-						
-					)
-					[ ]*
-					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
-			| # PHP and ASP-style processor instructions (
-					)
-					[ ]*
-					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-					
-			)
-			)}Sxmi',
-			array(&$this, '_hashHTMLBlocks_callback'),
-			$text);
-
-		return $text;
-	}
-	function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
-		$key  = $this->hashBlock($text);
-		return "\n\n$key\n\n";
-	}
-	
-	
-	function hashPart($text, $boundary = 'X') {
-	#
-	# Called whenever a tag must be hashed when a function insert an atomic 
-	# element in the text stream. Passing $text to through this function gives
-	# a unique text-token which will be reverted back when calling unhash.
-	#
-	# The $boundary argument specify what character should be used to surround
-	# the token. By convension, "B" is used for block elements that needs not
-	# to be wrapped into paragraph tags at the end, ":" is used for elements
-	# that are word separators and "X" is used in the general case.
-	#
-		# Swap back any tag hash found in $text so we do not have to `unhash`
-		# multiple times at the end.
-		$text = $this->unhash($text);
-		
-		# Then hash the block.
-		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
-		return $key; # String that will replace the tag.
-	}
-
-
-	function hashBlock($text) {
-	#
-	# Shortcut function for hashPart with block-level boundaries.
-	#
-		return $this->hashPart($text, 'B');
-	}
-
-
-	var $block_gamut = array(
-	#
-	# These are all the transformations that form block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		"doHeaders"         => 10,
-		"doHorizontalRules" => 20,
-		
-		"doLists"           => 40,
-		"doCodeBlocks"      => 50,
-		"doBlockQuotes"     => 60,
-		);
-
-	function runBlockGamut($text) {
-	#
-	# Run block gamut tranformations.
-	#
-		# We need to escape raw HTML in Markdown source before doing anything 
-		# else. This need to be done for each block, and not only at the 
-		# begining in the Markdown function since hashed blocks can be part of
-		# list items and could have been indented. Indented blocks would have 
-		# been seen as a code block in a previous pass of hashHTMLBlocks.
-		$text = $this->hashHTMLBlocks($text);
-		
-		return $this->runBasicBlockGamut($text);
-	}
-	
-	function runBasicBlockGamut($text) {
-	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is 
-	# useful when HTML blocks are known to be already hashed, like in the first
-	# whole-document pass.
-	#
-		foreach ($this->block_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-		
-		# Finally form paragraph and restore hashed blocks.
-		$text = $this->formParagraphs($text);
-
-		return $text;
-	}
-	
-	
-	function doHorizontalRules($text) {
-		# Do Horizontal Rules:
-		return preg_replace(
-			'{
-				^[ ]{0,3}	# Leading space
-				([-*_])		# $1: First marker
-				(?>			# Repeated marker group
-					[ ]{0,2}	# Zero, one, or two spaces.
-					\1			# Marker character
-				){2,}		# Group repeated at least twice
-				[ ]*		# Tailing spaces
-				$			# End of line.
-			}mx',
-			"\n".$this->hashBlock("empty_element_suffix")."\n", 
-			$text);
-	}
-
-
-	var $span_gamut = array(
-	#
-	# These are all the transformations that occur *within* block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		# Process character escapes, code spans, and inline HTML
-		# in one shot.
-		"parseSpan"           => -30,
-
-		# Process anchor and image tags. Images must come first,
-		# because ![foo][f] looks like an anchor.
-		"doImages"            =>  10,
-		"doAnchors"           =>  20,
-		
-		# Make links out of things like ``
-		# Must come after doAnchors, because you can use < and >
-		# delimiters in inline links like [this]().
-		"doAutoLinks"         =>  30,
-		"encodeAmpsAndAngles" =>  40,
-
-		"doItalicsAndBold"    =>  50,
-		"doHardBreaks"        =>  60,
-		);
-
-	function runSpanGamut($text) {
-	#
-	# Run span gamut tranformations.
-	#
-		foreach ($this->span_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		return $text;
-	}
-	
-	
-	function doHardBreaks($text) {
-		# Do hard breaks:
-		return preg_replace_callback('/ {2,}\n/', 
-			array(&$this, '_doHardBreaks_callback'), $text);
-	}
-	function _doHardBreaks_callback($matches) {
-		return $this->hashPart("empty_element_suffix\n");
-	}
-
-
-	function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML  tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
-		
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-			)
-			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-			  \(			# literal paren
-				[ ]*
-				(?:
-					<(\S*)>	# href = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
-				)
-				[ ]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# Title = $7
-				  \6		# matching quote
-				  [ ]*	# ignore any spaces/tabs between closing quote and )
-				)?			# title is optional
-			  \)
-			)
-			}xs',
-			array(&$this, '_DoAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link test][1]
-		# or [link test](/foo)
-		#
-//		$text = preg_replace_callback('{
-//			(					# wrap whole match in $1
-//			  \[
-//				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
-//			  \]
-//			)
-//			}xs',
-//			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-		
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeAttribute($url);
-			
-			$result = "titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-		
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$url = $this->encodeAttribute($url);
-
-		$result = "encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-		
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text";
-
-		return $this->hashPart($result);
-	}
-
-
-	function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into  tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-
-			)
-			}xs', 
-			array(&$this, '_doImages_reference_callback'), $text);
-
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-			  \s?			# One optional whitespace character
-			  \(			# literal paren
-				[ ]*
-				(?:
-					<(\S*)>	# src url = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
-				)
-				[ ]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# title = $7
-				  \6		# matching quote
-				  [ ]*
-				)?			# title is optional
-			  \)
-			)
-			}xs',
-			array(&$this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeAttribute($this->urls[$link_id]);
-			$result = "\"$alt_text\"";titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeAttribute($url);
-		$result = "\"$alt_text\"";encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	function doHeaders($text) {
-		# Setext-style headers:
-		#	  Header 1
-		#	  ========
-		#  
-		#	  Header 2
-		#	  --------
-		#
-		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1
-		#	## Header 2
-		#	## Header 2 with closing hashes ##
-		#	...
-		#	###### Header 6
-		#
-		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
-				[ ]*
-				(.+?)		# $2 = Header text
-				[ ]*
-				\#*			# optional closing #\'s (not counted)
-				\n+
-			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	function _doHeaders_callback_setext($matches) {
-		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
-		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
-		$block = "".$this->runSpanGamut($matches[1])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$block = "".$this->runSpanGamut($matches[2])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	function doLists($text) {
-	#
-	# Form HTML ordered (numbered) and unordered (bulleted) lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
-		$markers_relist = array($marker_ul_re, $marker_ol_re);
-
-		foreach ($markers_relist as $marker_re) {
-			# Re-usable pattern to match any entirel ul or ol list:
-			$whole_list_re = '
-				(								# $1 = whole list
-				  (								# $2
-					[ ]{0,'.$less_than_tab.'}
-					('.$marker_re.')			# $3 = first list item marker
-					[ ]+
-				  )
-				  (?s:.+?)
-				  (								# $4
-					  \z
-					|
-					  \n{2,}
-					  (?=\S)
-					  (?!						# Negative lookahead for another list item marker
-						[ ]*
-						'.$marker_re.'[ ]+
-					  )
-				  )
-				)
-			'; // mx
-			
-			# We use a different prefix before nested lists than top-level lists.
-			# See extended comment in _ProcessListItems().
-		
-			if ($this->list_level) {
-				$text = preg_replace_callback('{
-						^
-						'.$whole_list_re.'
-					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
-				$text = preg_replace_callback('{
-						(?:(?<=\n)\n|\A\n?) # Must eat the newline
-						'.$whole_list_re.'
-					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-		}
-
-		return $text;
-	}
-	function _doLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-		
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[3]) ? "ul" : "ol";
-		
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-		
-		$list .= "\n";
-		$result = $this->processListItems($list, $marker_any_re);
-		
-		$result = $this->hashBlock("<$list_type>\n" . $result . "");
-		return "\n". $result ."\n\n";
-	}
-
-	var $list_level = 0;
-
-	function processListItems($list_str, $marker_any_re) {
-	#
-	#	Process the contents of a single ordered or unordered list, splitting it
-	#	into individual list items.
-	#
-		# The $this->list_level global keeps track of when we're inside a list.
-		# Each time we enter a list, we increment it; when we leave a list,
-		# we decrement. If it's zero, we're not in a list anymore.
-		#
-		# We do this because when we're not inside a list, we want to treat
-		# something like this:
-		#
-		#		I recommend upgrading to version
-		#		8. Oops, now this line is treated
-		#		as a sub-list.
-		#
-		# As a single paragraph, despite the fact that the second line starts
-		# with a digit-period-space sequence.
-		#
-		# Whereas when we're inside a list (or sub-list), that line will be
-		# treated as the start of a sub-list. What a kludge, huh? This is
-		# an aspect of Markdown's syntax that's hard to parse perfectly
-		# without resorting to mind-reading. Perhaps the solution is to
-		# change the syntax rules such that sub-lists must start with a
-		# starting cardinal number; e.g. "1." or "a.".
-		
-		$this->list_level++;
-
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		$list_str = preg_replace_callback('{
-			(\n)?							# leading line = $1
-			(^[ ]*)							# leading whitespace = $2
-			('.$marker_any_re.'				# list marker and space = $3
-				(?:[ ]+|(?=\n))	# space only required if item is not empty
-			)
-			((?s:.*?))						# list item text   = $4
-			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
-			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
-			}xm',
-			array(&$this, '_processListItems_callback'), $list_str);
-
-		$this->list_level--;
-		return $list_str;
-	}
-	function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
-
-		if ($leading_line || $tailing_blank_line || 
-			preg_match('/\n{2,}/', $item))
-		{
-			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
-			# Recursion for sub-lists:
-			$item = $this->doLists($this->outdent($item));
-			$item = preg_replace('/\n+$/', '', $item);
-			$item = $this->runSpanGamut($item);
-		}
-
-		return "
          • " . $item . "
            • \n";
-	}
-
-
-	function doCodeBlocks($text) {
-	#
-	#	Process Markdown `
            ` blocks.
-	#
-		$text = preg_replace_callback('{
-				(?:\n\n|\A\n?)
-				(	            # $1 = the code block -- one or more lines, starting with a space/tab
-				  (?>
-					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
-					.*\n+
-				  )+
-				)
-				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
-			}xm',
-			array(&$this, '_doCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
-
-		$codeblock = $this->outdent($codeblock);
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
-		# trim leading newlines and trailing newlines
-		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
-		$codeblock = "
            $codeblock\n
            ";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-
-
-	function makeCodeSpan($code) {
-	#
-	# Create a code span markup for $code. Called from handleSpanToken.
-	#
-		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-		return $this->hashPart("$code");
-	}
-
-
-	var $em_relist = array(
-		''  => '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(?em_relist as $em => $em_re) {
-			foreach ($this->strong_relist as $strong => $strong_re) {
-				# Construct list of allowed token expressions.
-				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
-				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
-				
-				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
-			}
-		}
-	}
-	
-	function doItalicsAndBold($text) {
-		$token_stack = array('');
-		$text_stack = array('');
-		$em = '';
-		$strong = '';
-		$tree_char_em = false;
-		
-		while (1) {
-			#
-			# Get prepared regular expression for seraching emphasis tokens
-			# in current context.
-			#
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
-			
-			#
-			# Each loop iteration seach for the next emphasis token. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
-			
-			if (empty($token)) {
-				# Reached end of text span: empty stack without emitting.
-				# any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
-				}
-				break;
-			}
-			
-			$token_len = strlen($token);
-			if ($tree_char_em) {
-				# Reached closing marker while inside a three-char emphasis.
-				if ($token_len == 3) {
-					# Three-char closing marker, close em and strong.
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "$span";
-					$text_stack[0] .= $this->hashPart($span);
-					$em = '';
-					$strong = '';
-				} else {
-					# Other closing marker: close one em or strong and
-					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
-					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
-					$span = $this->runSpanGamut($span);
-					$span = "<$tag>$span";
-					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; # $$tag stands for $em or $strong
-				}
-				$tree_char_em = false;
-			} else if ($token_len == 3) {
-				if ($em) {
-					# Reached closing marker for both em and strong.
-					# Closing strong marker:
-					for ($i = 0; $i < 2; ++$i) {
-						$shifted_token = array_shift($token_stack);
-						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<$tag>$span";
-						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; # $$tag stands for $em or $strong
-					}
-				} else {
-					# Reached opening three-char emphasis marker. Push on token 
-					# stack; will be handled by the special condition above.
-					$em = $token{0};
-					$strong = "$em$em";
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$tree_char_em = true;
-				}
-			} else if ($token_len == 2) {
-				if ($strong) {
-					# Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
-					}
-					# Closing strong marker:
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "$span";
-					$text_stack[0] .= $this->hashPart($span);
-					$strong = '';
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$strong = $token;
-				}
-			} else {
-				# Here $token_len == 1
-				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
-						# Closing emphasis marker:
-						array_shift($token_stack);
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "$span";
-						$text_stack[0] .= $this->hashPart($span);
-						$em = '';
-					} else {
-						$text_stack[0] .= $token;
-					}
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$em = $token;
-				}
-			}
-		}
-		return $text_stack[0];
-	}
-
-
-	function doBlockQuotes($text) {
-		$text = preg_replace_callback('/
-			  (								# Wrap whole match in $1
-				(?>
-				  ^[ ]*>[ ]?			# ">" at the start of a line
-					.+\n					# rest of the first line
-				  (.+\n)*					# subsequent consecutive lines
-				  \n*						# blanks
-				)+
-			  )
-			/xm',
-			array(&$this, '_doBlockQuotes_callback'), $text);
-
-		return $text;
-	}
-	function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
-		# trim one level of quoting - trim whitespace-only lines
-		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
-
-		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with 
             content, 
-		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*
            .+?
            )}sx', 
-			array(&$this, '_DoBlockQuotes_callback2'), $bq);
-
-		return "\n". $this->hashBlock("
            \n$bq\n
            ")."\n\n";
-	}
-	function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
-		$pre = preg_replace('/^  /m', '', $pre);
-		return $pre;
-	}
-
-
-	function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html 
             tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap 
             tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				# Is a paragraph.
-				$value = $this->runSpanGamut($value);
-				$value = preg_replace('/^([ ]*)/', "
            ", $value);
-				$value .= "
            ";
-				$grafs[$key] = $this->unhash($value);
-			}
-			else {
-				# Is a block.
-				# Modify elements of @grafs in-place...
-				$graf = $value;
-				$block = $this->html_hashes[$graf];
-				$graf = $block;
-//				if (preg_match('{
-//					\A
-//					(							# $1 = 
             tag
-//					  
            ]*
-//					  \b
-//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
-//					  1
-//					  \2
-//					  [^>]*
-//					  >
-//					)
-//					(							# $3 = contents
-//					.*
-//					)
-//					(
            )					# $4 = closing tag
-//					\z
-//					}xs', $block, $matches))
-//				{
-//					list(, $div_open, , $div_content, $div_close) = $matches;
-//
-//					# We can't call Markdown(), because that resets the hash;
-//					# that initialization code should be pulled into its own sub, though.
-//					$div_content = $this->hashHTMLBlocks($div_content);
-//					
-//					# Run document gamut methods on the content.
-//					foreach ($this->document_gamut as $method => $priority) {
-//						$div_content = $this->$method($div_content);
-//					}
-//
-//					$div_open = preg_replace(
-//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
-//
-//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
-//				}
-				$grafs[$key] = $graf;
-			}
-		}
-
-		return implode("\n\n", $grafs);
-	}
-
-
-	function encodeAttribute($text) {
-	#
-	# Encode text for a double-quoted HTML attribute. This function
-	# is *not* suitable for attributes enclosed in single quotes.
-	#
-		$text = $this->encodeAmpsAndAngles($text);
-		$text = str_replace('"', '"', $text);
-		return $text;
-	}
-	
-	
-	function encodeAmpsAndAngles($text) {
-	#
-	# Smart processing for ampersands and angle brackets that need to 
-	# be encoded. Valid character entities are left alone unless the
-	# no-entities mode is set.
-	#
-		if ($this->no_entities) {
-			$text = str_replace('&', '&', $text);
-		} else {
-			# Ampersand-encoding based entirely on Nat Irons's Amputator
-			# MT plugin: 
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
-								'&', $text);;
-		}
-		# Encode remaining <'s
-		$text = str_replace('<', '<', $text);
-
-		return $text;
-	}
-
-
-	function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
-			array(&$this, '_doAutoLinks_url_callback'), $text);
-
-		# Email addresses: 
-		$text = preg_replace_callback('{
-			<
-			(?:mailto:)?
-			(
-				[-.\w\x80-\xFF]+
-				\@
-				[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
-			)
-			>
-			}xi',
-			array(&$this, '_doAutoLinks_email_callback'), $text);
-
-		return $text;
-	}
-	function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeAttribute($matches[1]);
-		$link = "$url";
-		return $this->hashPart($link);
-	}
-	function _doAutoLinks_email_callback($matches) {
-		$address = $matches[1];
-		$link = $this->encodeEmailAddress($address);
-		return $this->hashPart($link);
-	}
-
-
-	function encodeEmailAddress($addr) {
-	#
-	#	Input: an email address, e.g. "foo@example.com"
-	#
-	#	Output: the email address as a mailto link, with each character
-	#		of the address encoded as either a decimal or hex entity, in
-	#		the hopes of foiling most address harvesting spam bots. E.g.:
-	#
-	#	  
            foo@exampl
-	#        e.com
            
-	#
-	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	#   With some optimizations by Milian Wolff.
-	#
-		$addr = "mailto:" . $addr;
-		$chars = preg_split('/(? $char) {
-			$ord = ord($char);
-			# Ignore non-ascii chars.
-			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
-				# roughly 10% raw, 45% hex, 45% dec
-				# '@' *must* be encoded. I insist.
-				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
-			}
-		}
-		
-		$addr = implode('', $chars);
-		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
-		$addr = "$text";
-
-		return $addr;
-	}
-
-
-	function parseSpan($str) {
-	#
-	# Take the string $str and parse it into tokens, hashing embeded HTML,
-	# escaped characters and handling code spans.
-	#
-		$output = '';
-		
-		$span_re = '{
-				(
-					\\\\'.$this->escape_chars_re.'
-				|
-					(?no_markup ? '' : '
-				|
-							# comment
-				|
-					<\?.*?\?> | <%.*?%>		# processing instruction
-				|
-					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
-					(?>
-						\s
-						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
-					)?
-					>
-			').'
-				)
-				}xs';
-
-		while (1) {
-			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			# Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
-			}
-			
-			# Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
-			}
-			else {
-				break;
-			}
-		}
-		
-		return $output;
-	}
-	
-	
-	function handleSpanToken($token, &$str) {
-	#
-	# Handle $token provided by parseSpan by determining its nature and 
-	# returning the corresponding value that should replace it.
-	#
-		switch ($token{0}) {
-			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
-			case "`":
-				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
-					$str, $matches))
-				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
-					return $this->hashPart($codespan);
-				}
-				return $token; // return as text since no ending marker found.
-			default:
-				return $this->hashPart($token);
-		}
-	}
-
-
-	function outdent($text) {
-	#
-	# Remove one level of line-leading tabs or spaces
-	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
-	}
-
-
-	# String length function for detab. `_initDetab` will create a function to 
-	# hanlde UTF-8 if the default function does not exist.
-	var $utf8_strlen = 'mb_strlen';
-	
-	function detab($text) {
-	#
-	# Replace tabs with the appropriate amount of space.
-	#
-		# For each line we separate the line in blocks delemited by
-		# tab characters. Then we reconstruct every line by adding the 
-		# appropriate number of space between each blocks.
-		
-		$text = preg_replace_callback('/^.*\t.*$/m',
-			array(&$this, '_detab_callback'), $text);
-
-		return $text;
-	}
-	function _detab_callback($matches) {
-		$line = $matches[0];
-		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
-		
-		# Split in blocks.
-		$blocks = explode("\t", $line);
-		# Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
-		foreach ($blocks as $block) {
-			# Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width - 
-				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
-		}
-		return $line;
-	}
-	function _initDetab() {
-	#
-	# Check for the availability of the function in the `utf8_strlen` property
-	# (initially `mb_strlen`). If the function is not available, create a 
-	# function that will loosely count the number of UTF-8 characters with a
-	# regular expression.
-	#
-		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
-			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
-			$text, $m);');
-	}
-
-
-	function unhash($text) {
-	#
-	# Swap back in all the tags hashed by _HashHTMLBlocks.
-	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
-			array(&$this, '_unhash_callback'), $text);
-	}
-	function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
-	}
-
-}
-
-
-#
-# Markdown Extra Parser Class
-#
-
-class MarkdownExtra_Parser extends Markdown_Parser {
-
-	# Prefix for footnote ids.
-	var $fn_id_prefix = "";
-	
-	# Optional title attribute for footnote links and backlinks.
-	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
-	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
-	
-	# Optional class attribute for footnote links and backlinks.
-	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
-	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
-	
-	# Predefined abbreviations.
-	var $predef_abbr = array();
-
-
-	function MarkdownExtra_Parser() {
-	#
-	# Constructor function. Initialize the parser object.
-	#
-		# Add extra escapable characters before parent constructor 
-		# initialize the table.
-		$this->escape_chars .= ':|';
-		
-		# Insert extra document, block, and span transformations. 
-		# Parent constructor will do the sorting.
-		$this->document_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"stripFootnotes"     => 15,
-			"stripAbbreviations" => 25,
-			"appendFootnotes"    => 50,
-			);
-		$this->block_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"doTables"           => 15,
-			"doDefLists"         => 45,
-			);
-		$this->span_gamut += array(
-			"doFootnotes"        => 5,
-			"doAbbreviations"    => 70,
-			);
-		
-		parent::Markdown_Parser();
-	}
-	
-	
-	# Extra variables used during extra transformations.
-	var $footnotes = array();
-	var $footnotes_ordered = array();
-	var $abbr_desciptions = array();
-	var $abbr_word_re = '';
-	
-	# Give the current footnote number.
-	var $footnote_counter = 1;
-	
-	
-	function setup() {
-	#
-	# Setting up Extra-specific variables.
-	#
-		parent::setup();
-		
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		$this->footnote_counter = 1;
-		
-		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
-			$this->abbr_word_re .= preg_quote($abbr_word);
-			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		}
-	}
-	
-	function teardown() {
-	#
-	# Clearing Extra-specific variables.
-	#
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		
-		parent::teardown();
-	}
-	
-	
-	### HTML Block Parser ###
-	
-	# Tags that are always treated as block tags:
-	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
-	
-	# Tags treated as block tags only if the opening tag is alone on it's line:
-	var $context_block_tags_re = 'script|noscript|math|ins|del';
-	
-	# Tags where markdown="1" default to span mode:
-	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-	
-	# Tags which must not have their contents modified, no matter where 
-	# they appear:
-	var $clean_tags_re = 'script|math';
-	
-	# Tags that do not need to be closed.
-	var $auto_close_tags_re = 'hr|img';
-	
-
-	function hashHTMLBlocks($text) {
-	#
-	# Hashify HTML Blocks and "clean tags".
-	#
-	# We only want to do this for block-level HTML tags, such as headers,
-	# lists, and tables. That's because we still want to wrap 
            s around
-	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-	# phrase emphasis, and spans. The list of tags we're looking for is
-	# hard-coded.
-	#
-	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
-	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
-	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-	# These two functions are calling each other. It's recursive!
-	#
-		#
-		# Call the HTML-in-Markdown hasher.
-		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-		
-		return $text;
-	}
-	function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
-										$enclosing_tag_re = '', $span = false)
-	{
-	#
-	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-	#
-	# *   $indent is the number of space to be ignored when checking for code 
-	#     blocks. This is important because if we don't take the indent into 
-	#     account, something like this (which looks right) won't work as expected:
-	#
-	#     
            
-	#         
            
-	#         Hello World.  <-- Is this a Markdown code block or text?
-	#         
              <-- Is this a Markdown code block or a real tag?
-	#     
            
-	#
-	#     If you don't like this, just don't indent the tag on which
-	#     you apply the markdown="1" attribute.
-	#
-	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
-	#     tag with that name. Nested tags supported.
-	#
-	# *   If $span is true, text inside must treated as span. So any double 
-	#     newline will be replaced by a single newline so that it does not create 
-	#     paragraphs.
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-
-		# Regex to check for the presense of newlines around a block tag.
-		$newline_before_re = '/(?:^\n?|\n\n)*$/';
-		$newline_after_re = 
-			'{
-				^						# Start of text following the tag.
-				(?>[ ]*)?		# Optional comment.
-				[ ]*\n					# Must be followed by newline.
-			}xs';
-		
-		# Regex to match any tag.
-		$block_tag_re =
-			'{
-				(					# $2: Capture hole tag.
-									# Tag name.
-							'.$this->block_tags_re.'			|
-							'.$this->context_block_tags_re.'	|
-							'.$this->clean_tags_re.'        	|
-							(?!\s)'.$enclosing_tag_re.'
-						)
-						(?:
-							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
-							(?>
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-						# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-						# CData Block
-				|
-					# Code span marker
-					`+
-				'. ( !$span ? ' # If not in span.
-				|
-					# Indented code block
-					(?> ^[ ]*\n? | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
-					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
-					)*
-				|
-					# Fenced code block marker
-					(?> ^ | \n )
-					[ ]{'.($indent).'}~~~+[ ]*\n
-				' : '' ). ' # End (if not is span).
-				)
-			}xs';
-
-		
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
-
-		#
-		# Loop through every tag until we find the closing tag of the parent
-		# or loop until reaching the end of text if no parent tag specified.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($block_tag_re, $text, 2, 
-								PREG_SPLIT_DELIM_CAPTURE);
-			
-			# If in Markdown span mode, add a empty-string span-level hash 
-			# after each newline to prevent triggering any block element.
-			if ($span) {
-				$void = $this->hashPart("", ':');
-				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-			}
-			
-			$parsed .= $parts[0]; # Text before current tag.
-			
-			# If end of $text has been reached. Stop loop.
-			if (count($parts) < 3) {
-				$text = "";
-				break;
-			}
-			
-			$tag  = $parts[1]; # Tag to handle.
-			$text = $parts[2]; # Remaining text after current tag.
-			$tag_re = preg_quote($tag); # For use in a regular expression.
-			
-			#
-			# Check for: Code span marker
-			#
-			if ($tag{0} == "`") {
-				# Find corresponding end marker.
-				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?.*\n)+?'.$tag_re.' *\n}', $text, 
-						$matches)) 
-					{
-						# End marker found: pass text unchanged until marker.
-						$parsed .= $tag . $matches[0];
-						$text = substr($text, strlen($matches[0]));
-					}
-					else {
-						# No end marker: just skip it.
-						$parsed .= $tag;
-					}
-				}
-			}
-			#
-			# Check for: Opening Block level tag or
-			#            Opening Context Block tag (like ins and del) 
-			#               used as a block tag (tag is alone on it's line).
-			#
-			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
-					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
-				)
-			{
-				# Need to parse tag and following text using the HTML parser.
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-				
-				# Make sure it stays outside of any paragraph by adding newlines.
-				$parsed .= "\n\n$block_text\n\n";
-			}
-			#
-			# Check for: Clean tag (like script, math)
-			#            HTML Comments, processing instructions.
-			#
-			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Need to parse tag and following text using the HTML parser.
-				# (don't check for markdown attribute)
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-				
-				$parsed .= $block_text;
-			}
-			#
-			# Check for: Tag with same name as enclosing tag.
-			#
-			else if ($enclosing_tag_re !== '' &&
-				# Same name as enclosing tag.
-				preg_match('{^= 0);
-		
-		return array($parsed, $text);
-	}
-	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-	#
-	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-	#
-	# *   Calls $hash_method to convert any blocks.
-	# *   Stops when the first opening tag closes.
-	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-	#     (it is not inside clean tags)
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-		
-		# Regex to match `markdown` attribute inside of a tag.
-		$markdown_attr_re = '
-			{
-				\s*			# Eat whitespace before the `markdown` attribute
-				markdown
-				\s*=\s*
-				(?>
-					(["\'])		# $1: quote delimiter		
-					(.*?)		# $2: attribute value
-					\1			# matching delimiter	
-				|
-					([^\s>]*)	# $3: unquoted attribute value
-				)
-				()				# $4: make $3 always defined (avoid warnings)
-			}xs';
-		
-		# Regex to match any tag.
-		$tag_re = '{
-				(					# $2: Capture hole tag.
-					
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-						# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-						# CData Block
-				)
-			}xs';
-		
-		$original_text = $text;		# Save original text in case of faliure.
-		
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
-
-		#
-		# Get the name of the starting tag.
-		# (This pattern makes $base_tag_name_re safe without quoting.)
-		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
-
-		#
-		# Loop through every tag until we find the corresponding closing tag.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			if (count($parts) < 3) {
-				#
-				# End of $text reached with unbalenced tag(s).
-				# In that case, we return original text unchanged and pass the
-				# first character as filtered to prevent an infinite loop in the 
-				# parent function.
-				#
-				return array($original_text{0}, substr($original_text, 1));
-			}
-			
-			$block_text .= $parts[0]; # Text before current tag.
-			$tag         = $parts[1]; # Tag to handle.
-			$text        = $parts[2]; # Remaining text after current tag.
-			
-			#
-			# Check for: Auto-close tag (like 
            )
-			#			 Comments and Processing Instructions.
-			#
-			if (preg_match('{^auto_close_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Just add the tag to the block as if it was text.
-				$block_text .= $tag;
-			}
-			else {
-				#
-				# Increase/decrease nested tag count. Only do so if
-				# the tag's name match base tag's.
-				#
-				if (preg_match('{^mode = $attr_m[2] . $attr_m[3];
-					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-					
-					# Calculate indent before tag.
-					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-						$strlen = $this->utf8_strlen;
-						$indent = $strlen($matches[1], 'UTF-8');
-					} else {
-						$indent = 0;
-					}
-					
-					# End preceding block with this tag.
-					$block_text .= $tag;
-					$parsed .= $this->$hash_method($block_text);
-					
-					# Get enclosing tag name for the ParseMarkdown function.
-					# (This pattern makes $tag_name_re safe without quoting.)
-					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
-					$tag_name_re = $matches[1];
-					
-					# Parse the content using the HTML-in-Markdown parser.
-					list ($block_text, $text)
-						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
-							$tag_name_re, $span_mode);
-					
-					# Outdent markdown text.
-					if ($indent > 0) {
-						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
-													$block_text);
-					}
-					
-					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
-					
-					# Start over a new block.
-					$block_text = "";
-				}
-				else $block_text .= $tag;
-			}
-			
-		} while ($depth > 0);
-		
-		#
-		# Hash last block text that wasn't processed inside the loop.
-		#
-		$parsed .= $this->$hash_method($block_text);
-		
-		return array($parsed, $text);
-	}
-
-
-	function hashClean($text) {
-	#
-	# Called whenever a tag must be hashed when a function insert a "clean" tag
-	# in $text, it pass through this function and is automaticaly escaped, 
-	# blocking invalid nested overlap.
-	#
-		return $this->hashPart($text, 'C');
-	}
-
-
-	function doHeaders($text) {
-	#
-	# Redefined to add id attribute support.
-	#
-		# Setext-style headers:
-		#	  Header 1  {#header1}
-		#	  ========
-		#  
-		#	  Header 2  {#header2}
-		#	  --------
-		#
-		$text = preg_replace_callback(
-			'{
-				(^.+?)								# $1: Header text
-				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
-				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
-			}mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1        {#header1}
-		#	## Header 2       {#header2}
-		#	## Header 2 with closing hashes ##  {#header3}
-		#	...
-		#	###### Header 6   {#header2}
-		#
-		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
-				[ ]*
-				(.+?)		# $2 = Header text
-				[ ]*
-				\#*			# optional closing #\'s (not counted)
-				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
-				[ ]*
-				\n+
-			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	function _doHeaders_attr($attr) {
-		if (empty($attr))  return "";
-		return " id=\"$attr\"";
-	}
-	function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
-		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
-		$block = "".$this->runSpanGamut($matches[1])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
-		$block = "".$this->runSpanGamut($matches[2])."";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	function doTables($text) {
-	#
-	# Form HTML tables.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		#
-		# Find tables with leading pipe.
-		#
-		#	| Header 1 | Header 2
-		#	| -------- | --------
-		#	| Cell 1   | Cell 2
-		#	| Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|]							# Optional leading pipe (present)
-				(.+) \n						# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						[ ]*				# Allowed whitespace.
-						[|] .* \n			# Row content.
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array(&$this, '_doTable_leadingPipe_callback'), $text);
-		
-		#
-		# Find tables without leading pipe.
-		#
-		#	Header 1 | Header 2
-		#	-------- | --------
-		#	Cell 1   | Cell 2
-		#	Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						.* [|] .* \n		# Row content
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array(&$this, '_DoTable_callback'), $text);
-
-		return $text;
-	}
-	function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-		
-		# Remove leading pipe for each row.
-		$content	= preg_replace('/^ *[|]/m', '', $content);
-		
-		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-	}
-	function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
-		
-		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
-		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
-			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
-			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
-			else									$attr[$n] = '';
-		}
-		
-		# Parsing span elements, including code spans, character escapes, 
-		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		
-		# Write column headers.
-		$text = "\n";
-		$text .= "\n";
-		$text .= "\n";
-		foreach ($headers as $n => $header)
-			$text .= "  ".$this->runSpanGamut(trim($header))."\n";
-		$text .= "\n";
-		$text .= "\n";
-		
-		# Split content by row.
-		$rows = explode("\n", trim($content, "\n"));
-		
-		$text .= "\n";
-		foreach ($rows as $row) {
-			# Parsing span elements, including code spans, character escapes, 
-			# and inline HTML tags, so that pipes inside those gets ignored.
-			$row = $this->parseSpan($row);
-			
-			# Split row by cell.
-			$row_cells = preg_split('/ *[|] */', $row, $col_count);
-			$row_cells = array_pad($row_cells, $col_count, '');
-			
-			$text .= "\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  ".$this->runSpanGamut(trim($cell))."\n";
-			$text .= "\n";
-		}
-		$text .= "\n";
-		$text .= "
            ";
-		
-		return $this->hashBlock($text) . "\n";
-	}
-
-	
-	function doDefLists($text) {
-	#
-	# Form HTML definition lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable pattern to match any entire dl list:
-		$whole_list_re = '(?>
-			(								# $1 = whole list
-			  (								# $2
-				[ ]{0,'.$less_than_tab.'}
-				((?>.*\S.*\n)+)				# $3 = defined term
-				\n?
-				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-			  )
-			  (?s:.+?)
-			  (								# $4
-				  \z
-				|
-				  \n{2,}
-				  (?=\S)
-				  (?!						# Negative lookahead for another term
-					[ ]{0,'.$less_than_tab.'}
-					(?: \S.*\n )+?			# defined term
-					\n?
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-				  (?!						# Negative lookahead for another definition
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-			  )
-			)
-		)'; // mx
-
-		$text = preg_replace_callback('{
-				(?>\A\n?|(?<=\n\n))
-				'.$whole_list_re.'
-			}mx',
-			array(&$this, '_doDefLists_callback'), $text);
-
-		return $text;
-	}
-	function _doDefLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$list = $matches[1];
-		
-		# Turn double returns into triple returns, so that we can make a
-		# paragraph for the last item in a list, if necessary:
-		$result = trim($this->processDefListItems($list));
-		$result = "
            \n" . $result . "\n
            ";
-		return $this->hashBlock($result) . "\n\n";
-	}
-
-
-	function processDefListItems($list_str) {
-	#
-	#	Process the contents of a single definition list, splitting it
-	#	into individual term and definition list items.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		# Process definition terms.
-		$list_str = preg_replace_callback('{
-			(?>\A\n?|\n\n+)					# leading line
-			(								# definition terms = $1
-				[ ]{0,'.$less_than_tab.'}	# leading whitespace
-				(?![:][ ]|[ ])				# negative lookahead for a definition 
-											#   mark (colon) or more whitespace.
-				(?> \S.* \n)+?				# actual term (not whitespace).	
-			)			
-			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
-											#   with a definition mark.
-			}xm',
-			array(&$this, '_processDefListItems_callback_dt'), $list_str);
-
-		# Process actual definitions.
-		$list_str = preg_replace_callback('{
-			\n(\n+)?						# leading line = $1
-			(								# marker space = $2
-				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
-				[:][ ]+						# definition mark (colon)
-			)
-			((?s:.+?))						# definition text = $3
-			(?= \n+ 						# stop at next definition mark,
-				(?:							# next term or end of text
-					[ ]{0,'.$less_than_tab.'} [:][ ]	|
-					
             | \z
-				)						
-			)					
-			}xm',
-			array(&$this, '_processDefListItems_callback_dd'), $list_str);
-
-		return $list_str;
-	}
-	function _processDefListItems_callback_dt($matches) {
-		$terms = explode("\n", trim($matches[1]));
-		$text = '';
-		foreach ($terms as $term) {
-			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n
            " . $term . "
            ";
-		}
-		return $text . "\n";
-	}
-	function _processDefListItems_callback_dd($matches) {
-		$leading_line	= $matches[1];
-		$marker_space	= $matches[2];
-		$def			= $matches[3];
-
-		if ($leading_line || preg_match('/\n{2,}/', $def)) {
-			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
-		}
-		else {
-			$def = rtrim($def);
-			$def = $this->runSpanGamut($this->outdent($def));
-		}
-
-		return "\n
            " . $def . "
            \n";
-	}
-
-
-	function doFencedCodeBlocks($text) {
-	#
-	# Adding the fenced code block syntax to regular Markdown:
-	#
-	# ~~~
-	# Code block
-	# ~~~
-	#
-		$less_than_tab = $this->tab_width;
-		
-		$text = preg_replace_callback('{
-				(?:\n|\A)
-				# 1: Opening marker
-				(
-					~{3,} # Marker: three tilde or more.
-				)
-				[ ]* \n # Whitespace and newline following marker.
-				
-				# 2: Content
-				(
-					(?>
-						(?!\1 [ ]* \n)	# Not a closing marker.
-						.*\n+
-					)+
-				)
-				
-				# Closing marker.
-				\1 [ ]* \n
-			}xm',
-			array(&$this, '_doFencedCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	function _doFencedCodeBlocks_callback($matches) {
-		$codeblock = $matches[2];
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		$codeblock = preg_replace_callback('/^\n+/',
-			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
-		$codeblock = "
            $codeblock
            ";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-	function _doFencedCodeBlocks_newlines($matches) {
-		return str_repeat("empty_element_suffix", 
-			strlen($matches[0]));
-	}
-
-
-	#
-	# Redefining emphasis markers so that emphasis by underscore does not
-	# work in the middle of a word.
-	#
-	var $em_relist = array(
-		''  => '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? '(?:(? '(?<=\S)(? '(?<=\S)(? tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-		
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap 
             tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			$value = trim($this->runSpanGamut($value));
-			
-			# Check if this should be enclosed in a paragraph.
-			# Clean tag hashes & block tag hashes are left alone.
-			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-			
-			if ($is_p) {
-				$value = "
            $value
            ";
-			}
-			$grafs[$key] = $value;
-		}
-		
-		# Join grafs in one text, then unhash HTML tags. 
-		$text = implode("\n\n", $grafs);
-		
-		# Finish by removing any tag hashes still present in $text.
-		$text = $this->unhash($text);
-		
-		return $text;
-	}
-	
-	
-	### Footnotes
-	
-	function stripFootnotes($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [^id]: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
-			  [ ]*
-			  \n?					# maybe *one* newline
-			(						# text = $2 (no blank lines allowed)
-				(?:					
-					.+				# actual text
-				|
-					\n				# newlines but 
-					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
-					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
-									# by non-indented content
-				)*
-			)		
-			}xm',
-			array(&$this, '_stripFootnotes_callback'),
-			$text);
-		return $text;
-	}
-	function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
-		$this->footnotes[$note_id] = $this->outdent($matches[2]);
-		return ''; # String that will replace the block
-	}
-
-
-	function doFootnotes($text) {
-	#
-	# Replace footnote references in $text [^id] with a special text-token 
-	# which will be replaced by the actual footnote marker in appendFootnotes.
-	#
-		if (!$this->in_anchor) {
-			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-		}
-		return $text;
-	}
-
-	
-	function appendFootnotes($text) {
-	#
-	# Append footnote list to text.
-	#
-		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-			array(&$this, '_appendFootnotes_callback'), $text);
-	
-		if (!empty($this->footnotes_ordered)) {
-			$text .= "\n\n";
-			$text .= "
            \n";
-			$text .= "fn_backlink_class != "") {
-				$class = $this->fn_backlink_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_backlink_title != "") {
-				$title = $this->fn_backlink_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			$num = 0;
-			
-			while (!empty($this->footnotes_ordered)) {
-				$footnote = reset($this->footnotes_ordered);
-				$note_id = key($this->footnotes_ordered);
-				unset($this->footnotes_ordered[$note_id]);
-				
-				$footnote .= "\n"; # Need to append newline before parsing.
-				$footnote = $this->runBlockGamut("$footnote\n");				
-				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-					array(&$this, '_appendFootnotes_callback'), $footnote);
-				
-				$attr = str_replace("%%", ++$num, $attr);
-				$note_id = $this->encodeAttribute($note_id);
-				
-				# Add backlink to last paragraph; create new paragraph if needed.
-				$backlink = "↩";
-				if (preg_match('{
            $}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . " $backlink
            ";
-				} else {
-					$footnote .= "\n\n
            $backlink
            ";
-				}
-				
-				$text .= "
          • \n";
-				$text .= $footnote . "\n";
-				$text .= "
            • \n\n";
-			}
-			
-			$text .= "\n";
-			$text .= "
            ";
-		}
-		return $text;
-	}
-	function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
-		
-		# Create footnote marker only if it has a corresponding footnote *and*
-		# the footnote hasn't been used by another marker.
-		if (isset($this->footnotes[$node_id])) {
-			# Transfert footnote content to the ordered list.
-			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-			unset($this->footnotes[$node_id]);
-			
-			$num = $this->footnote_counter++;
-			$attr = " rel=\"footnote\"";
-			if ($this->fn_link_class != "") {
-				$class = $this->fn_link_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_link_title != "") {
-				$title = $this->fn_link_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			
-			$attr = str_replace("%%", $num, $attr);
-			$node_id = $this->encodeAttribute($node_id);
-			
-			return
-				"".
-				"$num".
-				"";
-		}
-		
-		return "[^".$matches[1]."]";
-	}
-		
-	
-	### Abbreviations ###
-	
-	function stripAbbreviations($text) {
-	#
-	# Strips abbreviations from text, stores titles in hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [id]*: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
-			(.*)					# text = $2 (no blank lines allowed)	
-			}xm',
-			array(&$this, '_stripAbbreviations_callback'),
-			$text);
-		return $text;
-	}
-	function _stripAbbreviations_callback($matches) {
-		$abbr_word = $matches[1];
-		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
-		$this->abbr_word_re .= preg_quote($abbr_word);
-		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		return ''; # String that will replace the block
-	}
-	
-	
-	function doAbbreviations($text) {
-	#
-	# Find defined abbreviations in text and wrap them in  elements.
-	#
-		if ($this->abbr_word_re) {
-			// cannot use the /x modifier because abbr_word_re may 
-			// contain significant spaces:
-			$text = preg_replace_callback('{'.
-				'(?abbr_word_re.')'.
-				'(?![\w\x1A])'.
-				'}', 
-				array(&$this, '_doAbbreviations_callback'), $text);
-		}
-		return $text;
-	}
-	function _doAbbreviations_callback($matches) {
-		$abbr = $matches[0];
-		if (isset($this->abbr_desciptions[$abbr])) {
-			$desc = $this->abbr_desciptions[$abbr];
-			if (empty($desc)) {
-				return $this->hashPart("$abbr");
-			} else {
-				$desc = $this->encodeAttribute($desc);
-				return $this->hashPart("$abbr");
-			}
-		} else {
-			return $matches[0];
-		}
-	}
-
-}
-
-
-/*
-
-PHP Markdown Extra
-==================
-
-Description
------------
-
-This is a PHP port of the original Markdown formatter written in Perl 
-by John Gruber. This special "Extra" version of PHP Markdown features 
-further enhancements to the syntax for making additional constructs 
-such as tables and definition list.
-
-Markdown is a text-to-HTML filter; it translates an easy-to-read /
-easy-to-write structured text format into HTML. Markdown's text format
-is most similar to that of plain text email, and supports features such
-as headers, *emphasis*, code blocks, blockquotes, and links.
-
-Markdown's syntax is designed not as a generic markup language, but
-specifically to serve as a front-end to (X)HTML. You can use span-level
-HTML tags anywhere in a Markdown document, and you can use block level
-HTML tags (like 
             and  as well).
-
-For more information about Markdown's syntax, see:
-
-
-
-
-Bugs
-----
-
-To file bug reports please send email to:
-
-
-
-Please include with your report: (1) the example input; (2) the output you
-expected; (3) the output Markdown actually produced.
-
-
-Version History
---------------- 
-
-See the readme file for detailed release notes for this version.
-
-
-Copyright and License
----------------------
-
-PHP Markdown & Extra
-Copyright (c) 2004-2008 Michel Fortin  
-  
-All rights reserved.
-
-Based on Markdown  
-Copyright (c) 2003-2006 John Gruber   
-   
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-*	Redistributions of source code must retain the above copyright notice,
-	this list of conditions and the following disclaimer.
-
-*	Redistributions in binary form must reproduce the above copyright
-	notice, this list of conditions and the following disclaimer in the
-	documentation and/or other materials provided with the distribution.
-
-*	Neither the name "Markdown" nor the names of its contributors may
-	be used to endorse or promote products derived from this software
-	without specific prior written permission.
-
-This software is provided by the copyright holders and contributors "as
-is" and any express or implied warranties, including, but not limited
-to, the implied warranties of merchantability and fitness for a
-particular purpose are disclaimed. In no event shall the copyright owner
-or contributors be liable for any direct, indirect, incidental, special,
-exemplary, or consequential damages (including, but not limited to,
-procurement of substitute goods or services; loss of use, data, or
-profits; or business interruption) however caused and on any theory of
-liability, whether in contract, strict liability, or tort (including
-negligence or otherwise) arising in any way out of the use of this
-software, even if advised of the possibility of such damage.
-
-*/
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 8b9a02084a8205fce67860c98ed4ab72b1156a0c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Mon, 21 Dec 2009 21:27:43 -0800
Subject: Updates for the latest version of Kohana 2.4: 1) Controller::$input
 is gone -- use Input::instance() now 2) Handle new
 'database..connection.params' parameter 3) Handle new
 'cache..prefix' parameter

---
 installer/database_config.php                       |  3 ++-
 modules/digibug/controllers/digibug.php             |  2 +-
 modules/gallery/config/cache.php                    |  3 ++-
 modules/gallery/controllers/admin_dashboard.php     |  2 +-
 modules/gallery/controllers/admin_identity.php      |  4 ++--
 modules/gallery/controllers/admin_languages.php     |  7 ++++---
 modules/gallery/controllers/admin_modules.php       |  2 +-
 modules/gallery/controllers/admin_sidebar.php       |  2 +-
 modules/gallery/controllers/albums.php              | 14 ++++++++------
 modules/gallery/controllers/file_proxy.php          |  2 +-
 modules/gallery/controllers/logout.php              |  2 +-
 modules/gallery/controllers/move.php                |  2 +-
 modules/gallery/libraries/MY_Database.php           | 14 ++++++++++++++
 modules/organize/controllers/organize.php           |  4 ++--
 modules/rss/controllers/rss.php                     |  4 ++--
 modules/search/controllers/search.php               |  4 ++--
 modules/server_add/controllers/admin_server_add.php |  4 ++--
 modules/server_add/controllers/server_add.php       |  2 +-
 modules/tag/controllers/admin_tags.php              |  2 +-
 modules/tag/controllers/tags.php                    |  6 +++---
 20 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/installer/database_config.php b/installer/database_config.php
index 8abf35e7..a5dc8865 100644
--- a/installer/database_config.php
+++ b/installer/database_config.php
@@ -35,7 +35,8 @@ $config['default'] = array(
     'host'     => '',
     'port'     => '' false,
     'socket'   => false,
-    'database' => ''
+    'database' => '',
+    'params'   => null,
   ),
   'character_set' => 'utf8',
   'table_prefix'  => '',
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index d070727d..a23d2863 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -59,7 +59,7 @@ class Digibug_Controller extends Controller {
     // If its a request for the full size then make sure we are coming from an
     // authorized address
     if ($type == "full") {
-      $remote_addr = ip2long($this->input->server("REMOTE_ADDR"));
+      $remote_addr = ip2long(Input::instance()->server("REMOTE_ADDR"));
       if ($remote_addr === false) {
         throw new Kohana_404_Exception();
       }
diff --git a/modules/gallery/config/cache.php b/modules/gallery/config/cache.php
index cc3ac87d..d9a27c96 100644
--- a/modules/gallery/config/cache.php
+++ b/modules/gallery/config/cache.php
@@ -45,5 +45,6 @@ $config["default"] = array (
   "driver"   => "database",
   "params"   => null,
   "lifetime" => 84600,
-  "requests" => 1000
+  "requests" => 1000,
+  "prefix"   => null,
 );
diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index 7e28f625..5f2cb41d 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -86,7 +86,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
 
     foreach (array("dashboard_sidebar", "dashboard_center") as $location) {
       $new_blocks = array();
-      foreach ($this->input->get($location, array()) as $id) {
+      foreach (Input::instance()->get($location, array()) as $id) {
         $new_blocks[$id] = $active_set[$id];
       }
       block_manager::set_active($location, $new_blocks);
diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index acf71665..354e6c0c 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -30,7 +30,7 @@ class Admin_Identity_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $v = new View("admin_identity_confirm.html");
-    $v->new_provider = $this->input->post("provider");
+    $v->new_provider = Input::instance()->post("provider");
 
     print $v;
   }
@@ -40,7 +40,7 @@ class Admin_Identity_Controller extends Admin_Controller {
 
     $active_provider = module::get_var("gallery", "identity_provider", "user");
     $providers = identity::providers();
-    $new_provider = $this->input->post("provider");
+    $new_provider = Input::instance()->post("provider");
 
     if ($new_provider != $active_provider) {
 
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 27537c7f..41523023 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -36,10 +36,11 @@ class Admin_Languages_Controller extends Admin_Controller {
   public function save() {
     access::verify_csrf();
 
-    locales::update_installed($this->input->post("installed_locales"));
+    $input = Input::instance();
+    locales::update_installed($input->post("installed_locales"));
 
     $installed_locales = array_keys(locales::installed());
-    $new_default_locale = $this->input->post("default_locale");
+    $new_default_locale = $input->post("default_locale");
     if (!in_array($new_default_locale, $installed_locales)) {
       if (!empty($installed_locales)) {
         $new_default_locale = $installed_locales[0];
@@ -61,7 +62,7 @@ class Admin_Languages_Controller extends Admin_Controller {
       return $this->index($form);
     }
 
-    if ($this->input->post("share")) {
+    if (Input::instance()->post("share")) {
       l10n_client::submit_translations();
       message::success(t("Translations submitted"));
     } else {
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index af6dbbdc..549718e7 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -37,7 +37,7 @@ class Admin_Modules_Controller extends Admin_Controller {
         continue;
       }
 
-      $desired = $this->input->post($module_name) == 1;
+      $desired = Input::instance()->post($module_name) == 1;
       if ($info->active && !$desired && module::is_active($module_name)) {
         $changes->deactivate[] = $module_name;
         $deactivated_names[] = t($info->name);
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index 77e83bc2..4c55bf89 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -34,7 +34,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
     $available_blocks = block_manager::get_available_site_blocks();
 
     $active_blocks = array();
-    foreach ($this->input->get("block", array()) as $block_id) {
+    foreach (Input::instance()->get("block", array()) as $block_id) {
       $active_blocks[md5($block_id)] = explode(":", (string) $block_id);
     }
     block_manager::set_active("site_sidebar", $active_blocks);
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 319f1416..2134a419 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -42,7 +42,8 @@ class Albums_Controller extends Items_Controller {
       }
     }
 
-    $show = $this->input->get("show");
+    $input = Input::instance();
+    $show = $input->get("show");
 
     if ($show) {
       $child = ORM::factory("item", $show);
@@ -57,7 +58,7 @@ class Albums_Controller extends Items_Controller {
       }
     }
 
-    $page = $this->input->get("page", "1");
+    $page = $input->get("page", "1");
     $children_count = $album->viewable()->children_count();
     $offset = ($page - 1) * $page_size;
     $max_pages = max(ceil($children_count / $page_size), 1);
@@ -94,15 +95,16 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("add", $album);
 
+    $input = Input::instance();
     $form = album::get_add_form($album);
     if ($form->validate()) {
       $new_album = album::create(
         $album,
-        $this->input->post("name"),
-        $this->input->post("title", $this->input->post("name")),
-        $this->input->post("description"),
+        $input->post("name"),
+        $input->post("title", $input->post("name")),
+        $input->post("description"),
         identity::active_user()->id,
-        $this->input->post("slug"));
+        $input->post("slug"));
 
       log::success("content", "Created an album",
                    html::anchor("albums/$new_album->id", "view album"));
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 8c46de08..6a80ad85 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -29,7 +29,7 @@
 class File_Proxy_Controller extends Controller {
   public function __call($function, $args) {
     // request_uri: http://example.com/gallery3/var/trunk/albums/foo/bar.jpg
-    $request_uri = $this->input->server("REQUEST_URI");
+    $request_uri = Input::instance()->server("REQUEST_URI");
     $request_uri = preg_replace("/\?.*/", "", $request_uri);
 
     // var_uri: http://example.com/gallery3/var/
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
index 2b93655d..fe9c48ba 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -20,7 +20,7 @@
 class Logout_Controller extends Controller {
   public function index() {
     auth::logout();
-    if ($continue_url = $this->input->get("continue")) {
+    if ($continue_url = Input::instance()->get("continue")) {
       $item = url::get_item_from_uri($continue_url);
       if (access::can("view", $item)) {
         // Don't use url::redirect() because it'll call url::site() and munge the continue url.
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 863b13bb..14513fdc 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -32,7 +32,7 @@ class Move_Controller extends Controller {
   public function save($source_id) {
     access::verify_csrf();
     $source = ORM::factory("item", $source_id);
-    $target = ORM::factory("item", $this->input->post("target_id"));
+    $target = ORM::factory("item", Input::instance()->post("target_id"));
 
     access::required("view", $source);
     access::required("edit", $source);
diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index a8f4bc08..de3e5a84 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -20,6 +20,20 @@
 abstract class Database extends Database_Core {
   protected $_table_names;
 
+  /**
+   * Kohana 2.4 introduces a new connection parameter.  If it's not specified, make sure that we
+   * define it here to avoid an error later on.
+   *
+   * @todo: add an upgrade path to modify var/database.php so that we can avoid doing this at
+   *        runtime.
+   */
+  protected function __construct(array $config) {
+    if (!isset($config["connection"]["params"])) {
+      $config["connection"]["params"] = null;
+    }
+    parent::__construct($config);
+  }
+
   /**
    * Parse the query string and convert any strings of the form `\([a-zA-Z0-9_]*?)\]
    * table prefix . $1
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 08c80de3..03dea13d 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -48,7 +48,7 @@ class Organize_Controller extends Controller {
     access::required("view", $target_album);
     access::required("add", $target_album);
 
-    foreach ($this->input->post("source_ids") as $source_id) {
+    foreach (Input::instance()->post("source_ids") as $source_id) {
       $source = ORM::factory("item", $source_id);
       if (!$source->contains($target_album)) {
         access::required("edit", $source);
@@ -69,7 +69,7 @@ class Organize_Controller extends Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    $source_ids = $this->input->post("source_ids", array());
+    $source_ids = Input::instance()->post("source_ids", array());
 
     if ($album->sort_column != "weight") {
       $i = 0;
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index a963a1dc..41c781d9 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -21,13 +21,13 @@ class Rss_Controller extends Controller {
   public static $page_size = 20;
 
   public function feed($module_id, $feed_id, $id=null) {
-    $page = (int) $this->input->get("page", 1);
+    $page = (int) Input::instance()->get("page", 1);
     if ($page < 1) {
       url::redirect(url::merge(array("page" => 1)));
     }
 
     // Configurable page size between 1 and 100, default 20
-    $page_size = max(1, min(100, (int) $this->input->get("page_size", self::$page_size)));
+    $page_size = max(1, min(100, (int) Input::instance()->get("page_size", self::$page_size)));
 
     // Run the appropriate feed callback
     if (module::is_active($module_id)) {
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 2f1aeb76..ea870847 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -20,8 +20,8 @@
 class Search_Controller extends Controller {
   public function index() {
     $page_size = module::get_var("gallery", "page_size", 9);
-    $q = $this->input->get("q");
-    $page = $this->input->get("page", 1);
+    $q = Input::instance()->get("q");
+    $page = Input::instance()->get("page", 1);
     $offset = ($page - 1) * $page_size;
 
     // Make sure that the page references a valid offset
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index f32bb834..17c3f68b 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -58,7 +58,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
   public function remove_path() {
     access::verify_csrf();
 
-    $path = $this->input->get("path");
+    $path = Input::instance()->get("path");
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     if (isset($paths[$path])) {
       unset($paths[$path]);
@@ -71,7 +71,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   public function autocomplete() {
     $directories = array();
-    $path_prefix = $this->input->get("q");
+    $path_prefix = Input::instance()->get("q");
     foreach (glob("{$path_prefix}*") as $file) {
       if (is_dir($file) && !is_link($file)) {
         $directories[] = $file;
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 70ad6ea2..77487673 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -34,7 +34,7 @@ class Server_Add_Controller extends Admin_Controller {
   }
 
   public function children() {
-    $path = $this->input->get("path");
+    $path = Input::instance()->get("path");
 
     $tree = new View("server_add_tree.html");
     $tree->files = array();
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index ed4a0366..a56d4d20 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -19,7 +19,7 @@
  */
 class Admin_Tags_Controller extends Admin_Controller {
   public function index() {
-    $filter = $this->input->get("filter");
+    $filter = Input::instance()->get("filter");
 
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_tags.html");
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index a44f6aa3..992c7411 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,7 @@ class Tags_Controller extends Controller {
   public function show($tag_id) {
     $tag = ORM::factory("tag", $tag_id);
     $page_size = module::get_var("gallery", "page_size", 9);
-    $page = (int) $this->input->get("page", "1");
+    $page = (int) Input::instance()->get("page", "1");
     $children_count = $tag->items_count();
     $offset = ($page-1) * $page_size;
     $max_pages = max(ceil($children_count / $page_size), 1);
@@ -79,8 +79,8 @@ class Tags_Controller extends Controller {
 
   public function autocomplete() {
     $tags = array();
-    $tag_parts = preg_split("#,#", $this->input->get("q"));
-    $limit = $this->input->get("limit");
+    $tag_parts = preg_split("#,#", Input::instance()->get("q"));
+    $limit = Input::instance()->get("limit");
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
       ->where("name", "LIKE", "{$tag_part}%")
-- 
cgit v1.2.3


From 7118f84aa9ae0ece97a41aba4e4d269a1e136df6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 13:32:02 -0800
Subject: ORM::factory() in K24 does not allow you to specify an alternate key
 for lookup.  So instead of doing:   ORM::factory("foo", array("some_key" =>
 "some_value"))

you have to do:
  ORM::factory("foo"->where("some_key", "=" "some_value")->find()
---
 modules/gallery/helpers/l10n_scanner.php | 2 +-
 modules/gallery/helpers/module.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index d76c4d19..bb7cb449 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -42,7 +42,7 @@ class l10n_scanner_Core {
       return $cache[$key];
     }
 
-    $entry = ORM::factory("incoming_translation", array("key" => $key));
+    $entry = ORM::factory("incoming_translation")->where("key", "=", $key)->find();
     if (!$entry->loaded()) {
       $entry->key = $key;
       $entry->message = serialize($message);
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 71c4efa0..6c7078a3 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -51,7 +51,7 @@ class module_Core {
    */
   static function get($module_name) {
     if (empty(self::$modules[$module_name])) {
-      return ORM::factory("module", array("name" => $module_name));
+      return ORM::factory("module")->where("name", "=", $module_name)->find();
     }
     return self::$modules[$module_name];
   }
-- 
cgit v1.2.3


From 0650109d4bb5442cd77fcda61745dab67a632836 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 13:50:52 -0800
Subject: Add merge_or_where() to MY_Datatabase_Builder and use that instead of
 or_where() for compatibility and convenience.  Caught by failing unit tests.

---
 modules/gallery/helpers/item.php                          |  4 ++--
 modules/kohana23_compat/libraries/MY_Database_Builder.php | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index b7be23cd..f6181f8a 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -155,12 +155,12 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        $view_restrictions["items.view_$id"] = access::ALLOW;
+        $view_restrictions[] = array("items.view_$id", "=", access::ALLOW);
       }
     }
 
     if (count($view_restrictions)) {
-      $model->and_open()->or_where($view_restrictions)->close();
+      $model->and_open()->merge_or_where($view_restrictions)->close();
     }
 
     return $model;
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 54a10860..c82b6ac4 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -29,6 +29,17 @@ class Database_Builder extends Database_Builder_Core {
     return $this;
   }
 
+  /**
+   * Merge in a series of where clause tuples and call or_where() on each one.
+   * @chainable
+   */
+  public function merge_or_where($tuples) {
+    foreach ($tuples as $tuple) {
+      $this->or_where($tuple[0], $tuple[1], $tuple[2]);
+    }
+    return $this;
+  }
+
   public function compile() {
     return parent::compile();
   }
-- 
cgit v1.2.3


From ca293db214e2f74471ce7f9d29f65bd629f2f284 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 13:57:49 -0800
Subject: Don't rely on implicit object -> id conversion, that doesn't work
 with K24's Database_Builder::where()

---
 modules/gallery/tests/Access_Helper_Test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 799d5e44..084bfb47 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -131,7 +131,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   public function can_allow_deny_and_reset_intent_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
-    $intent = ORM::factory("access_intent")->where("item_id", "=", $album)->find();
+    $intent = ORM::factory("access_intent")->where("item_id", "=", $album->id)->find();
 
     // Allow
     access::allow(identity::everybody(), "view", $album);
@@ -141,19 +141,19 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::everybody(), "view", $album);
     $this->assert_same(
       access::DENY,
-      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album->id)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
     access::allow(identity::everybody(), "view", $album);
     $this->assert_same(
       access::ALLOW,
-      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album->id)->find()->view_1);
 
     access::reset(identity::everybody(), "view", $album);
     $this->assert_same(
       null,
-      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album->id)->find()->view_1);
   }
 
   public function cant_reset_root_item_test() {
-- 
cgit v1.2.3


From fda4227bb10d7c9ae4de5f16e59890bf7cf3b83b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 14:00:52 -0800
Subject: Latest K24 does not automatically add an id attribute to every form
 element with the same value as the name.  Yay!  That was a weird and
 unexpected behavior.

---
 modules/gallery/tests/DrawForm_Test.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index baded8de..90361d06 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -28,16 +28,16 @@ class DrawForm_Test extends Unit_Test_Case {
     $csrf = access::csrf_token();
     $expected = "
            \n" .
-                "" .
+                "" .
                 "  
              \n" .
                 "  
            • \n" .
                 "    \n" .
-                "    \n" .
                 "  
              • \n" .
                 "  
            • \n" .
                 "    \n" .
-                "    \n" .
                 "  
              • \n" .
                 "  
            • \n" .
@@ -59,18 +59,18 @@ class DrawForm_Test extends Unit_Test_Case {
     $csrf = access::csrf_token();
     $expected = "\n" .
-                "" .
+                "" .
                 "  
              \n" .
                 "    Test Group\n" .
                 "    
                \n" .
                 "      
              • \n" .
                 "        \n" .
-                "        \n" .
                 "      
                • \n" .
                 "      
              • \n" .
                 "        \n" .
-                "        \n" .
                 "      
                • \n" .
                 "      
              • \n" .
@@ -96,18 +96,18 @@ class DrawForm_Test extends Unit_Test_Case {
     $csrf = access::csrf_token();
     $expected = "\n" .
-                "" .
+                "" .
                 "  
                \n" .
                 "    Test Group\n" .
                 "    
                  \n" .
                 "      
                • \n" .
                 "        \n" .
-                "        \n" .
                 "      
                  • \n" .
                 "      
                • \n" .
                 "        \n" .
-                "        \n" .
                 "      
                  • \n" .
                 "      
                • \n" .
-- 
cgit v1.2.3


From b2291a0e34234ee30ea1d80b70122b68a8869917 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 15:13:36 -0800
Subject: Fix preamble issues.  Upstream tickets:
 http://dev.kohanaframework.org/issues/2457
 http://dev.kohanaframework.org/issues/2458

---
 system/messages/core.php               | 2 +-
 system/messages/validation/default.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/messages/core.php b/system/messages/core.php
index 64f897e8..a9595c1a 100644
--- a/system/messages/core.php
+++ b/system/messages/core.php
@@ -1,4 +1,4 @@
- 'The :field field is required',
-- 
cgit v1.2.3


From d711c5b9300a17e7269415573a15e8a63f0d149c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 15:36:36 -0800
Subject: Convert tabs to spaces.  Enough to get the file structure test to
 pass, but not really the Gallery coding convention -- this is a compatibility
 class though.

---
 modules/kohana23_compat/libraries/Pagination.php | 438 +++++++++++------------
 1 file changed, 219 insertions(+), 219 deletions(-)

diff --git a/modules/kohana23_compat/libraries/Pagination.php b/modules/kohana23_compat/libraries/Pagination.php
index 012bc484..2b06f359 100644
--- a/modules/kohana23_compat/libraries/Pagination.php
+++ b/modules/kohana23_compat/libraries/Pagination.php
@@ -29,224 +29,224 @@
  */
 class Pagination_Core {
 
-	// Config values
-	protected $base_url       = '';
-	protected $directory      = 'pagination';
-	protected $style          = 'classic';
-	protected $uri_segment    = 3;
-	protected $query_string   = '';
-	protected $items_per_page = 20;
-	protected $total_items    = 0;
-	protected $auto_hide      = FALSE;
-
-	// Autogenerated values
-	protected $url;
-	protected $current_page;
-	protected $total_pages;
-	protected $current_first_item;
-	protected $current_last_item;
-	protected $first_page;
-	protected $last_page;
-	protected $previous_page;
-	protected $next_page;
-	protected $sql_offset;
-	protected $sql_limit;
-
-	/**
-	 * Constructs and returns a new Pagination object.
-	 *
-	 * @param   array   configuration settings
-	 * @return  object
-	 */
-	public function factory($config = array())
-	{
-		return new Pagination($config);
-	}
-
-	/**
-	 * Constructs a new Pagination object.
-	 *
-	 * @param   array  configuration settings
-	 * @return  void
-	 */
-	public function __construct($config = array())
-	{
-		// No custom group name given
-		if ( ! isset($config['group']))
-		{
-			$config['group'] = 'default';
-		}
-
-		// Pagination setup
-		$this->initialize($config);
-	}
-
-	/**
-	 * Sets config values.
-	 *
-	 * @throws  Kohana_Exception
-	 * @param   array  configuration settings
-	 * @return  void
-	 */
-	public function initialize($config = array())
-	{
-		// Load config group
-		if (isset($config['group']))
-		{
-			// Load and validate config group
-			if ( ! is_array($group_config = Kohana::config('pagination.'.$config['group'])))
-				throw new Kohana_Exception('pagination.undefined_group: ' . $config['group']);
-
-			// All pagination config groups inherit default config group
-			if ($config['group'] !== 'default')
-			{
-				// Load and validate default config group
-				if ( ! is_array($default_config = Kohana::config('pagination.default')))
-					throw new Kohana_Exception('pagination.undefined_group: default');
-
-				// Merge config group with default config group
-				$group_config += $default_config;
-			}
-
-			// Merge custom config items with config group
-			$config += $group_config;
-		}
-
-		// Assign config values to the object
-		foreach ($config as $key => $value)
-		{
-			if (property_exists($this, $key))
-			{
-				$this->$key = $value;
-			}
-		}
-
-		// Clean view directory
-		$this->directory = trim($this->directory, '/').'/';
-
-		// Build generic URL with page in query string
-		if ($this->query_string !== '')
-		{
-			// Extract current page
-			$this->current_page = isset($_GET[$this->query_string]) ? (int) $_GET[$this->query_string] : 1;
-
-			// Insert {page} placeholder
-			$_GET[$this->query_string] = '{page}';
-
-			// Create full URL
-			$base_url = ($this->base_url === '') ? Router::$current_uri : $this->base_url;
-			$this->url = url::site($base_url).'?'.str_replace('%7Bpage%7D', '{page}', http_build_query($_GET));
-
-			// Reset page number
-			$_GET[$this->query_string] = $this->current_page;
-		}
-
-		// Build generic URL with page as URI segment
-		else
-		{
-			// Use current URI if no base_url set
-			$this->url = ($this->base_url === '') ? Router::$segments : explode('/', trim($this->base_url, '/'));
-
-			// Convert uri 'label' to corresponding integer if needed
-			if (is_string($this->uri_segment))
-			{
-				if (($key = array_search($this->uri_segment, $this->url)) === FALSE)
-				{
-					// If uri 'label' is not found, auto add it to base_url
-					$this->url[] = $this->uri_segment;
-					$this->uri_segment = count($this->url) + 1;
-				}
-				else
-				{
-					$this->uri_segment = $key + 2;
-				}
-			}
-
-			// Insert {page} placeholder
-			$this->url[$this->uri_segment - 1] = '{page}';
-
-			// Create full URL
-			$this->url = url::site(implode('/', $this->url)).Router::$query_string;
-
-			// Extract current page
-			$this->current_page = URI::instance()->segment($this->uri_segment);
-		}
-
-		// Core pagination values
-		$this->total_items        = (int) max(0, $this->total_items);
-		$this->items_per_page     = (int) max(1, $this->items_per_page);
-		$this->total_pages        = (int) ceil($this->total_items / $this->items_per_page);
-		$this->current_page       = (int) min(max(1, $this->current_page), max(1, $this->total_pages));
-		$this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items);
-		$this->current_last_item  = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items);
-
-		// If there is no first/last/previous/next page, relative to the
-		// current page, value is set to FALSE. Valid page number otherwise.
-		$this->first_page         = ($this->current_page === 1) ? FALSE : 1;
-		$this->last_page          = ($this->current_page >= $this->total_pages) ? FALSE : $this->total_pages;
-		$this->previous_page      = ($this->current_page > 1) ? $this->current_page - 1 : FALSE;
-		$this->next_page          = ($this->current_page < $this->total_pages) ? $this->current_page + 1 : FALSE;
-
-		// SQL values
-		$this->sql_offset         = (int) ($this->current_page - 1) * $this->items_per_page;
-		$this->sql_limit          = sprintf(' LIMIT %d OFFSET %d ', $this->items_per_page, $this->sql_offset);
-	}
-
-	/**
-	 * Generates the HTML for the chosen pagination style.
-	 *
-	 * @param   string  pagination style
-	 * @return  string  pagination html
-	 */
-	public function render($style = NULL)
-	{
-		// Hide single page pagination
-		if ($this->auto_hide === TRUE AND $this->total_pages <= 1)
-			return '';
-
-		if ($style === NULL)
-		{
-			// Use default style
-			$style = $this->style;
-		}
-
-		// Return rendered pagination view
-		return View::factory($this->directory.$style, get_object_vars($this))->render();
-	}
-
-	/**
-	 * Magically converts Pagination object to string.
-	 *
-	 * @return  string  pagination html
-	 */
-	public function __toString()
-	{
-		return $this->render();
-	}
-
-	/**
-	 * Magically gets a pagination variable.
-	 *
-	 * @param   string  variable key
-	 * @return  mixed   variable value if the key is found
-	 * @return  void    if the key is not found
-	 */
-	public function __get($key)
-	{
-		if (isset($this->$key))
-			return $this->$key;
-	}
-
-	/**
-	 * Adds a secondary interface for accessing properties, e.g. $pagination->total_pages().
-	 * Note that $pagination->total_pages is the recommended way to access properties.
-	 *
-	 * @param   string  function name
-	 * @return  string
-	 */
-	public function __call($func, $args = NULL)
-	{
-		return $this->__get($func);
-	}
+        // Config values
+        protected $base_url       = '';
+        protected $directory      = 'pagination';
+        protected $style          = 'classic';
+        protected $uri_segment    = 3;
+        protected $query_string   = '';
+        protected $items_per_page = 20;
+        protected $total_items    = 0;
+        protected $auto_hide      = FALSE;
+
+        // Autogenerated values
+        protected $url;
+        protected $current_page;
+        protected $total_pages;
+        protected $current_first_item;
+        protected $current_last_item;
+        protected $first_page;
+        protected $last_page;
+        protected $previous_page;
+        protected $next_page;
+        protected $sql_offset;
+        protected $sql_limit;
+
+        /**
+         * Constructs and returns a new Pagination object.
+         *
+         * @param   array   configuration settings
+         * @return  object
+         */
+        public function factory($config = array())
+        {
+                return new Pagination($config);
+        }
+
+        /**
+         * Constructs a new Pagination object.
+         *
+         * @param   array  configuration settings
+         * @return  void
+         */
+        public function __construct($config = array())
+        {
+                // No custom group name given
+                if ( ! isset($config['group']))
+                {
+                        $config['group'] = 'default';
+                }
+
+                // Pagination setup
+                $this->initialize($config);
+        }
+
+        /**
+         * Sets config values.
+         *
+         * @throws  Kohana_Exception
+         * @param   array  configuration settings
+         * @return  void
+         */
+        public function initialize($config = array())
+        {
+                // Load config group
+                if (isset($config['group']))
+                {
+                        // Load and validate config group
+                        if ( ! is_array($group_config = Kohana::config('pagination.'.$config['group'])))
+                                throw new Kohana_Exception('pagination.undefined_group: ' . $config['group']);
+
+                        // All pagination config groups inherit default config group
+                        if ($config['group'] !== 'default')
+                        {
+                                // Load and validate default config group
+                                if ( ! is_array($default_config = Kohana::config('pagination.default')))
+                                        throw new Kohana_Exception('pagination.undefined_group: default');
+
+                                // Merge config group with default config group
+                                $group_config += $default_config;
+                        }
+
+                        // Merge custom config items with config group
+                        $config += $group_config;
+                }
+
+                // Assign config values to the object
+                foreach ($config as $key => $value)
+                {
+                        if (property_exists($this, $key))
+                        {
+                                $this->$key = $value;
+                        }
+                }
+
+                // Clean view directory
+                $this->directory = trim($this->directory, '/').'/';
+
+                // Build generic URL with page in query string
+                if ($this->query_string !== '')
+                {
+                        // Extract current page
+                        $this->current_page = isset($_GET[$this->query_string]) ? (int) $_GET[$this->query_string] : 1;
+
+                        // Insert {page} placeholder
+                        $_GET[$this->query_string] = '{page}';
+
+                        // Create full URL
+                        $base_url = ($this->base_url === '') ? Router::$current_uri : $this->base_url;
+                        $this->url = url::site($base_url).'?'.str_replace('%7Bpage%7D', '{page}', http_build_query($_GET));
+
+                        // Reset page number
+                        $_GET[$this->query_string] = $this->current_page;
+                }
+
+                // Build generic URL with page as URI segment
+                else
+                {
+                        // Use current URI if no base_url set
+                        $this->url = ($this->base_url === '') ? Router::$segments : explode('/', trim($this->base_url, '/'));
+
+                        // Convert uri 'label' to corresponding integer if needed
+                        if (is_string($this->uri_segment))
+                        {
+                                if (($key = array_search($this->uri_segment, $this->url)) === FALSE)
+                                {
+                                        // If uri 'label' is not found, auto add it to base_url
+                                        $this->url[] = $this->uri_segment;
+                                        $this->uri_segment = count($this->url) + 1;
+                                }
+                                else
+                                {
+                                        $this->uri_segment = $key + 2;
+                                }
+                        }
+
+                        // Insert {page} placeholder
+                        $this->url[$this->uri_segment - 1] = '{page}';
+
+                        // Create full URL
+                        $this->url = url::site(implode('/', $this->url)).Router::$query_string;
+
+                        // Extract current page
+                        $this->current_page = URI::instance()->segment($this->uri_segment);
+                }
+
+                // Core pagination values
+                $this->total_items        = (int) max(0, $this->total_items);
+                $this->items_per_page     = (int) max(1, $this->items_per_page);
+                $this->total_pages        = (int) ceil($this->total_items / $this->items_per_page);
+                $this->current_page       = (int) min(max(1, $this->current_page), max(1, $this->total_pages));
+                $this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items);
+                $this->current_last_item  = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items);
+
+                // If there is no first/last/previous/next page, relative to the
+                // current page, value is set to FALSE. Valid page number otherwise.
+                $this->first_page         = ($this->current_page === 1) ? FALSE : 1;
+                $this->last_page          = ($this->current_page >= $this->total_pages) ? FALSE : $this->total_pages;
+                $this->previous_page      = ($this->current_page > 1) ? $this->current_page - 1 : FALSE;
+                $this->next_page          = ($this->current_page < $this->total_pages) ? $this->current_page + 1 : FALSE;
+
+                // SQL values
+                $this->sql_offset         = (int) ($this->current_page - 1) * $this->items_per_page;
+                $this->sql_limit          = sprintf(' LIMIT %d OFFSET %d ', $this->items_per_page, $this->sql_offset);
+        }
+
+        /**
+         * Generates the HTML for the chosen pagination style.
+         *
+         * @param   string  pagination style
+         * @return  string  pagination html
+         */
+        public function render($style = NULL)
+        {
+                // Hide single page pagination
+                if ($this->auto_hide === TRUE AND $this->total_pages <= 1)
+                        return '';
+
+                if ($style === NULL)
+                {
+                        // Use default style
+                        $style = $this->style;
+                }
+
+                // Return rendered pagination view
+                return View::factory($this->directory.$style, get_object_vars($this))->render();
+        }
+
+        /**
+         * Magically converts Pagination object to string.
+         *
+         * @return  string  pagination html
+         */
+        public function __toString()
+        {
+                return $this->render();
+        }
+
+        /**
+         * Magically gets a pagination variable.
+         *
+         * @param   string  variable key
+         * @return  mixed   variable value if the key is found
+         * @return  void    if the key is not found
+         */
+        public function __get($key)
+        {
+                if (isset($this->$key))
+                        return $this->$key;
+        }
+
+        /**
+         * Adds a secondary interface for accessing properties, e.g. $pagination->total_pages().
+         * Note that $pagination->total_pages is the recommended way to access properties.
+         *
+         * @param   string  function name
+         * @return  string
+         */
+        public function __call($func, $args = NULL)
+        {
+                return $this->__get($func);
+        }
 
 } // End Pagination Class
\ No newline at end of file
-- 
cgit v1.2.3


From bdd7c68ede05d46ba758b0ab3e04b46202d761af Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 15:41:47 -0800
Subject: Fix some function definitions (they should be static)

---
 modules/gallery_unit_test/helpers/MY_request.php | 2 +-
 modules/gallery_unit_test/helpers/diff.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery_unit_test/helpers/MY_request.php b/modules/gallery_unit_test/helpers/MY_request.php
index 9cc9746a..452fb0cc 100644
--- a/modules/gallery_unit_test/helpers/MY_request.php
+++ b/modules/gallery_unit_test/helpers/MY_request.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class request extends request_Core {
-  public function set_user_agent($value) {
+  static function set_user_agent($value) {
     self::$user_agent = null;
     $_SERVER["HTTP_USER_AGENT"] = $value;
   }
diff --git a/modules/gallery_unit_test/helpers/diff.php b/modules/gallery_unit_test/helpers/diff.php
index 1ea16fa6..7b573732 100644
--- a/modules/gallery_unit_test/helpers/diff.php
+++ b/modules/gallery_unit_test/helpers/diff.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class diff_Core {
-  public function compare($a, $b) {
+  static function compare($a, $b) {
     fwrite(fopen($a_name = tempnam("/tmp", "test"), "w"), $a);
     fwrite(fopen($b_name = tempnam("/tmp", "test"), "w"), $b);
     return `diff $a_name $b_name`;
-- 
cgit v1.2.3


From 71e154b6748a2bedd2289133c6b4c6f3f58d3603 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 16:13:08 -0800
Subject: Use a Database_Expression to handle the MAX() function.

---
 modules/gallery/tests/Gallery_Installer_Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index f36f638f..43399fb4 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -35,7 +35,7 @@ class Gallery_Installer_Test extends Unit_Test_Case {
 
   public function install_creates_root_item_test() {
     $max_right_ptr = ORM::factory("item")
-      ->select("MAX(`right_ptr`) AS `right_ptr`")
+      ->select(new Database_Expression("MAX(`right_ptr`) AS `right_ptr`"))
       ->find()->right_ptr;
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
-- 
cgit v1.2.3


From a6da027aad5072a85719fc9e201ee946963e74f0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 16:22:24 -0800
Subject: The default value for $offset should always be null (according to the
 new K24 ORM).

Fix up a bad where tuple in the test.
---
 modules/gallery/libraries/ORM_MPTT.php  | 2 +-
 modules/gallery/models/item.php         | 2 +-
 modules/gallery/tests/ORM_MPTT_Test.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 949ca48c..0ea519c9 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -201,7 +201,7 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    order_by
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
+  function descendants($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
       $this->merge_where($where);
     }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index e2208b73..e3d27b6d 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -634,7 +634,7 @@ class Item_Model extends ORM_MPTT {
    * @param   array    additional where clauses
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $order_by=null) {
+  function descendants($limit=null, $offset=null, $where=array(), $order_by=null) {
     if (empty($order_by)) {
       $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 36a81d2c..69b6bea9 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -190,8 +190,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent->reload();
 
     $this->assert_equal(3, $parent->descendants()->count());
-    $this->assert_equal(2, $parent->descendants(null, 0, array("type" => "photo"))->count());
-    $this->assert_equal(1, $parent->descendants(null, 0, array("type" => "album"))->count());
+    $this->assert_equal(2, $parent->descendants(null, null, array(array("type", "=", "photo")))->count());
+    $this->assert_equal(1, $parent->descendants(null, null, array(array("type", "=", "album")))->count());
   }
 
   public function descendant_limit_test() {
-- 
cgit v1.2.3


From 6601bb29d90ebe0b6f6df0b27616d2804783e447 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 16:25:31 -0800
Subject: Update.

---
 modules/gallery/tests/xss_data.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 3708bc6d..5a15d2ac 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -121,6 +121,7 @@ modules/gallery/views/admin_themes_preview.html.php          7   DIRTY_ATTR $url
 modules/gallery/views/form_uploadify.html.php                20  DIRTY_JS url::file("lib/uploadify/uploadify.swf")
 modules/gallery/views/form_uploadify.html.php                21  DIRTY_JS url::site("simple_uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                25  DIRTY_JS url::file("lib/uploadify/cancel.png")
+modules/gallery/views/form_uploadify.html.php                27  DIRTY_JS $simultaneous_upload_limit
 modules/gallery/views/form_uploadify.html.php                52  DIRTY_JS t("Completed")
 modules/gallery/views/in_place_edit.html.php                 2   DIRTY    form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"),$hidden)
 modules/gallery/views/in_place_edit.html.php                 5   DIRTY    form::input("input",$form["input"]," class=\"textbox\"")
@@ -274,11 +275,11 @@ modules/rss/views/feed.mrss.php                              55  DIRTY_ATTR @fil
 modules/rss/views/feed.mrss.php                              56  DIRTY_ATTR $child->mime_type
 modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $child->resize_height
 modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php                              62  DIRTY_ATTR $child->file_url(true)
-modules/rss/views/feed.mrss.php                              63  DIRTY_ATTR @filesize($child->file_path())
-modules/rss/views/feed.mrss.php                              64  DIRTY_ATTR $child->mime_type
-modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $child->height
-modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR $child->width
+modules/rss/views/feed.mrss.php                              61  DIRTY_ATTR $child->file_url(true)
+modules/rss/views/feed.mrss.php                              62  DIRTY_ATTR @filesize($child->file_path())
+modules/rss/views/feed.mrss.php                              63  DIRTY_ATTR $child->mime_type
+modules/rss/views/feed.mrss.php                              64  DIRTY_ATTR $child->height
+modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $child->width
 modules/rss/views/feed.mrss.php                              70  DIRTY_ATTR $child->file_url(true)
 modules/rss/views/feed.mrss.php                              71  DIRTY_ATTR @filesize($child->file_path())
 modules/rss/views/feed.mrss.php                              72  DIRTY_ATTR $child->height
-- 
cgit v1.2.3


From 0bc92614d37e08ab5f85c83cf4317132d4c6b99c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 16:48:18 -0800
Subject: Checkpoint

---
 modules/gallery/tests/controller_auth_data.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 1fe29ffb..044a8f22 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -3,7 +3,8 @@ modules/comment/helpers/comment_rss.php                      feed
 modules/digibug/controllers/digibug.php                      print_proxy          DIRTY_CSRF|DIRTY_AUTH
 modules/digibug/controllers/digibug.php                      close_window         DIRTY_AUTH
 modules/gallery/controllers/admin.php                        __call               DIRTY_AUTH
-modules/gallery/controllers/albums.php                       _show                DIRTY_CSRF
+modules/gallery/controllers/albums.php                       index                DIRTY_AUTH
+modules/gallery/controllers/albums.php                       show                 DIRTY_CSRF
 modules/gallery/controllers/combined.php                     javascript           DIRTY_AUTH
 modules/gallery/controllers/combined.php                     css                  DIRTY_AUTH
 modules/gallery/controllers/file_proxy.php                   __call               DIRTY_CSRF|DIRTY_AUTH
-- 
cgit v1.2.3


From 63fd9622c06e97e67e6dd11db00b12157924e6b8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 16:50:15 -0800
Subject: Don't use as_array() on the result from db::build()->execute() --
 it's no longer necessary.

---
 modules/gallery/libraries/Gallery_I18n.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index 9a5e7dc1..4e0c1f82 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -132,8 +132,7 @@ class Gallery_I18n_Core {
                ->select("key", "translation")
                ->from("incoming_translations")
                ->where("locale", "=", $locale)
-               ->execute()
-               ->as_array() as $row) {
+               ->execute() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
       }
 
@@ -142,8 +141,7 @@ class Gallery_I18n_Core {
                ->select("key", "translation")
                ->from("outgoing_translations")
                ->where("locale", "=", $locale)
-               ->execute()
-               ->as_array() as $row) {
+               ->execute() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
       }
     }
-- 
cgit v1.2.3


From ffca63235a53e8005d2f163efd97dbf69f8a1442 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 21:18:31 -0800
Subject: Fix where tuple sent to descendant_counts() -- it needs to be wrapped
 in an array

---
 modules/gallery/helpers/gallery_rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 4aef27ad..d422636f 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -51,7 +51,7 @@ class gallery_rss_Core {
         ->viewable()
         ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
-        $item->viewable()->descendants_count(array("type", "=", "photo")) / $limit);
+        $item->viewable()->descendants_count(array(array("type", "=", "photo"))) / $limit);
       $feed->title = html::purify($item->title);
       $feed->description = nl2br(html::purify($item->description));
 
-- 
cgit v1.2.3


From b79e0c9d572bd578c78b9ed6e3e23d3ffbf6bf0b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Tue, 22 Dec 2009 22:15:13 -0800
Subject: Back out my temporary fix for
 http://dev.kohanaframework.org/issues/2384 now that the real fix is in.

---
 system/libraries/ORM.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php
index 2f2feed5..e2f27bac 100644
--- a/system/libraries/ORM.php
+++ b/system/libraries/ORM.php
@@ -242,7 +242,7 @@ class ORM_Core {
 						else
 						{
 							// Support for things like reset_select, reset_write, list_tables
-							$this->db_builder->$method();
+							return $this->db_builder->$method();
 						}
 					break;
 					case 1:
-- 
cgit v1.2.3


From 05c50a052348a4ae664e0b4ca475f9fb3228f24b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 23 Dec 2009 12:29:40 -0800
Subject: Revert "Fix preamble issues.  Upstream tickets:"

This reverts commit b2291a0e34234ee30ea1d80b70122b68a8869917.
---
 system/messages/core.php               | 2 +-
 system/messages/validation/default.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/messages/core.php b/system/messages/core.php
index a9595c1a..64f897e8 100644
--- a/system/messages/core.php
+++ b/system/messages/core.php
@@ -1,4 +1,4 @@
- 'The :field field is required',
-- 
cgit v1.2.3


From 3e8e13bd2533ff7e3493b27c8a8587dfb65e1b26 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 23 Dec 2009 12:42:57 -0800
Subject: Updated Kohana to r4728

---
 system/core/Kohana.php                 |  7 ++---
 system/core/Kohana_Exception.php       | 26 ++++++++++--------
 system/libraries/Input.php             | 31 +--------------------
 system/messages/core.php               | 37 -------------------------
 system/messages/kohana/core.php        | 37 +++++++++++++++++++++++++
 system/messages/validation/default.php | 42 ++++++++++++++++------------
 system/views/kohana/error.php          | 50 +++++++++++++++++-----------------
 7 files changed, 104 insertions(+), 126 deletions(-)
 delete mode 100644 system/messages/core.php
 create mode 100644 system/messages/kohana/core.php

diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index 740adb80..29ca708c 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -2,7 +2,7 @@
 /**
  * Provides Kohana-specific helper functions. This is where the magic happens!
  *
- * $Id: Kohana.php 4724 2009-12-21 16:28:54Z isaiah $
+ * $Id: Kohana.php 4726 2009-12-23 18:58:53Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -810,11 +810,8 @@ abstract class Kohana_Core {
 		{
 			if ($required === TRUE)
 			{
-				// Directory i18n key
-				$directory = 'core.'.inflector::singular($directory);
-
 				// If the file is required, throw an exception
-				throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => Kohana::message($directory), ':file:' =>$filename));
+				throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => __($directory), ':file:' =>$filename));
 			}
 			else
 			{
diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php
index 2eb28f75..0cbc472c 100644
--- a/system/core/Kohana_Exception.php
+++ b/system/core/Kohana_Exception.php
@@ -2,7 +2,7 @@
 /**
  * Kohana Exceptions
  *
- * $Id: Kohana_Exception.php 4692 2009-12-04 15:59:44Z cbandy $
+ * $Id: Kohana_Exception.php 4726 2009-12-23 18:58:53Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -119,7 +119,7 @@ class Kohana_Exception_Core extends Exception {
 			// Manually save logs after exceptions
 			Kohana_Log::save();
 
-			if (Kohana::config('core.display_errors') === FALSE)
+			if (Kohana::config('kohana/core.display_errors') === FALSE)
 			{
 				// Do not show the details
 				$file = $line = NULL;
@@ -146,7 +146,7 @@ class Kohana_Exception_Core extends Exception {
 				}
 
 				// Use the human-readable error name
-				$code = Kohana::message('core.errors.'.$code);
+				$code = Kohana::message('kohana/core.errors.'.$code);
 			}
 			else
 			{
@@ -160,7 +160,7 @@ class Kohana_Exception_Core extends Exception {
 				if ($e instanceof ErrorException)
 				{
 					// Use the human-readable error name
-					$code = Kohana::message('core.errors.'.$e->getSeverity());
+					$code = Kohana::message('kohana/core.errors.'.$e->getSeverity());
 
 					if (version_compare(PHP_VERSION, '5.3', '<'))
 					{
@@ -233,11 +233,12 @@ class Kohana_Exception_Core extends Exception {
 	 *
 	 * @param   mixed    variable to dump
 	 * @param   integer  maximum length of strings
+	 * @param   integer  maximum levels of recursion
 	 * @return  string
 	 */
-	public static function dump($value, $length = 128)
+	public static function dump($value, $length = 128, $max_level = 5)
 	{
-		return Kohana_Exception::_dump($value, $length);
+		return Kohana_Exception::_dump($value, $length, $max_level);
 	}
 
 	/**
@@ -245,10 +246,11 @@ class Kohana_Exception_Core extends Exception {
 	 *
 	 * @param   mixed    variable to dump
 	 * @param   integer  maximum length of strings
-	 * @param   integer  recursion level (internal)
+	 * @param   integer  maximum levels of recursion
+	 * @param   integer  current recursion level (internal)
 	 * @return  string
 	 */
-	private static function _dump( & $var, $length = 128, $level = 0)
+	private static function _dump( & $var, $length = 128, $max_level = 5, $level = 0)
 	{
 		if ($var === NULL)
 		{
@@ -327,7 +329,7 @@ class Kohana_Exception_Core extends Exception {
 			{
 				$output[] = "(\n$space$s*RECURSION*\n$space)";
 			}
-			elseif ($level < 5)
+			elseif ($level <= $max_level)
 			{
 				$output[] = "(";
 
@@ -340,7 +342,7 @@ class Kohana_Exception_Core extends Exception {
 						$key = '"'.$key.'"';
 					}
 
-					$output[] = "$space$s$key => ".Kohana_Exception::_dump($val, $length, $level + 1);
+					$output[] = "$space$s$key => ".Kohana_Exception::_dump($val, $length, $max_level, $level + 1);
 				}
 				unset($var[$marker]);
 
@@ -377,7 +379,7 @@ class Kohana_Exception_Core extends Exception {
 			{
 				$output[] = "{\n$space$s*RECURSION*\n$space}";
 			}
-			elseif ($level < 5)
+			elseif ($level <= $max_level)
 			{
 				$output[] = "{";
 
@@ -397,7 +399,7 @@ class Kohana_Exception_Core extends Exception {
 						$access = 'public';
 					}
 
-					$output[] = "$space$s$access $key => ".Kohana_Exception::_dump($val, $length, $level + 1);
+					$output[] = "$space$s$access $key => ".Kohana_Exception::_dump($val, $length, $max_level, $level + 1);
 				}
 				unset($objects[$hash]);
 
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 04403854..7a277317 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -2,7 +2,7 @@
 /**
  * Input library.
  *
- * $Id: Input.php 4720 2009-12-17 21:15:03Z isaiah $
+ * $Id: Input.php 4727 2009-12-23 19:03:05Z isaiah $
  *
  * @package    Core
  * @author     Kohana Team
@@ -79,35 +79,6 @@ class Input_Core {
 				Kohana_Log::add('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes');
 			}
 
-			// register_globals is enabled
-			if (ini_get('register_globals'))
-			{
-				if (isset($_REQUEST['GLOBALS']))
-				{
-					// Prevent GLOBALS override attacks
-					exit('Global variable overload attack.');
-				}
-
-				// Destroy the REQUEST global
-				$_REQUEST = array();
-
-				// These globals are standard and should not be removed
-				$preserve = array('GLOBALS', '_REQUEST', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER', '_ENV', '_SESSION');
-
-				// This loop has the same effect as disabling register_globals
-				foreach (array_diff(array_keys($GLOBALS), $preserve) as $key)
-				{
-					global $$key;
-					$$key = NULL;
-
-					// Unset the global variable
-					unset($GLOBALS[$key], $$key);
-				}
-
-				// Warn the developer about register globals
-				Kohana_Log::add('debug', 'Disable register_globals! It is evil and deprecated: http://php.net/register_globals');
-			}
-
 			if (is_array($_GET))
 			{
 				foreach ($_GET as $key => $val)
diff --git a/system/messages/core.php b/system/messages/core.php
deleted file mode 100644
index 64f897e8..00000000
--- a/system/messages/core.php
+++ /dev/null
@@ -1,37 +0,0 @@
- array
-	(
-		E_KOHANA             => __('Framework Error'),   // __('Please check the Kohana documentation for information about the following error.'),
-		E_PAGE_NOT_FOUND     => __('Page Not Found'),    // __('The requested page was not found. It may have moved, been deleted, or archived.'),
-		E_DATABASE_ERROR     => __('Database Error'),    // __('A database error occurred while performing the requested procedure. Please review the database error below for more information.'),
-		E_RECOVERABLE_ERROR  => __('Recoverable Error'), // __('An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'),
-		E_ERROR              => __('Fatal Error'),
-		E_COMPILE_ERROR      => __('Fatal Error'),
-		E_CORE_ERROR         => __('Fatal Error'),
-		E_USER_ERROR         => __('Fatal Error'),
-		E_PARSE              => __('Syntax Error'),
-		E_WARNING            => __('Warning Message'),
-		E_COMPILE_WARNING    => __('Warning Message'),
-		E_CORE_WARNING       => __('Warning Message'),
-		E_USER_WARNING       => __('Warning Message'),
-		E_STRICT             => __('Strict Mode Error'),
-		E_NOTICE             => __('Runtime Message'),
-		E_USER_NOTICE        => __('Runtime Message'),
-	),
-	'config'             => 'config file',
-	'controller'         => 'controller',
-	'helper'             => 'helper',
-	'library'            => 'library',
-	'driver'             => 'driver',
-	'model'              => 'model',
-	'view'               => 'view',
-);
-
-// E_DEPRECATED is only defined in PHP >= 5.3.0
-if (defined('E_DEPRECATED'))
-{
-	$messages['errors'][E_DEPRECATED] = __('Deprecated');
-}
\ No newline at end of file
diff --git a/system/messages/kohana/core.php b/system/messages/kohana/core.php
new file mode 100644
index 00000000..1361809b
--- /dev/null
+++ b/system/messages/kohana/core.php
@@ -0,0 +1,37 @@
+ array
+	(
+		E_KOHANA             => 'Framework Error',
+		E_PAGE_NOT_FOUND     => 'Page Not Found',
+		E_DATABASE_ERROR     => 'Database Error',
+		E_RECOVERABLE_ERROR  => 'Recoverable Error',
+		E_ERROR              => 'Fatal Error',
+		E_COMPILE_ERROR      => 'Fatal Error',
+		E_CORE_ERROR         => 'Fatal Error',
+		E_USER_ERROR         => 'Fatal Error',
+		E_PARSE              => 'Syntax Error',
+		E_WARNING            => 'Warning Message',
+		E_COMPILE_WARNING    => 'Warning Message',
+		E_CORE_WARNING       => 'Warning Message',
+		E_USER_WARNING       => 'Warning Message',
+		E_STRICT             => 'Strict Mode Error',
+		E_NOTICE             => 'Runtime Message',
+		E_USER_NOTICE        => 'Runtime Message',
+	),
+);
+
+// E_DEPRECATED is only defined in PHP >= 5.3.0
+if (defined('E_DEPRECATED'))
+{
+	$messages['errors'][E_DEPRECATED] = 'Deprecated';
+}
\ No newline at end of file
diff --git a/system/messages/validation/default.php b/system/messages/validation/default.php
index 2c59fa06..88580a6b 100644
--- a/system/messages/validation/default.php
+++ b/system/messages/validation/default.php
@@ -1,17 +1,25 @@
- 'The :field field is required',
-	'length'        => 'The :field field must be between :param1 and :param2 characters long',
-	'depends_on'    => 'The :field field requires the :param1 field',
-	'matches'       => 'The :field field must be the same as :param1',
-	'email'         => 'The :field field must be a valid email address',
-	'decimal'       => 'The :field field must be a decimal with :param1 places',
-	'digit'         => 'The :field field must be a digit',
-	'in_array'      => 'The :field field must be one of the available options',
-	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',
-	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',
-	'numeric '      => 'The :field field must be a valid number',
-	'url'           => 'The :field field must be a valid url',
-	'phone'         => 'The :field field must be a valid phone number',
-);
+ 'The :field field is required',
+	'length'        => 'The :field field must be between :param1 and :param2 characters long',
+	'depends_on'    => 'The :field field requires the :param1 field',
+	'matches'       => 'The :field field must be the same as :param1',
+	'email'         => 'The :field field must be a valid email address',
+	'decimal'       => 'The :field field must be a decimal with :param1 places',
+	'digit'         => 'The :field field must be a digit',
+	'in_array'      => 'The :field field must be one of the available options',
+	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',
+	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',
+	'numeric '      => 'The :field field must be a valid number',
+	'url'           => 'The :field field must be a valid url',
+	'phone'         => 'The :field field must be a valid phone number',
+);
diff --git a/system/views/kohana/error.php b/system/views/kohana/error.php
index b40c0f8a..aa6770c4 100644
--- a/system/views/kohana/error.php
+++ b/system/views/kohana/error.php
@@ -3,7 +3,7 @@
 $error_id = uniqid('error');
 ?>
 
+    
+    <?= t("Something went wrong!") ?>
+
+    
+  
+  
+    
+    admin ?>
+    
                  
+      
                  
+        
+      
                  
+      
                  
+        
+      
                  
+      
+      
                  
+        
+      
                  
+      
+    
                  
+    
+    
                  
+      
                  
+        
+      
                  
+      
                  
+	
                  
+          
+             [  ]:
+          
+          
+            
+          
+	
                  
+	
                  
+          
                  
+            
                  
+              
+                [  ]
+              
+            
                  
+
+             $row): ?>">
+            
+          
                  
+
+          
+          
                    
+             $step): ?>
+            
                  1. 
+              
                    
+                
+                  
+                  
+                  [  ]
+                  
+                  [  ]
+                  
+                  
+                  {}
+                  
+                
+                »
+                (
+                
+                )
+              
                    
+              
+              
            
+                   $arg): ?>
+                  
+                    
+                    
+                  
+                  
+                
            
+                      
+                        
+                      
+                    
+                      
            
+                    
            
+              
            
+              
+              
+              
+              
+            
+            
+            
+          
+          
+
+	
            
+	
            
+          " onclick="return koggle('')">
+        
            
+	
+      
            
+    
            
+    
+  
+
-- 
cgit v1.2.3


From b62083bd24b7e5fa079726dc0819fb646c31192b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 23 Dec 2009 20:48:50 -0800
Subject: Cleaner version.  Probably has a bunch of cruft in it, but it looks
 good enough.

---
 modules/gallery/views/kohana/error.php | 78 ++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/modules/gallery/views/kohana/error.php b/modules/gallery/views/kohana/error.php
index f973f5b9..7c4a959c 100644
--- a/modules/gallery/views/kohana/error.php
+++ b/modules/gallery/views/kohana/error.php
@@ -72,8 +72,34 @@
         padding-bottom: 10px;
       }
 
-      #first_error {
-        padding-left: 20px;
+      .source {
+        border: solid 1px #ccc;
+        background: #efe;
+        margin-bottom: 5px;
+      }
+
+      table {
+        width: 100%;
+        display: block;
+        margin: 0 0 0.4em;
+        padding: 0;
+        border-collapse: collapse;
+        background: #efe;
+      }
+
+      table td {
+        border: solid 1px #ddd;
+        text-align: left;
+        vertical-align: top;
+        padding: 0.4em;
+      }
+
+      .args table td.key {
+        width: 200px;
+      }
+
+      .number {
+        padding-right: 1em;
       }
     
     
@@ -134,21 +160,23 @@
           
 	
 	
            
-          
            
-            
            
-              
-                [  ]
-              
-            
            
+          
              
+            
            1. 
+              
              
+                
+                  [  ]
+                
+              
              
 
-             $row): ?>">
-            
-          
            
+              
            
+                 $row): ?>">
+                
+              
            
+            
 
-          
-          
              
+            
              $step): ?>
-            
            1. 
+            
            2. 
               
              
                 
                   
@@ -171,12 +199,10 @@
                  $arg): ?>
                   
-                    
-                    
@@ -185,7 +211,7 @@
               
-              
+              
@@ -205,9 +231,7 @@
               
@@ -220,9 +244,7 @@
               
@@ -236,12 +258,12 @@
             
              
                   
              
-                      
-                        
-                      
+                    
+                      
              
                                   		
+                    
                       
              
                                   		
                   
              
               
               
               
             
             
               
              
                 
-                  
-                    
-                  
+                  
              
                               		
               
              
               
               
              
                 
-                  
-                    
-                  
+                  
              
                               		
               
              
               
               $value): ?>
               
-                
-                
-- 
cgit v1.2.3


From 057e8d09afaecd27f672f804a6a65341578d50fd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Wed, 23 Dec 2009 20:51:33 -0800
Subject: Convert a bunch of leftover kohana::show_404 calls to throw
 Kohana_404_Exception instead.  These are the ones where we used a lower-case
 'k' so my previous filter didn't catch it.

---
 modules/digibug/controllers/digibug.php    |  2 +-
 modules/gallery/controllers/admin.php      |  2 +-
 modules/gallery/controllers/file_proxy.php | 16 ++++++++--------
 modules/tag/controllers/admin_tags.php     |  4 ++--
 modules/user/controllers/admin_users.php   | 16 ++++++++--------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index a23d2863..6e6009db 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -87,7 +87,7 @@ class Digibug_Controller extends Controller {
 
     $file = $type == "full" ? $proxy->item->file_path() : $proxy->item->thumb_path();
     if (!file_exists($file)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // We don't need to save the session for this request
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 98cac557..e4216991 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -44,7 +44,7 @@ class Admin_Controller extends Controller {
     }
 
     if (!method_exists($controller_name, $method)) {
-      return kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     call_user_func_array(array(new $controller_name, $method), $args);
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 6a80ad85..65c0cb50 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -38,19 +38,19 @@ class File_Proxy_Controller extends Controller {
     // Make sure that the request is for a file inside var
     $offset = strpos($request_uri, $var_uri);
     if ($offset === false) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $file_uri = substr($request_uri, strlen($var_uri));
 
     // Make sure that we don't leave the var dir
     if (strpos($file_uri, "..") !== false) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     list ($type, $path) = explode("/", $file_uri, 2);
     if ($type != "resizes" && $type != "albums" && $type != "thumbs") {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // If the last element is .album.jpg, pop that off since it's not a real item
@@ -78,7 +78,7 @@ class File_Proxy_Controller extends Controller {
     }
 
     if (!$item->loaded()) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     if ($type == "albums") {
@@ -91,21 +91,21 @@ class File_Proxy_Controller extends Controller {
 
     // Make sure we have access to the item
     if (!access::can("view", $item)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // Make sure we have view_full access to the original
     if ($type == "albums" && !access::can("view_full", $item)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // Don't try to load a directory
     if ($type == "albums" && $item->is_album()) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     if (!file_exists($file)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // We don't need to save the session for this request
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index a56d4d20..e20b8ac8 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -45,7 +45,7 @@ class Admin_Tags_Controller extends Admin_Controller {
 
     $tag = ORM::factory("tag", $id);
     if (!$tag->loaded()) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = tag::get_delete_form($tag);
@@ -80,7 +80,7 @@ class Admin_Tags_Controller extends Admin_Controller {
 
     $tag = ORM::factory("tag", $id);
     if (!$tag->loaded()) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $in_place_edit = InPlaceEdit::factory($tag->name)
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index ee65efd2..96b86fff 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -77,7 +77,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_user_delete_form_admin($user);
@@ -98,7 +98,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_user_form($id) {
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
     print $this->_get_user_delete_form_admin($user);
   }
@@ -108,7 +108,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_user_edit_form_admin($user);
@@ -155,7 +155,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_user_form($id) {
     $user = user::lookup($id);
     if (empty($user)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $v = new View("user_form.html");
@@ -224,7 +224,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_group_delete_form_admin($group);
@@ -245,7 +245,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_group_form($id) {
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     print $this->_get_group_delete_form_admin($group);
@@ -256,7 +256,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $group = group::lookup($id);
     if (empty($group)) {
-       kohana::show_404();
+       throw new Kohana_404_Exception();
     }
 
     $form = $this->_get_group_edit_form_admin($group);
@@ -288,7 +288,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_group_form($id) {
     $group = group::lookup($id);
     if (empty($group)) {
-      kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     print $this->_get_group_edit_form_admin($group);
-- 
cgit v1.2.3


From b16ab9d94af3b463c3f3497c0b4cb57416349a27 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 24 Dec 2009 03:08:06 -0800
Subject: Don't treat objects like strings.

---
 modules/g2_import/helpers/g2_import.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 3cf7eb80..a7a69746 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -611,11 +611,9 @@ class g2_import_Core {
                array("id" => $g2_item_id, "exception" => $e->__toString()));
     }
 
-    $tags = "";
     // Multiword tags have the space changed to dots.s
     foreach ($tag_names as $tag_name) {
-      $tags .= (strlen($tags) ? ", " : "") .
-        tag::add($g3_item, $tag_name);
+      tag::add($g3_item, $tag_name);
     }
 
     // Tag operations are idempotent so we don't need to map them.  Which is good because we don't
@@ -634,11 +632,10 @@ class g2_import_Core {
       $delim = " ";
     }
 
-    $tags = "";
     foreach (preg_split("/$delim/", $keywords) as $keyword) {
       $keyword = trim($keyword);
       if ($keyword) {
-        $tags .= (strlen($tags) ? ", " : "") . tag::add($item, $keyword);
+        tag::add($item, $keyword);
       }
     }
   }
-- 
cgit v1.2.3


From 24ef52eccbe854688d61a798ee79d64f24f63ac1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 24 Dec 2009 18:06:26 -0800
Subject: whitespace fix

---
 modules/gallery/helpers/gallery_block.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 40660874..1db7585c 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -34,7 +34,7 @@ class gallery_block_Core {
 
   static function get($block_id) {
     $block = new Block();
-    switch($block_id) {
+    switch ($block_id) {
     case "welcome":
       $block->css_id = "g-welcome";
       $block->title = t("Welcome to Gallery 3");
-- 
cgit v1.2.3


From 73aeed890263386a0cd44b210ddf360dc6613843 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Thu, 24 Dec 2009 20:08:04 -0800
Subject: indentation fix.

---
 modules/gallery/helpers/gallery_block.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 1db7585c..9d4e81b6 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -101,8 +101,7 @@ class gallery_block_Core {
         $block->css_id = "g-user-language-block";
         $block->title = t("Language preference");
         $block->content = new View("user_languages_block.html");
-        $block->content->installed_locales =
-          array_merge(array("" => t("« none »")), $locales);
+        $block->content->installed_locales = array_merge(array("" => t("« none »")), $locales);
         $block->content->selected = (string) locales::cookie_locale();
       } else {
         $block = "";
-- 
cgit v1.2.3


From c50c2d135c5e769e8904e5dc766d27bcd4a1d8b3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 25 Dec 2009 12:39:09 -0800
Subject: Fix uses of count_records() and use ORM to count instead.

---
 modules/server_add/controllers/server_add.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 77487673..6ff00812 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -175,15 +175,15 @@ class Server_Add_Controller extends Admin_Controller {
       // over 10% in percent_complete.
       $task->set("queue", $queue);
       $task->percent_complete = min($task->percent_complete + 0.1, 10);
-      $task->status = t2("Found one file", "Found %count files",
-                         db::build()->count_records(
-                           "server_add_files", array("task_id" => $task->id)));
+      $task->status = t2(
+        "Found one file", "Found %count files",
+        ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all());
 
       if (!$queue) {
         $task->set("mode", "add-files");
         $task->set(
-          "total_files", db::build()->count_records(
-            "server_add_files", array("task_id" => $task->id)));
+          "total_files",
+          ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all());
         $task->percent_complete = 10;
       }
       break;
@@ -256,7 +256,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->status = t("Adding photos / albums (%completed of %total)",
                         array("completed" => $completed_files,
                               "total" => $total_files));
-      $task->percent_complete = 10 + 100 * ($completed_files / $total_files);
+      $task->percent_complete = $total_files ? 10 + 100 * ($completed_files / $total_files) : 100;
       break;
 
     case "done":
-- 
cgit v1.2.3


From 07a9ef2276a421fe3b8ebad4c4ff845b147be847 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 25 Dec 2009 13:24:38 -0800
Subject: Convert some database calls

---
 modules/organize/controllers/organize.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 03dea13d..201ced30 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -75,7 +75,11 @@ class Organize_Controller extends Controller {
       $i = 0;
       foreach ($album->children() as $child) {
         // Do this directly in the database to avoid sending notifications
-        Database::Instance()->update("items", array("weight" => ++$i), array("id" => $child->id));
+        db::build()
+          ->update("items")
+          ->set("weight", ++$i)
+          ->where("id", "=", $child->id)
+          ->execute();
       }
       $album->sort_column = "weight";
       $album->sort_order = "ASC";
@@ -91,15 +95,20 @@ class Organize_Controller extends Controller {
 
     // Make a hole
     $count = count($source_ids);
-    Database::Instance()->query(
-      "UPDATE {items} " .
-      "SET `weight` = `weight` + $count " .
-      "WHERE `weight` >= $target_weight AND `parent_id` = {$album->id}");
+    db::build()
+      ->update("items")
+      ->set("weight", new Database_Expression("`weight` + $count"))
+      ->where("weight", ">=", $target_weight)
+      ->where("parent_id", "=", $album->id)
+      ->execute();
 
     // Insert source items into the hole
     foreach ($source_ids as $source_id) {
-      Database::Instance()->update(
-        "items", array("weight" => $target_weight++), array("id" => $source_id));
+      db::build()
+        ->update("items")
+        ->set("weight", $target_weight++)
+        ->where("id", "=", $source_id)
+        ->execute();
     }
 
     module::event("album_rearrange", $album);
-- 
cgit v1.2.3


From da7ee6ab30d8f2545781910d7ef1f573c5dfee93 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 25 Dec 2009 13:24:47 -0800
Subject: Fix over-targetting in CSS

---
 modules/organize/js/organize.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index a7fe1ad2..afa9e17a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -149,7 +149,7 @@
         window.location.reload();
       });
 
-      $("#g-dialog #g-organize-close").click(function(event) {
+      $("#g-organize-close").click(function(event) {
         $("#g-dialog").dialog("close");
       });
 
-- 
cgit v1.2.3


From 32d25dafd5b033338b6a9bb8c7c53edab462543a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta 
Date: Fri, 25 Dec 2009 21:05:39 -0800
Subject: Prevent form::dropdown from overzealously escaping ampersands by
 applying this diff: http://dev.kohanaframework.org/attachments/1490/form.diff

Upstream ticket: http://dev.kohanaframework.org/issues/2463
---
 system/helpers/form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/helpers/form.php b/system/helpers/form.php
index 4225b1b6..b7c60c24 100644
--- a/system/helpers/form.php
+++ b/system/helpers/form.php
@@ -246,14 +246,14 @@ class form_Core {
 					$inner_key = (string) $inner_key;
 
 					$sel = in_array($inner_key, $selected) ? ' selected="selected"' : '';
-					$input .= ''."\n";
+					$input .= ''."\n";
 				}
 				$input .= ''."\n";
 			}
 			else
 			{
 				$sel = in_array($key, $selected) ? ' selected="selected"' : '';
-				$input .= ''."\n";
+				$input .= ''."\n";
 			}
 		}
 		$input .= '';
-- 
cgit v1.2.3


              
               
              
+                
                   
                     
                   
                 
+