Commit 6726e93db58859a7efd9feb621068bde85f3057f
1 parent
f5c0c01c
Fixed bug in DB Upgrade Wizard restore step - selection table of backups was empty.
Story ID:124469. 3.7 Database Upgrade Script Committed by: Paul Barrett
Showing
2 changed files
with
19 additions
and
33 deletions
setup/upgrade/steps/upgradeRestore.php
| ... | ... | @@ -105,7 +105,7 @@ class upgradeRestore extends Step { |
| 105 | 105 | */ |
| 106 | 106 | private function storeSilent() { |
| 107 | 107 | } |
| 108 | - | |
| 108 | + /* | |
| 109 | 109 | // these belong in a shared lib |
| 110 | 110 | function set_state($value) |
| 111 | 111 | { |
| ... | ... | @@ -123,19 +123,16 @@ function check_state($value, $state='Home') |
| 123 | 123 | exit; |
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | - | |
| 126 | +*/ | |
| 127 | 127 | function restore() |
| 128 | 128 | { |
| 129 | - check_state(1); | |
| 130 | - set_state(5); | |
| 129 | +// check_state(1); | |
| 130 | +// set_state(5); | |
| 131 | 131 | // title('Restore In Progress'); |
| 132 | 132 | $status = $_SESSION['backupStatus']; |
| 133 | - $filename=$_SESSION['backupFile']; | |
| 134 | - $stmt=create_restore_stmt($filename); | |
| 135 | - $dir=$stmt['dir']; | |
| 136 | - | |
| 137 | - | |
| 138 | - | |
| 133 | + $filename = $_SESSION['backupFile']; | |
| 134 | + $stmt = $this->util->create_restore_stmt($filename); | |
| 135 | + $dir = $stmt['dir']; | |
| 139 | 136 | |
| 140 | 137 | if (is_file($dir . '/mysql') || is_file($dir . '/mysql.exe')) |
| 141 | 138 | { |
| ... | ... | @@ -166,20 +163,8 @@ function check_state($value, $state='Home') |
| 166 | 163 | $_SESSION['restoreOutput']=$read; |
| 167 | 164 | } |
| 168 | 165 | |
| 169 | - | |
| 170 | - | |
| 171 | - | |
| 172 | - | |
| 173 | 166 | $_SESSION['restoreStatus'] = $ok; |
| 174 | 167 | |
| 175 | - | |
| 176 | -?> | |
| 177 | - <script type="text/javascript"> | |
| 178 | - document.location="?go=RestoreDone"; | |
| 179 | - </script> | |
| 180 | -<?php | |
| 181 | - | |
| 182 | - | |
| 183 | 168 | } |
| 184 | 169 | else |
| 185 | 170 | { |
| ... | ... | @@ -191,18 +176,16 @@ function check_state($value, $state='Home') |
| 191 | 176 | <?php |
| 192 | 177 | } |
| 193 | 178 | |
| 194 | - | |
| 195 | - | |
| 196 | 179 | } |
| 197 | 180 | |
| 198 | 181 | |
| 199 | 182 | function restoreDone() |
| 200 | 183 | { |
| 201 | - check_state(5); | |
| 202 | - set_state(6); | |
| 184 | +// check_state(5); | |
| 185 | +// set_state(6); | |
| 203 | 186 | // title('Restore Status'); |
| 204 | 187 | $status = $_SESSION['restoreStatus']; |
| 205 | - $filename=$_SESSION['backupFile']; | |
| 188 | + $filename = $_SESSION['backupFile']; | |
| 206 | 189 | |
| 207 | 190 | if ($status) |
| 208 | 191 | { |
| ... | ... | @@ -246,9 +229,9 @@ We appologise for the inconvenience. |
| 246 | 229 | |
| 247 | 230 | function restoreSelect() |
| 248 | 231 | { |
| 232 | + $this->temp_variables['availableBackups'] = false; | |
| 249 | 233 | // title('Select Backup to Restore'); |
| 250 | - | |
| 251 | - $dir = $this->resolveTempDir(); | |
| 234 | + $dir = $this->util->resolveTempDir(); | |
| 252 | 235 | |
| 253 | 236 | $files = array(); |
| 254 | 237 | if ($dh = opendir($dir)) |
| ... | ... | @@ -263,10 +246,10 @@ function restoreSelect() |
| 263 | 246 | closedir($dh); |
| 264 | 247 | } |
| 265 | 248 | |
| 266 | - $this->temp_variables['availableBackups'] = false; | |
| 267 | 249 | $this->temp_variables['dir'] = $dir; |
| 268 | 250 | if (count($files) != 0) { |
| 269 | 251 | $this->temp_variables['availableBackups'] = true; |
| 252 | + $this->temp_variables['files'] = $files; | |
| 270 | 253 | } |
| 271 | 254 | } |
| 272 | 255 | |
| ... | ... | @@ -274,7 +257,7 @@ function restoreSelected() |
| 274 | 257 | { |
| 275 | 258 | $file=$_REQUEST['file']; |
| 276 | 259 | |
| 277 | - $dir = $this->resolveTempDir(); | |
| 260 | + $dir = $this->util->resolveTempDir(); | |
| 278 | 261 | $_SESSION['backupFile'] = $dir . '/' . $file; |
| 279 | 262 | ?> |
| 280 | 263 | <?php |
| ... | ... | @@ -290,8 +273,8 @@ function restoreConfirm() |
| 290 | 273 | } |
| 291 | 274 | |
| 292 | 275 | $status = $_SESSION['backupStatus']; |
| 293 | - $filename=$_SESSION['backupFile']; | |
| 294 | - $stmt = $this->create_restore_stmt($filename); | |
| 276 | + $filename = $_SESSION['backupFile']; | |
| 277 | + $stmt = $this->util->create_restore_stmt($filename); | |
| 295 | 278 | |
| 296 | 279 | $this->temp_variables['dir'] = $stmt['dir']; |
| 297 | 280 | $this->temp_variables['display'] = $stmt['display']; | ... | ... |