Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-24 07:30:10 +01:00
Code Releases Wiki Activity

more error handling (specifically SQL errors) in install.php

Browse Source
This commit is contained in:
Savetheinternet 2011-03-28 16:24:33 +11:00
parent 60591625a3
commit 4555c4bf6a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
install.php
View File

@ -310,8 +310,10 @@
preg_match_all("/((SET|CREATE|INSERT).+)\n\n/msU", $sql, $queries); preg_match_all("/((SET|CREATE|INSERT).+)\n\n/msU", $sql, $queries);
$queries = $queries[1]; $queries = $queries[1];
$sql_errors = '';
foreach($queries as &$query) { foreach($queries as &$query) {
query($query) or error(db_error()); if(!query($query))
$sql_errors .= '<li>' . db_error() . '</li>';
} }
$boards = listBoards(); $boards = listBoards();
@ -322,13 +324,26 @@
sql_close(); sql_close();
touch($config['has_installed'], 0777);
$page['title'] = 'Installation complete'; $page['title'] = 'Installation complete';
$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover.</p>'; $page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover.</p>';
if(!empty($sql_errors)) {
$page['body'] .= '<div class="ban"><h2>SQL errors</h2><p>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.</p><p>The errors encountered were:</p><ul>' . $sql_errors . '</ul><p><a href="?step=5">Ignore errors and complete installation.</a></p></div>';
} else {
touch($config['has_installed'], 0777);
if(!@unlink(__FILE__)) {
$page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
}
}
echo Element('page.html', $page);
} elseif($step == 5) {
$page['title'] = 'Installation complete';
$page['body'] = '<p style="text-align:center">Thank you for using Tinyboard. Please remember to report any bugs you discover.</p>';
touch($config['has_installed'], 0777);
if(!@unlink(__FILE__)) { if(!@unlink(__FILE__)) {
$page['body'] = '<p style="text-align:center">I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p>'; $page['body'] .= '<div class="ban"><h2>Delete install.php!</h2><p>I couldn\'t remove <strong>install.php</strong>. You will have to remove it manually.</p></div>';
} }
echo Element('page.html', $page); echo Element('page.html', $page);