diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-09-14 05:02:30 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-09-14 05:02:30 +0400 |
| commit | e23503f2e2db8c8fd655617eeeae640db66164d1 (patch) | |
| tree | 200def4461eada9a3bbcc818d263440e15d47c10 /plugins/CoreUpdater | |
| parent | e802eae2a2690a80f217bcc2952a1adb100a7a77 (diff) | |
Adding Filechecks class for all filesystem checks
Diffstat (limited to 'plugins/CoreUpdater')
| -rw-r--r-- | plugins/CoreUpdater/Controller.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index ae48b8e8ce..d34a125487 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -15,6 +15,7 @@ use Piwik\API\Request; use Piwik\ArchiveProcessor\Rules; use Piwik\Common; use Piwik\Config; +use Piwik\Filechecks; use Piwik\Filesystem; use Piwik\Http; use Piwik\Piwik; @@ -59,8 +60,8 @@ class Controller extends \Piwik\Controller $view->piwik_version = Version::VERSION; $view->piwik_new_version = $newVersion; $view->piwik_latest_version_url = self::getLatestZipUrl($newVersion); - $view->can_auto_update = Piwik::canAutoUpdate(); - $view->makeWritableCommands = Piwik::getAutoUpdateMakeWritableMessage(); + $view->can_auto_update = Filechecks::canAutoUpdate(); + $view->makeWritableCommands = Filechecks::getAutoUpdateMakeWritableMessage(); echo $view->render(); } @@ -125,7 +126,7 @@ class Controller extends \Piwik\Controller private function oneClick_Download() { $this->pathPiwikZip = PIWIK_USER_PATH . self::PATH_TO_EXTRACT_LATEST_VERSION . 'latest.zip'; - Piwik::dieIfDirectoriesNotWritable(array(self::PATH_TO_EXTRACT_LATEST_VERSION)); + Filechecks::dieIfDirectoriesNotWritable(array(self::PATH_TO_EXTRACT_LATEST_VERSION)); // we catch exceptions in the caller (i.e., oneClickUpdate) $url = self::getLatestZipUrl($this->newVersion) . '?cb=' . $this->newVersion; @@ -316,7 +317,7 @@ class Controller extends \Piwik\Controller } // check file integrity - $integrityInfo = Piwik::getFileIntegrityInformation(); + $integrityInfo = Filechecks::getFileIntegrityInformation(); if (isset($integrityInfo[1])) { if ($integrityInfo[0] == false) { $this->warningMessages[] = '<b>' . Piwik_Translate('General_FileIntegrityWarningExplanation') . '</b>'; |