diff -r 8e2fffc5c622 -r 861807631f70 upgrade.php --- a/upgrade.php Tue Oct 23 12:30:08 2007 -0400 +++ b/upgrade.php Wed Oct 24 12:45:05 2007 -0400 @@ -2,7 +2,7 @@ /* * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between - * Version 1.0.2 (Coblynau) + * Version 1.1.1 * upgrade.php - upgrade script * Copyright (C) 2006-2007 Dan Fuhry * @@ -61,7 +61,7 @@ // Everything related to versions goes here! // Valid versions to upgrade from -$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1'); +$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', 'Stable1.0ToUnstable1.1'); // Basically a list of dependencies, which should be resolved automatically // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not @@ -76,9 +76,11 @@ '1.0RC3' => Array('1.0'), '1.0' => Array('1.0.1'), '1.0.1' => Array('1.0.1.1'), - '1.0.1.1' => Array('1.0.2b1') + '1.0.1.1' => Array('1.0.2b1'), + '1.0.2b1' => Array('Stable1.0ToUnstable1.1'), + 'Stable1.0ToUnstable1.1' => Array('1.1.1') ); -$this_version = '1.0.2'; +$this_version = '1.1.1'; $func_list = Array( '1.0' => Array('u_1_0_1_update_del_votes'), '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text'), // , @@ -445,7 +447,7 @@ { if(isset($_POST['login'])) { - $session->login_without_crypto($_POST['username'], $_POST['password'], false, $ul_admin); + $result = $session->login_without_crypto($_POST['username'], $_POST['password'], false, $ul_admin); if($session->sid_super) { header('Location: upgrade.php?mode=welcome&auth='.$session->sid_super); @@ -462,7 +464,7 @@

Login failed. Bad password?

'; + echo '

Login failed: '. $result['error'] . '

'; } ?>