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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'installer') 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' => '', -- cgit v1.2.3 From 8cf0348e6c9b3dac0a14356676dec93a24b2dad6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 29 Dec 2009 11:36:52 -0800 Subject: Make sure that we have the mbstring extension. --- installer/installer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'installer') diff --git a/installer/installer.php b/installer/installer.php index 3b1716e2..e2c60d46 100644 --- a/installer/installer.php +++ b/installer/installer.php @@ -210,7 +210,9 @@ class installer { $errors[] = "PHP is missing the SimpleXML extension"; } - if (extension_loaded("mbstring") && (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING)) { + if (!extension_loaded("mbstring")) { + $errors[] = "PHP is missing the mbstring extension"; + } else if (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING) { $errors[] = "The mbstring extension is overloading PHP's native string functions. Please disable it."; } -- cgit v1.2.3 From 1d42d5533a6f7ace5e2288d78f3fa55952e23ef8 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 1 Jan 2010 09:55:06 -0800 Subject: Change the installer so that the rest module is automatically installed in new installations. --- installer/install.sql | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'installer') diff --git a/installer/install.sql b/installer/install.sql index 916cb3e3..920972db 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -226,17 +226,18 @@ CREATE TABLE {modules} ( `version` int(9) default NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; INSERT INTO {modules} VALUES (1,1,'gallery',21); INSERT INTO {modules} VALUES (2,1,'user',2); INSERT INTO {modules} VALUES (3,1,'comment',2); INSERT INTO {modules} VALUES (4,1,'organize',1); INSERT INTO {modules} VALUES (5,1,'info',1); -INSERT INTO {modules} VALUES (6,1,'rss',1); -INSERT INTO {modules} VALUES (7,1,'search',1); -INSERT INTO {modules} VALUES (8,1,'slideshow',1); -INSERT INTO {modules} VALUES (9,1,'tag',1); +INSERT INTO {modules} VALUES (6,1,'rest',1); +INSERT INTO {modules} VALUES (7,1,'rss',1); +INSERT INTO {modules} VALUES (8,1,'search',1); +INSERT INTO {modules} VALUES (9,1,'slideshow',2); +INSERT INTO {modules} VALUES (10,1,'tag',1); DROP TABLE IF EXISTS {outgoing_translations}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; @@ -333,6 +334,18 @@ CREATE TABLE {themes} ( SET character_set_client = @saved_cs_client; INSERT INTO {themes} VALUES (1,'wind',1); INSERT INTO {themes} VALUES (2,'admin_wind',1); +DROP TABLE IF EXISTS {user_access_tokens}; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +CREATE TABLE {user_access_tokens} ( + `id` int(9) NOT NULL auto_increment, + `user_id` int(9) NOT NULL, + `access_key` char(32) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `access_key` (`access_key`), + UNIQUE KEY `user_id` (`user_id`) +) DEFAULT CHARSET=utf8; +SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS {users}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; @@ -366,7 +379,7 @@ CREATE TABLE {vars} ( `value` text, PRIMARY KEY (`id`), UNIQUE KEY `module_name` (`module_name`,`name`) -) AUTO_INCREMENT=36 DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=37 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind'); INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind'); @@ -389,3 +402,4 @@ INSERT INTO {vars} VALUES (NULL,'user','mininum_password_length','5'); INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0'); INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user'); INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}'); +INSERT INTO {vars} VALUES (NULL,'slideshow','max_scale','0'); -- cgit v1.2.3 From df001700dd071c59c47afd07d2c756487d20684e Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 1 Jan 2010 12:17:04 -0800 Subject: Don't enable the rest module by default yet; we should make sure that we do a more thorough security audit on it first. --- installer/install.sql | 23 +++++------------------ modules/gallery/controllers/packager.php | 2 +- 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'installer') diff --git a/installer/install.sql b/installer/install.sql index 920972db..6e7c06a2 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -226,18 +226,17 @@ CREATE TABLE {modules} ( `version` int(9) default NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; INSERT INTO {modules} VALUES (1,1,'gallery',21); INSERT INTO {modules} VALUES (2,1,'user',2); INSERT INTO {modules} VALUES (3,1,'comment',2); INSERT INTO {modules} VALUES (4,1,'organize',1); INSERT INTO {modules} VALUES (5,1,'info',1); -INSERT INTO {modules} VALUES (6,1,'rest',1); -INSERT INTO {modules} VALUES (7,1,'rss',1); -INSERT INTO {modules} VALUES (8,1,'search',1); -INSERT INTO {modules} VALUES (9,1,'slideshow',2); -INSERT INTO {modules} VALUES (10,1,'tag',1); +INSERT INTO {modules} VALUES (6,1,'rss',1); +INSERT INTO {modules} VALUES (7,1,'search',1); +INSERT INTO {modules} VALUES (8,1,'slideshow',2); +INSERT INTO {modules} VALUES (9,1,'tag',1); DROP TABLE IF EXISTS {outgoing_translations}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; @@ -334,18 +333,6 @@ CREATE TABLE {themes} ( SET character_set_client = @saved_cs_client; INSERT INTO {themes} VALUES (1,'wind',1); INSERT INTO {themes} VALUES (2,'admin_wind',1); -DROP TABLE IF EXISTS {user_access_tokens}; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -CREATE TABLE {user_access_tokens} ( - `id` int(9) NOT NULL auto_increment, - `user_id` int(9) NOT NULL, - `access_key` char(32) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `access_key` (`access_key`), - UNIQUE KEY `user_id` (`user_id`) -) DEFAULT CHARSET=utf8; -SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS {users}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php index 03d56fff..cb64f1bf 100644 --- a/modules/gallery/controllers/packager.php +++ b/modules/gallery/controllers/packager.php @@ -63,7 +63,7 @@ class Packager_Controller extends Controller { module::load_modules(); - foreach (array("user", "comment", "organize", "info", "rest", "rss", + foreach (array("user", "comment", "organize", "info", "rss", "search", "slideshow", "tag") as $module_name) { module::install($module_name); module::activate($module_name); -- cgit v1.2.3