Enano CMS (1.1.x): comparison upgrade.php

equal deleted inserted replaced

-:d8156d18ac58
+:97ae8e9d5e29
 <?php
 /*
 * 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
 *
 * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 // SCRIPT CONFIGURATION
 // 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');
+$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
 // normally be required (for whatever reason) then you would add a custom version number to the array under key '1.0b1'.
 $deps_list = Array(
 '1.0b4' => Array('1.0RC1'),
 '1.0RC1' => Array('1.0RC2'),
 '1.0RC2' => Array('1.0RC3'),
 '1.0RC3' => Array('1.0'),
 '1.0' => Array('1.0.1'),
-'1.0.1' => Array('1.0.1.1')
+'1.0.1' => Array('1.0.1.1'),
+'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.2b1';
+$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'), // ,
 // '1.0RC2' => Array('u_1_0_populate_userpage_comments')
 '1.0RC3' => Array('u_1_0_RC3_make_users_extra')
 $session = new sessionManager();
 $paths = new pathManager();
 $session->start();
 $template = new template_nodb();
-$template->load_theme('stpatty', 'shamrock', false);
+$template->load_theme('oxygen', 'bleu', false);
 $modestrings = Array(
 'login'      => 'Administrative login',
 'welcome'    => 'Welcome',
 'setversion' => 'Select Enano version',
 }
 if($session->user_logged_in && $session->user_level >= $ul_admin)
 {
 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);
 exit;
 }
 <th colspan="2">You must re-authenticate to perform this upgrade.</th>
 </tr>
 <?php
 if(isset($_POST['login']))
 {
-echo '<tr><td colspan="2"><p style="color: red;">Login failed. Bad password?</p></td></tr>';
+echo '<tr><td colspan="2"><p style="color: red;">Login failed: '. $result['error'] . '</p></td></tr>';
 }
 ?>
 <tr>
 <td>Username:</td><td><input type="text" name="username" size="30" /></td>
 </tr>
 require('config.php');
 ?>
 <div style="text-align: center; margin-top: 10px;">
-<img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-green.png" style="display: block; margin: 0 auto; padding-left: 134px;" />
+<img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-blue.png" style="display: block; margin: 0 auto; padding-left: 134px;" />
 <h2>Welcome to the Enano upgrade wizard</h2>
 <?php
 if ( file_exists('./_nightly.php') )
 {
 echo '<div class="warning-box" style="text-align: left; margin: 10px auto; display: table; width: 60%;"><b>You are about to upgrade to a NIGHTLY BUILD of Enano.</b><br />Nightly builds CANNOT be re-upgraded to the final release. They may also contain serious flaws, security problems, or extraneous debugging information. Continuing this process on a production site is NOT recommended.</div>';
 echo '<p>Preparing for schema execution...';
 // Build an array of queries
 $schema = file_get_contents('upgrade.sql');
 // Strip out and process version blocks
-preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'(.*?)'."\n".'---END \\1---#is', $schema, $matches);
+preg_match_all('#---BEGIN ([0-9A-z\.\-]*?)---'."\n".'((.*?)'."\n)?".'---END \\1---#is', $schema, $matches);
 $from_list  =& $matches[1];
-$query_list =& $matches[2];
+$query_list =& $matches[3];
 foreach($matches[0] as $m)
 {
 $schema = str_replace($m, '', $schema);
 }

changeset 229	97ae8e9d5e29
parent 228	b0a4d179be85
child 279	8acd77a6c19d