author | Dan |
Mon, 03 Aug 2009 02:56:03 -0400 | |
changeset 1070 | 617366710de2 |
parent 945 | c19242d13a49 |
child 1081 | 745200a9cc2a |
permissions | -rw-r--r-- |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
1 |
<?php |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
2 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
3 |
/* |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
4 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
801
eb8b23f11744
Two big commits in one day I know, but redid password storage to use HMAC-SHA1. Consolidated much AES processing to three core methods in session that should handle everything automagically. Installation works; upgrades should. Rebranded as 1.1.6.
Dan
parents:
685
diff
changeset
|
5 |
* Version 1.1.6 (Caoineag beta 1) |
536 | 6 |
* Copyright (C) 2006-2008 Dan Fuhry |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
7 |
* Installation package |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
8 |
* libenanoinstall.php - Installation payload backend |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
9 |
* |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
10 |
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
11 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
12 |
* |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
13 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
14 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
15 |
*/ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
16 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
17 |
$neutral_color = 'C'; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
18 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
19 |
function run_installer_stage($stage_id, $stage_name, $function, $failure_explanation, $allow_skip = true) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
20 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
21 |
static $resumed = false; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
22 |
static $resume_stack = array(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
23 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
24 |
if ( empty($resume_stack) && isset($_POST['resume_stack']) && preg_match('/[a-z_]+((\|[a-z_]+)+)/', $_POST['resume_stack']) ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
25 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
26 |
$resume_stack = explode('|', $_POST['resume_stack']); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
27 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
28 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
29 |
$already_run = false; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
30 |
if ( in_array($stage_id, $resume_stack) ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
31 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
32 |
$already_run = true; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
33 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
34 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
35 |
if ( !$resumed ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
36 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
37 |
if ( !isset($_GET['sub']) ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
38 |
$resumed = true; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
39 |
if ( isset($_GET['sub']) && $_GET['sub'] == $stage_id ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
40 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
41 |
$resumed = true; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
42 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
43 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
44 |
if ( !$resumed && $allow_skip ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
45 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
46 |
echo_stage_success($stage_id, $stage_name); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
47 |
return false; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
48 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
49 |
if ( !function_exists($function) ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
50 |
die('libenanoinstall: CRITICAL: function "' . $function . '" for ' . $stage_id . ' doesn\'t exist'); |
945
c19242d13a49
Removed "@" from all call_user_func() calls to make debugging special pages and such possible
Dan
parents:
857
diff
changeset
|
51 |
$result = call_user_func($function, false, $already_run); |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
52 |
if ( $result ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
53 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
54 |
echo_stage_success($stage_id, $stage_name); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
55 |
$resume_stack[] = $stage_id; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
56 |
return true; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
57 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
58 |
else |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
59 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
60 |
echo_stage_failure($stage_id, $stage_name, $failure_explanation, $resume_stack); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
61 |
return false; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
62 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
63 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
64 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
65 |
function start_install_table() |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
66 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
67 |
echo '<table border="0" cellspacing="0" cellpadding="0" style="margin-top: 10px;">' . "\n"; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
68 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
69 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
70 |
function close_install_table() |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
71 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
72 |
echo '</table>' . "\n\n"; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
73 |
flush(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
74 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
75 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
76 |
function echo_stage_success($stage_id, $stage_name) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
77 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
78 |
global $neutral_color; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
79 |
$neutral_color = ( $neutral_color == 'A' ) ? 'C' : 'A'; |
404
fb4f9e6f378f
Made the form validation icons (check/X/?) more visually appealing. IE-friendliness is still on the TODO list.
Dan
parents:
352
diff
changeset
|
80 |
echo '<tr><td style="width: 500px; background-color: #' . "{$neutral_color}{$neutral_color}FF{$neutral_color}{$neutral_color}" . '; padding: 0 5px;">' . htmlspecialchars($stage_name) . '</td><td style="padding: 0 5px;"><img alt="Done" src="../images/check.png" /></td></tr>' . "\n"; |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
81 |
flush(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
82 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
83 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
84 |
function echo_stage_failure($stage_id, $stage_name, $failure_explanation, $resume_stack) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
85 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
86 |
global $neutral_color; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
87 |
global $lang; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
88 |
|
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
89 |
$neutral_color = ( $neutral_color == 'A' ) ? 'C' : 'A'; |
404
fb4f9e6f378f
Made the form validation icons (check/X/?) more visually appealing. IE-friendliness is still on the TODO list.
Dan
parents:
352
diff
changeset
|
90 |
echo '<tr><td style="width: 500px; background-color: #' . "FF{$neutral_color}{$neutral_color}{$neutral_color}{$neutral_color}" . '; padding: 0 5px;">' . htmlspecialchars($stage_name) . '</td><td style="padding: 0 5px;"><img alt="Failed" src="../images/checkbad.png" /></td></tr>' . "\n"; |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
91 |
flush(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
92 |
close_install_table(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
93 |
$post_data = ''; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
94 |
$mysql_error = mysql_error(); |
626
be0e904eec17
Refined upgrade process a bit. Uses libenanoinstall (incomplete), and post stage added to flush caches and import new strings
Dan
parents:
536
diff
changeset
|
95 |
$file = ( defined('IN_ENANO_UPGRADE') ) ? 'upgrade.php' : 'install.php'; |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
96 |
foreach ( $_POST as $key => $value ) |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
97 |
{ |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
98 |
// FIXME: These should really also be sanitized for double quotes |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
99 |
$value = htmlspecialchars($value); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
100 |
$key = htmlspecialchars($key); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
101 |
$post_data .= " <input type=\"hidden\" name=\"$key\" value=\"$value\" />\n"; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
102 |
} |
352
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
103 |
if ( $stage_id == 'renameconfig' ) |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
104 |
echo '<p>' . $failure_explanation . '</p>'; |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
105 |
else |
626
be0e904eec17
Refined upgrade process a bit. Uses libenanoinstall (incomplete), and post stage added to flush caches and import new strings
Dan
parents:
536
diff
changeset
|
106 |
echo '<form action="' . $file . '?stage=install&sub=' . $stage_id . '" method="post"> |
352
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
107 |
' . $post_data . ' |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
108 |
<input type="hidden" name="resume_stack" value="' . htmlspecialchars(implode('|', $resume_stack)) . '" /> |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
109 |
<h3>' . $lang->get('meta_msg_err_stagefailed_title') . '</h3> |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
110 |
<p>' . $failure_explanation . '</p> |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
111 |
' . ( !empty($mysql_error) ? "<p>" . $lang->get('meta_msg_err_stagefailed_mysqlerror') . " $mysql_error</p>" : '' ) . ' |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
112 |
<p>' . $lang->get('meta_msg_err_stagefailed_body') . '</p> |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
113 |
<p style="text-align: center;"><input type="submit" value="' . $lang->get('meta_btn_retry_installation') . '" /></p> |
9d7225c0db6d
Enano's new installable installer, alpha 1. No upgrade and (in some parts) very little localization.
Dan
parents:
348
diff
changeset
|
114 |
</form>'; |
348
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
115 |
global $ui; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
116 |
$ui->show_footer(); |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
117 |
exit; |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
118 |
} |
87e08a6e4fec
Welcome to the new Enano installer. Much distance still to be covered but the basics are there.
Dan
parents:
diff
changeset
|
119 |
|
494
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
120 |
function enano_perform_upgrade($target_branch) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
121 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
122 |
global $db, $session, $paths, $template, $plugins; // Common objects |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
123 |
// Import version info |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
124 |
global $enano_versions; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
125 |
// Import UI functions |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
126 |
global $ui; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
127 |
// This is needed for upgrade abstraction |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
128 |
global $dbdriver; |
627
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
129 |
|
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
130 |
// see if we're actually supposed to be in post-upgrade |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
131 |
if ( getConfig('enano_version') == 'upg-' . installer_enano_version() ) |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
132 |
{ |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
133 |
// yep, fall out here to avoid errors |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
134 |
return true; |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
135 |
} |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
136 |
|
494
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
137 |
// Main upgrade stage |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
138 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
139 |
// Init vars |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
140 |
list($major_version, $minor_version) = explode('.', installer_enano_version()); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
141 |
$installer_branch = "$major_version.$minor_version"; |
627
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
142 |
$installer_branch = preg_replace('/^upg-/', '', $installer_branch); |
460e483987ab
Fixed a few more upgrader glitches and polished things a bit more.
Dan
parents:
626
diff
changeset
|
143 |
$target_branch = preg_replace('/^upg-/', '', $target_branch); |
494
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
144 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
145 |
$version_flipped = array_flip($enano_versions[$target_branch]); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
146 |
$version_curr = enano_version(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
147 |
// Change this to be the last version in the current branch. |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
148 |
// If we're just upgrading within this branch, use the version the installer library |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
149 |
// reports to us. Else, use the latest in the old (current target) branch. |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
150 |
// $version_target = installer_enano_version(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
151 |
$version_target = ( $target_branch === $installer_branch ) ? installer_enano_version() : $enano_versions[$target_branch][ count($enano_versions[$target_branch]) - 1 ]; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
152 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
153 |
// Calculate which scripts to run |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
154 |
if ( !isset($version_flipped[$version_curr]) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
155 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
156 |
echo '<p>ERROR: Unsupported version</p>'; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
157 |
$ui->show_footer(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
158 |
exit; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
159 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
160 |
if ( !isset($version_flipped[$version_target]) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
161 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
162 |
echo '<p>ERROR: Upgrader doesn\'t support its own version</p>'; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
163 |
$ui->show_footer(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
164 |
exit; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
165 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
166 |
$upg_queue = array(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
167 |
for ( $i = $version_flipped[$version_curr]; $i < $version_flipped[$version_target]; $i++ ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
168 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
169 |
if ( !isset($enano_versions[$target_branch][$i + 1]) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
170 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
171 |
echo '<p>ERROR: Unsupported intermediate version</p>'; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
172 |
$ui->show_footer(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
173 |
exit; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
174 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
175 |
$ver_this = $enano_versions[$target_branch][$i]; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
176 |
$ver_next = $enano_versions[$target_branch][$i + 1]; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
177 |
$upg_queue[] = array($ver_this, $ver_next); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
178 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
179 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
180 |
// Verify that all upgrade scripts are usable |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
181 |
foreach ( $upg_queue as $verset ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
182 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
183 |
$file = ENANO_ROOT . "/install/schemas/upgrade/{$verset[0]}-{$verset[1]}-$dbdriver.sql"; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
184 |
if ( !file_exists($file) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
185 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
186 |
echo "<p>ERROR: Couldn't find required schema file: $file</p>"; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
187 |
$ui->show_footer(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
188 |
exit; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
189 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
190 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
191 |
// Perform upgrade |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
192 |
foreach ( $upg_queue as $verset ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
193 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
194 |
$file = ENANO_ROOT . "/install/schemas/upgrade/{$verset[0]}-{$verset[1]}-$dbdriver.sql"; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
195 |
try |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
196 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
197 |
$parser = new SQL_Parser($file); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
198 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
199 |
catch(Exception $e) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
200 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
201 |
die("<pre>$e</pre>"); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
202 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
203 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
204 |
$parser->assign_vars(array( |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
205 |
'TABLE_PREFIX' => table_prefix |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
206 |
)); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
207 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
208 |
$sql_list = $parser->parse(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
209 |
// Check for empty schema file |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
210 |
if ( $sql_list[0] === ';' && count($sql_list) == 1 ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
211 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
212 |
// It's empty, report success for this version |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
213 |
// See below for explanation of why setConfig() is called here |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
214 |
setConfig('enano_version', $verset[1]); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
215 |
continue; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
216 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
217 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
218 |
foreach ( $sql_list as $sql ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
219 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
220 |
// check for '@' operator on query |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
221 |
if ( substr($sql, 0, 1) == '@' ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
222 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
223 |
// Yes - perform query but don't check for errors |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
224 |
$db->sql_query($sql); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
225 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
226 |
else |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
227 |
{ |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
228 |
// Perform as normal |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
229 |
if ( !$db->sql_query($sql) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
230 |
$db->_die(); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
231 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
232 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
233 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
234 |
// Is there an additional script (logic) to be run after the schema? |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
235 |
$postscript = ENANO_ROOT . "/install/schemas/upgrade/{$verset[0]}-{$verset[1]}.php"; |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
236 |
if ( file_exists($postscript) ) |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
237 |
@include($postscript); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
238 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
239 |
// The advantage of calling setConfig on the system version here? |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
240 |
// Simple. If the upgrade fails, it will pick up from the last |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
241 |
// version, not try to start again from the beginning. This will |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
242 |
// still cause errors in most cases though. Eventually we probably |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
243 |
// need some sort of query-numbering system that tracks in-progress |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
244 |
// upgrades. |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
245 |
|
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
246 |
setConfig('enano_version', $verset[1]); |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
247 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
248 |
} |
6c78cc456091
Added support for upgrading arbitrary previous 1.0.x versions (very experimental)
Dan
parents:
404
diff
changeset
|
249 |