diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-01-01 22:54:25 +0300 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-01-01 22:54:25 +0300 |
| commit | eff53ee5a1f85588d21f5c9b75155cb89377d7eb (patch) | |
| tree | 3a18ad32bc4993e74507dfd3d5654eb0afbb13dc /plugins/Installation | |
| parent | 148b89391873d5d3b0916e48efee5d7d5ad6b131 (diff) | |
refs #1097 - file integrity check (optional) added to Installation. A warning is given if manifest.inc.php or md5_file() don't exist.
Matt: please update the build script with the 'find' in comment:6 and then mark this ticket as fixed.
Diffstat (limited to 'plugins/Installation')
| -rw-r--r-- | plugins/Installation/Controller.php | 7 | ||||
| -rw-r--r-- | plugins/Installation/templates/systemCheck.tpl | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 272973035d..f10a76129a 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -765,6 +765,13 @@ class Piwik_Installation_Controller extends Piwik_Controller $infos['protocol_ok'] = false; } + try { + $infos['integrity'] = Piwik::checkIntegrity(); + } catch(Exception $e) { + $infos['integrity'] = false; + $infos['integrityErrorMessage'] = $e->getMessage(); + } + return $infos; } diff --git a/plugins/Installation/templates/systemCheck.tpl b/plugins/Installation/templates/systemCheck.tpl index 4f1946615c..5dac5eca6b 100644 --- a/plugins/Installation/templates/systemCheck.tpl +++ b/plugins/Installation/templates/systemCheck.tpl @@ -136,6 +136,12 @@ <h1>{'Optional'|translate}</h1> <table class="infos"> <tr> + <td class="label">{'Installation_SystemCheckFileIntegrity'|translate}</td> + <td> + {if $infos.integrity}{$ok}{elseif isset($infos.integrityErrorMessage)}{$error} <i>{$infos.integrityErrorMessage}</i>{else}{$warning} <i>{'Installation_SystemCheckFileIntegrityHelp'|translate}</i>{/if} + </td> + </tr> + <tr> <td class="label">{'Installation_SystemCheckMemoryLimit'|translate}</td> <td> {$infos.memoryCurrent} |