From ca0e00d03e0c03c94db5a37aab7bfc7cc5f1217a Mon Sep 17 00:00:00 2001 From: czaks Date: Thu, 27 Mar 2014 13:17:07 +0100 Subject: tag for vichan-devel-4.4.96 --- install.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'install.php') diff --git a/install.php b/install.php index 761bdfed..3cc48c25 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ vichan-devel-4.4.95'); +define('VERSION', 'v0.9.6-dev-22 + vichan-devel-4.4.96'); require 'inc/functions.php'; @@ -503,6 +503,7 @@ if (file_exists($config['has_installed'])) { case 'v0.9.6-dev-22 + vichan-devel-4.4.92': case 'v0.9.6-dev-22 + vichan-devel-4.4.93': case 'v0.9.6-dev-22 + vichan-devel-4.4.94': + case 'v0.9.6-dev-22 + vichan-devel-4.4.95': case false: // Update version number file_write($config['has_installed'], VERSION); -- cgit v1.3 From 5bdccc29c9ce08fbb1e8cd720ec96964c63a1d92 Mon Sep 17 00:00:00 2001 From: czaks Date: Mon, 31 Mar 2014 10:27:08 +0200 Subject: tag for vichan-devel-4.4.97 --- install.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'install.php') diff --git a/install.php b/install.php index 3cc48c25..ec3186bf 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ vichan-devel-4.4.96'); +define('VERSION', 'v0.9.6-dev-22 + vichan-devel-4.4.97'); require 'inc/functions.php'; @@ -504,6 +504,7 @@ if (file_exists($config['has_installed'])) { case 'v0.9.6-dev-22 + vichan-devel-4.4.93': case 'v0.9.6-dev-22 + vichan-devel-4.4.94': case 'v0.9.6-dev-22 + vichan-devel-4.4.95': + case 'v0.9.6-dev-22 + vichan-devel-4.4.96': case false: // Update version number file_write($config['has_installed'], VERSION); -- cgit v1.3 From 65014b7867793f561f0cf5dc7d0257322d7e58f6 Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 18 Apr 2014 11:50:00 +0200 Subject: update installation code --- install.php | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index ec3186bf..49c7a907 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@ vichan-devel-4.4.97'); +define('VERSION', '4.4.98'); require 'inc/functions.php'; @@ -505,6 +505,20 @@ if (file_exists($config['has_installed'])) { case 'v0.9.6-dev-22 + vichan-devel-4.4.94': case 'v0.9.6-dev-22 + vichan-devel-4.4.95': case 'v0.9.6-dev-22 + vichan-devel-4.4.96': + case 'v0.9.6-dev-22 + vichan-devel-4.4.97': + case '4.4.97': + if (!isset($_GET['confirm'])) { + $page['title'] = 'License Change'; + $page['body'] = '

You are upgrading to a version which uses an amended license. The licenses included with vichan distributions prior to this version (4.4.98) are still valid for those versions, but no longer apply to this and newer versions.

' . + ' +

+ I have read and understood the agreement. Proceed to upgrading. +

'; + + file_write($config['has_installed'], '4.4.97'); + + break; + } case false: // Update version number file_write($config['has_installed'], VERSION); @@ -514,11 +528,11 @@ if (file_exists($config['has_installed'])) { break; default: $page['title'] = 'Unknown version'; - $page['body'] = '

Tinyboard was unable to determine what version is currently installed.

'; + $page['body'] = '

vichan was unable to determine what version is currently installed.

'; break; case VERSION: $page['title'] = 'Already installed'; - $page['body'] = '

It appears that Tinyboard is already installed (' . $version . ') and there is nothing to upgrade! Delete ' . $config['has_installed'] . ' to reinstall.

'; + $page['body'] = '

It appears that vichan is already installed (' . $version . ') and there is nothing to upgrade! Delete ' . $config['has_installed'] . ' to reinstall.

'; break; } @@ -569,19 +583,12 @@ if ($step == 0) { ); $tests = array( - array( - 'category' => 'PHP', - 'name' => 'PHP ≥ 5.2.5', - 'result' => PHP_VERSION_ID >= 50205, - 'required' => true, - 'message' => 'Tinyboard requires PHP 5.2.5 or better.', - ), array( 'category' => 'PHP', 'name' => 'PHP ≥ 5.3', 'result' => PHP_VERSION_ID >= 50300, - 'required' => false, - 'message' => 'PHP ≥ 5.3, though not required, is recommended to make the most out of Tinyboard configuration files.', + 'required' => true, + 'message' => 'vichan requires PHP 5.3 or better.', ), array( 'category' => 'PHP', @@ -672,21 +679,21 @@ if ($step == 0) { 'name' => getcwd(), 'result' => is_writable('.'), 'required' => true, - 'message' => 'Tinyboard does not have permission to create directories (boards) here. You will need to chmod (or operating system equivalent) appropriately.' + 'message' => 'vichan does not have permission to create directories (boards) here. You will need to chmod (or operating system equivalent) appropriately.' ), array( 'category' => 'File permissions', 'name' => getcwd() . '/templates/cache', 'result' => is_writable('templates') && (!is_dir('templates/cache') || is_writable('templates/cache')), 'required' => true, - 'message' => 'You must give Tinyboard permission to create (and write to) the templates/cache directory or performance will be drastically reduced.' + 'message' => 'You must give vichan permission to create (and write to) the templates/cache directory or performance will be drastically reduced.' ), array( 'category' => 'File permissions', 'name' => getcwd() . '/inc/instance-config.php', 'result' => is_writable('inc/instance-config.php'), 'required' => false, - 'message' => 'Tinyboard does not have permission to make changes to inc/instance-config.php. To complete the installation, you will be asked to manually copy and paste code into the file instead.' + 'message' => 'vichan does not have permission to make changes to inc/instance-config.php. To complete the installation, you will be asked to manually copy and paste code into the file instead.' ), array( 'category' => 'Misc', @@ -698,10 +705,10 @@ if ($step == 0) { ), array( 'category' => 'Misc', - 'name' => 'Tinyboard installed using git', + 'name' => 'vichan installed using git', 'result' => is_dir('.git'), 'required' => false, - 'message' => 'Tinyboard is still beta software and it\'s not going to come out of beta any time soon. As there are often many months between releases yet changes and bug fixes are very frequent, it\'s recommended to use the git repository to maintain your Tinyboard installation. Using git makes upgrading much easier.' + 'message' => 'vichan is still beta software and it\'s not going to come out of beta any time soon. As there are often many months between releases yet changes and bug fixes are very frequent, it\'s recommended to use the git repository to maintain your vichan installation. Using git makes upgrading much easier.' ) ); @@ -809,10 +816,10 @@ if ($step == 0) { } $page['title'] = 'Installation complete'; - $page['body'] = '

