Update checksum code, move check to front page of installation

This commit is contained in:
Jude Anthony 2008-07-17 21:23:35 +00:00
parent 0be6a9243c
commit 1df78fd6ce
3 changed files with 26 additions and 6 deletions

@ -98,7 +98,7 @@ else
then
echo " [SKIP]"
else
if (echo "true" | php -B "define('IN_serendipity', true);" -F serendipity_generateFTPChecksums.php)
if (echo "true" | php -B "define('IN_serendipity', true);" -F $2/bundled-libs/serendipity_generateFTPChecksums.php)
then
echo " [DONE]"
else

@ -95,6 +95,31 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
<?php $errorCount = 0 ?>
<div align="center">
<table class="serendipity_admin_list_item serendipity_admin_list_item_even" width="90%" align="center">
<tr>
<td colspan="2" style="font-weight: bold"><?php echo INTEGRITY ?></td>
</tr>
<?php if (is_readable(S9Y_INCLUDE_PATH . 'checksums.inc.php')) {
$badsums = serendipity_verifyFTPChecksums();
?>
<?php if (empty($badsums)) {?>
<tr>
<td colspan="2"><?php echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, CHECKSUMS_PASS); ?></td>
</tr>
<?php } else {
foreach ($badsums as $file => $sum) {
?>
<tr>
<td colspan="2"><?php echo serendipity_installerResultDiagnose(S9Y_I_WARNING, sprintf(CHECKSUM_FAILED, $file)); ?></td>
</tr>
<?php }
}
} else { ?>
<tr>
<td colspan="2"><?php echo serendipity_installerResultDiagnose(S9Y_I_WARNING, CHECKSUMS_NOT_FOUND); ?></td>
</tr>
<?php } ?>
</table>
<table class="serendipity_admin_list_item serendipity_admin_list_item_even" width="90%" align="center">
<tr>
<td colspan="2" style="font-weight: bold"><?php echo PHP_INSTALLATION ?></td>

@ -688,11 +688,6 @@ function serendipity_checkInstallation() {
$errs = array();
$badsums = serendipity_verifyFTPChecksums();
foreach ($badsums as $rfile => $sum) {
$errs[] = sprintf(CHECKSUM_FAILED, $rfile);
}
serendipity_initPermalinks();
// Check dirs