Thank you for using Tinyboard. Please remember to report any bugs you discover. How do I edit the config files?

'; + $page['body'] = '

Thank you for using vichan. Please remember to report any bugs you discover. How do I edit the config files?

'; if (!empty($sql_errors)) { - $page['body'] .= '

SQL errors

SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a Tinyboard installation; if so, you can probably ignore this.

The errors encountered were:

    ' . $sql_errors . '

Ignore errors and complete installation.

'; + $page['body'] .= '

SQL errors

SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a vichan installation; if so, you can probably ignore this.

The errors encountered were:

    ' . $sql_errors . '

Ignore errors and complete installation.

'; } else { $boards = listBoards(); foreach ($boards as &$_board) { @@ -829,7 +836,7 @@ if ($step == 0) { echo Element('page.html', $page); } elseif ($step == 5) { $page['title'] = 'Installation complete'; - $page['body'] = '

Thank you for using Tinyboard. Please remember to report any bugs you discover.

'; + $page['body'] = '

Thank you for using vichan. Please remember to report any bugs you discover.

'; $boards = listBoards(); foreach ($boards as &$_board) { -- cgit v1.3 From ba89b7731d7db8bca2a199af26703387173f5f0e Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 18 Apr 2014 11:57:37 +0200 Subject: enhance tinyboard -> vichan upgrade path --- install.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'install.php') diff --git a/install.php b/install.php index 49c7a907..3b60a283 100644 --- a/install.php +++ b/install.php @@ -241,7 +241,6 @@ if (file_exists($config['has_installed'])) { query("ALTER TABLE `bans` ADD `seen` BOOLEAN NOT NULL") or error(db_error()); case 'v0.9.6-dev-8': case 'v0.9.6-dev-8 + vichan-devel-4.0.1': - query("CREATE TABLE IF NOT EXISTS `search_queries` ( `ip` varchar(39) NOT NULL, `time` int(11) NOT NULL, `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error()); case 'v0.9.6-dev-8 + vichan-devel-4.0.2': query("ALTER TABLE `mods` CHANGE `password` `password` CHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'SHA256'") or error(db_error()); query("ALTER TABLE `mods` ADD `salt` CHAR( 32 ) NOT NULL AFTER `password`") or error(db_error()); @@ -520,6 +519,9 @@ if (file_exists($config['has_installed'])) { break; } case false: + // TODO: enhance Tinyboard -> vichan upgrade path. + query("CREATE TABLE IF NOT EXISTS ``search_queries`` ( `ip` varchar(39) NOT NULL, `time` int(11) NOT NULL, `query` text NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8;") or error(db_error()); + // Update version number file_write($config['has_installed'], VERSION); -- cgit v1.3 From 08e72939b0b2544bdb40bc0d63deb7ad3d36dd36 Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 18 Apr 2014 12:37:27 +0200 Subject: we are not releasing 4.4.98 yet --- install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install.php') diff --git a/install.php b/install.php index 3b60a283..5a4a9ef8 100644 --- a/install.php +++ b/install.php @@ -1,7 +1,7 @@